libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inserted prints to see how sg_issue_command() is called (printing is disabled now)

Browse Source
This commit is contained in:
Thomas Schmitt
2006-08-27 15:16:33 +00:00
parent 14e95330e9
commit dc74390bd5
2 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libburn/sg.c
View File

@ -37,6 +37,11 @@ extern int burn_sg_open_o_nonblock;
extern int burn_sg_open_abort_busy;
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
int mmc_function_spy(char * text);
static int sgio_test(int fd)
{
unsigned char test_ops[] = { 0, 0, 0, 0, 0, 0 };
@ -233,6 +238,10 @@ static void enumerate_common(char *fname)
memset(&out.params, 0, sizeof(struct params));
t = burn_drive_register(&out);
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
mmc_function_spy("enumerate_common : -------- doing grab");
/* try to get the drive info */
if (sg_grab(t)) {
burn_print(2, "getting drive info\n");
@ -243,6 +252,10 @@ static void enumerate_common(char *fname)
burn_print(2, "unable to grab new located drive\n");
}
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
mmc_function_spy("enumerate_common : ----- would release ");
}
/*
@ -260,6 +273,11 @@ int sg_grab(struct burn_drive *d)
/* ts A60813 */
int open_mode = O_RDWR;
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
mmc_function_spy("sg_grab");
/* ts A60813
O_EXCL with block devices is an unpublished feature
of Linux kernels. Possibly introduced 2002.
@ -279,9 +297,15 @@ int sg_grab(struct burn_drive *d)
-1337 is the initial value of burn_drive.fd and the value after
relase of drive. Unclear why not the official error return
value -1 of open(2) war used. */
if(d->fd == -1337)
/* ts A60822: was if(d->fd == -1337) { */
if(! burn_drive_is_open(d)) {
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
mmc_function_spy("sg_grab ----------- opening");
fd = open(d->devname, open_mode);
else
} else
fd= d->fd;
assert(fd != -1337);
@ -313,10 +337,19 @@ int sg_grab(struct burn_drive *d)
int sg_release(struct burn_drive *d)
{
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
mmc_function_spy("sg_release");
if (d->fd < 1) {
burn_print(1, "release an ungrabbed drive. die\n");
return 0;
}
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
mmc_function_spy("sg_release ----------- closing");
close(d->fd);
d->fd = -1337;
return 0;
@ -328,6 +361,15 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
int err;
sg_io_hdr_t s;
/* ts A60821
<<< debug: for tracing calls which might use open drive fds */
char buf[161];
sprintf(buf,"sg_issue_command d->fd= %d d->released= %d\n",
d->fd,d->released);
mmc_function_spy(buf);
c->error = 0;
/*
this is valid during the mode probe in scan