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

Outcommented "experimental:" messages of O_EXCL development

Browse Source
This commit is contained in:
Thomas Schmitt 2006-08-31 09:26:44 +00:00
parent a0118214c7
commit ebbfe8935d
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/cdrskin/cdrskin.c
View File

@ -837,7 +837,7 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
} }
} }
} }
if(track->fixed_size<Cdrtrack_minimum_sizE) { if(track->fixed_size<Cdrtrack_minimum_sizE && *fd>=0) {
fprintf(stderr, fprintf(stderr,
"cdrskin: NOTE : Enforcing minimum track size of %.f bytes\n", "cdrskin: NOTE : Enforcing minimum track size of %.f bytes\n",
Cdrtrack_minimum_sizE); Cdrtrack_minimum_sizE);
@ -1814,10 +1814,9 @@ struct CdrskiN {
/** The list of tracks with their data sources and parameters */ /** The list of tracks with their data sources and parameters */
struct CdrtracK *tracklist[Cdrskin_track_maX]; struct CdrtracK *tracklist[Cdrskin_track_maX];
int track_counter; int track_counter;
/* a guess about what track might be processing right now */ /** a guess about what track might be processing right now */
int supposed_track_idx; int supposed_track_idx;
int fifo_enabled; int fifo_enabled;
/** Optional fifo between input fd and libburn. It uses a pipe(2) to transfer /** Optional fifo between input fd and libburn. It uses a pipe(2) to transfer
data to libburn. This fifo may be actually the start of a chain of fifos data to libburn. This fifo may be actually the start of a chain of fifos
@ -2039,6 +2038,9 @@ int Cdrskin_attach_fifo(struct CdrskiN *skin, int flag)
if(i==0) if(i==0)
skin->fifo= ff; skin->fifo= ff;
} }
/* >>> ticket 55: check all fifos for input */;
return(1); return(1);
} }
@ -2173,23 +2175,30 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
if(flag&1) { if(flag&1) {
/*
fprintf(stderr, fprintf(stderr,
"cdrskin: experimental: Cdrskin_grab_drive() from shutdown libburn\n"); "cdrskin: experimental: Cdrskin_grab_drive() from shutdown libburn\n");
*/
ret= burn_drive_scan_and_grab(&(skin->drives),skin->preskin->device_adr, ret= burn_drive_scan_and_grab(&(skin->drives),skin->preskin->device_adr,
!(flag&2)); !(flag&2));
if(ret<=0) { if(ret<=0) {
/*
fprintf(stderr,"cdrskin: experimental: burn_drive_scan_and_grab ret=%d\n", fprintf(stderr,"cdrskin: experimental: burn_drive_scan_and_grab ret=%d\n",
ret); ret);
*/
goto unable; goto unable;
} }
skin->driveno= 0; skin->driveno= 0;
} else { } else {
/*
fprintf(stderr, fprintf(stderr,
"cdrskin: experimental: Cdrskin_grab_drive() on active libburn\n"); "cdrskin: experimental: Cdrskin_grab_drive() on active libburn\n");
*/
if(strlen(skin->preskin->device_adr)<=0) { if(strlen(skin->preskin->device_adr)<=0) {
/*
fprintf(stderr, fprintf(stderr,
"cdrskin: experimental: Cdrskin_grab_drive() restarting libburn\n"); "cdrskin: experimental: Cdrskin_grab_drive() restarting libburn\n");
*/
ret= Cdrskin_reinit_lib_with_adr(skin,1|(flag&2)); ret= Cdrskin_reinit_lib_with_adr(skin,1|(flag&2));
goto ex; /* this calls Cdrskin_grab() with persistent address or fails */ goto ex; /* this calls Cdrskin_grab() with persistent address or fails */
} }
@ -2684,8 +2693,10 @@ int Cdrskin_atip(struct CdrskiN *skin, int flag)
#ifdef Cdrskin_new_api_tesT #ifdef Cdrskin_new_api_tesT
/*
fprintf(stderr, fprintf(stderr,
"cdrskin: experimental: Cdrskin_atip() on Cdrskin_new_api_tesT\n"); "cdrskin: experimental: Cdrskin_atip() on Cdrskin_new_api_tesT\n");
*/
if(strlen(skin->preskin->device_adr)<=0) if(strlen(skin->preskin->device_adr)<=0)
burn_drive_get_adr(&(skin->drives[skin->driveno]), burn_drive_get_adr(&(skin->drives[skin->driveno]),

2
trunk/libburn/sg.c
View File

@ -149,13 +149,13 @@ void sg_enumerate(void)
if(burn_sg_open_o_nonblock) if(burn_sg_open_o_nonblock)
open_mode |= O_NONBLOCK; open_mode |= O_NONBLOCK;
/* <<< debugging
fprintf(stderr, fprintf(stderr,
"\nlibburn: experimental: o_excl= %d , o_nonblock= %d, abort_on_busy= %d\n", "\nlibburn: experimental: o_excl= %d , o_nonblock= %d, abort_on_busy= %d\n",
burn_sg_open_o_excl,burn_sg_open_o_nonblock,burn_sg_open_abort_busy); burn_sg_open_o_excl,burn_sg_open_o_nonblock,burn_sg_open_abort_busy);
fprintf(stderr, fprintf(stderr,
"libburn: experimental: O_EXCL= %d , O_NONBLOCK= %d\n", "libburn: experimental: O_EXCL= %d , O_NONBLOCK= %d\n",
!!(open_mode&O_EXCL),!!(open_mode&O_NONBLOCK)); !!(open_mode&O_EXCL),!!(open_mode&O_NONBLOCK));
/* <<< debugging
*/ */