--- IO-AIO/AIO.xs 2006/12/23 04:49:37 1.96 +++ IO-AIO/AIO.xs 2007/06/01 06:00:40 1.100 @@ -1,12 +1,4 @@ -/* solaris */ -#define _POSIX_PTHREAD_SEMANTICS 1 - -#if __linux && !defined(_GNU_SOURCE) -# define _GNU_SOURCE -#endif - -/* just in case */ -#define _REENTRANT 1 +#include "xthread.h" #include @@ -16,8 +8,6 @@ #include "autoconf/config.h" -#include - #include #include #include @@ -30,6 +20,7 @@ #include #include #include +#include #if HAVE_SENDFILE # if __linux @@ -54,31 +45,6 @@ # define NAME_MAX 4096 #endif -#ifndef PTHREAD_STACK_MIN -/* care for broken platforms, e.g. windows */ -# define PTHREAD_STACK_MIN 16384 -#endif - -#if __ia64 -# define STACKSIZE 65536 -#elif __i386 || __x86_64 /* 16k is unreasonably high :( */ -# define STACKSIZE PTHREAD_STACK_MIN -#else -# define STACKSIZE 16384 -#endif - -/* wether word reads are potentially non-atomic. - * this is conservatice, likely most arches this runs - * on have atomic word read/writes. - */ -#ifndef WORDACCESS_UNSAFE -# if __i386 || __x86_64 -# define WORDACCESS_UNSAFE 0 -# else -# define WORDACCESS_UNSAFE 1 -# endif -#endif - /* buffer size for various temporary buffers */ #define AIO_BUFSIZE 65536 @@ -98,8 +64,11 @@ REQ_READ, REQ_WRITE, REQ_READAHEAD, REQ_SENDFILE, REQ_STAT, REQ_LSTAT, REQ_FSTAT, + REQ_UTIME, REQ_FUTIME, /* must be consecutive */ + REQ_CHMOD, REQ_FCHMOD, /* must be consecutive */ + REQ_CHOWN, REQ_FCHOWN, /* must be consecutive */ REQ_FSYNC, REQ_FDATASYNC, - REQ_UNLINK, REQ_RMDIR, REQ_RENAME, + REQ_UNLINK, REQ_RMDIR, REQ_MKDIR, REQ_RENAME, REQ_MKNOD, REQ_READDIR, REQ_LINK, REQ_SYMLINK, REQ_READLINK, REQ_GROUP, REQ_NOP, @@ -113,16 +82,17 @@ { struct aio_cb *volatile next; - SV *callback, *fh; + SV *callback; SV *sv1, *sv2; void *ptr1, *ptr2; off_t offs; size_t size; ssize_t result; + double nv1, nv2; STRLEN stroffset; int type; - int int1, int2; + int int1, int2, int3; int errorno; mode_t mode; /* open */ @@ -135,7 +105,7 @@ enum { FLAG_CANCELLED = 0x01, /* request was cancelled */ - FLAG_SV1_RO_OFF = 0x40, /* data was set readonly */ + FLAG_SV2_RO_OFF = 0x40, /* data was set readonly */ FLAG_PTR2_FREE = 0x80, /* need to free(ptr2) */ }; @@ -163,7 +133,7 @@ + ((tv2->tv_usec - tv1->tv_usec) >> 10); } -static pthread_t main_tid; +static thread_t main_tid; static int main_sig; static int block_sig_level; @@ -201,23 +171,14 @@ static unsigned int started, idle, wanted; -#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) -# define AIO_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP -#else -# define AIO_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER -#endif - -#define LOCK(mutex) pthread_mutex_lock (&(mutex)) -#define UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) - /* worker threads management */ -static pthread_mutex_t wrklock = AIO_MUTEX_INIT; +static mutex_t wrklock = MUTEX_INIT; typedef struct worker { /* locked by wrklock */ struct worker *prev, *next; - pthread_t tid; + thread_t tid; /* locked by reslock, reqlock or wrklock */ aio_req req; /* currently processed request */ @@ -255,9 +216,9 @@ static volatile unsigned int max_outstanding = 0xffffffff; static int respipe [2]; -static pthread_mutex_t reslock = AIO_MUTEX_INIT; -static pthread_mutex_t reqlock = AIO_MUTEX_INIT; -static pthread_cond_t reqwait = PTHREAD_COND_INITIALIZER; +static mutex_t reslock = MUTEX_INIT; +static mutex_t reqlock = MUTEX_INIT; +static cond_t reqwait = COND_INIT; #if WORDACCESS_UNSAFE @@ -448,8 +409,8 @@ { dSP; - if (req->flags & FLAG_SV1_RO_OFF) - SvREADONLY_off (req->sv1); + if (req->flags & FLAG_SV2_RO_OFF) + SvREADONLY_off (req->sv2); if (!(req->flags & FLAG_CANCELLED) && SvOK (req->callback)) { @@ -524,9 +485,9 @@ case REQ_READLINK: if (req->result > 0) { - SvCUR_set (req->sv1, req->result); - *SvEND (req->sv1) = 0; - PUSHs (req->sv1); + SvCUR_set (req->sv2, req->result); + *SvEND (req->sv2) = 0; + PUSHs (req->sv2); } break; @@ -540,8 +501,8 @@ break; case REQ_READ: - SvCUR_set (req->sv1, req->stroffset + (req->result > 0 ? req->result : 0)); - *SvEND (req->sv1) = 0; + SvCUR_set (req->sv2, req->stroffset + (req->result > 0 ? req->result : 0)); + *SvEND (req->sv2) = 0; PUSHs (sv_2mortal (newSViv (req->result))); break; @@ -585,7 +546,6 @@ SvREFCNT_dec (req->self); } - SvREFCNT_dec (req->fh); SvREFCNT_dec (req->sv1); SvREFCNT_dec (req->sv2); SvREFCNT_dec (req->callback); @@ -621,27 +581,14 @@ static void start_thread (void) { - sigset_t fullsigset, oldsigset; - pthread_attr_t attr; - worker *wrk = calloc (1, sizeof (worker)); if (!wrk) croak ("unable to allocate worker thread data"); - pthread_attr_init (&attr); - pthread_attr_setstacksize (&attr, STACKSIZE); - pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); -#ifdef PTHREAD_SCOPE_PROCESS - pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); -#endif - - sigfillset (&fullsigset); - LOCK (wrklock); - pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset); - if (pthread_create (&wrk->tid, &attr, aio_proc, (void *)wrk) == 0) + if (thread_create (&wrk->tid, aio_proc, (void *)wrk)) { wrk->prev = &wrk_first; wrk->next = wrk_first.next; @@ -652,7 +599,6 @@ else free (wrk); - pthread_sigmask (SIG_SETMASK, &oldsigset, 0); UNLOCK (wrklock); } @@ -677,7 +623,7 @@ LOCK (reqlock); ++nready; reqq_push (&req_queue, req); - pthread_cond_signal (&reqwait); + COND_SIGNAL (reqwait); UNLOCK (reqlock); unblock_sig (); @@ -696,7 +642,7 @@ LOCK (reqlock); reqq_push (&req_queue, req); - pthread_cond_signal (&reqwait); + COND_SIGNAL (reqwait); UNLOCK (reqlock); LOCK (wrklock); @@ -859,7 +805,7 @@ * normal read/write by using a mutex. slows down execution a lot, * but that's your problem, not mine. */ -static pthread_mutex_t preadwritelock = PTHREAD_MUTEX_INITIALIZER; +static mutex_t preadwritelock = MUTEX_INIT; static ssize_t pread (int fd, void *buf, size_t count, off_t offset) { @@ -892,6 +838,34 @@ } #endif +#ifndef HAVE_FUTIMES + +# define utimes(path,times) aio_utimes (path, times) +# define futimes(fd,times) aio_futimes (fd, times) + +int aio_utimes (const char *filename, const struct timeval times[2]) +{ + if (times) + { + struct utimbuf buf; + + buf.actime = times[0].tv_sec; + buf.modtime = times[1].tv_sec; + + return utime (filename, &buf); + } + else + return utime (filename, 0); +} + +int aio_futimes (int fd, const struct timeval tv[2]) +{ + errno = ENOSYS; + return -1; +} + +#endif + #if !HAVE_FDATASYNC # define fdatasync fsync #endif @@ -920,7 +894,7 @@ #if !HAVE_READDIR_R # define readdir_r aio_readdir_r -static pthread_mutex_t readdirlock = PTHREAD_MUTEX_INITIALIZER; +static mutex_t readdirlock = MUTEX_INIT; static int readdir_r (DIR *dirp, struct dirent *ent, struct dirent **res) { @@ -1129,7 +1103,7 @@ ++idle; - if (pthread_cond_timedwait (&reqwait, &reqlock, &ts) + if (COND_TIMEDWAIT (reqwait, reqlock, ts) == ETIMEDOUT) { if (idle > max_idle) @@ -1143,7 +1117,7 @@ } /* we are allowed to idle, so do so without any timeout */ - pthread_cond_wait (&reqwait, &reqlock); + COND_WAIT (reqwait, reqlock); ts.tv_sec = time (0) + IDLE_TIMEOUT; } @@ -1169,10 +1143,16 @@ case REQ_LSTAT: req->result = lstat (req->ptr1, (Stat_t *)req->ptr2); break; case REQ_FSTAT: req->result = fstat (req->int1, (Stat_t *)req->ptr2); break; + case REQ_CHOWN: req->result = chown (req->ptr1, req->int2, req->int3); break; + case REQ_FCHOWN: req->result = fchown (req->int1, req->int2, req->int3); break; + case REQ_CHMOD: req->result = chmod (req->ptr1, req->mode); break; + case REQ_FCHMOD: req->result = fchmod (req->int1, req->mode); break; + case REQ_OPEN: req->result = open (req->ptr1, req->int1, req->mode); break; case REQ_CLOSE: req->result = close (req->int1); break; case REQ_UNLINK: req->result = unlink (req->ptr1); break; case REQ_RMDIR: req->result = rmdir (req->ptr1); break; + case REQ_MKDIR: req->result = mkdir (req->ptr1, req->mode); break; case REQ_RENAME: req->result = rename (req->ptr2, req->ptr1); break; case REQ_LINK: req->result = link (req->ptr2, req->ptr1); break; case REQ_SYMLINK: req->result = symlink (req->ptr2, req->ptr1); break; @@ -1187,12 +1167,36 @@ { struct timeval tv; - tv.tv_sec = req->int1; - tv.tv_usec = req->int2; + tv.tv_sec = req->nv1; + tv.tv_usec = (req->nv1 - tv.tv_usec) * 1000000.; req->result = select (0, 0, 0, 0, &tv); } + case REQ_UTIME: + case REQ_FUTIME: + { + struct timeval tv[2]; + struct timeval *times; + + if (req->nv1 != -1. || req->nv2 != -1.) + { + tv[0].tv_sec = req->nv1; + tv[0].tv_usec = (req->nv1 - tv[0].tv_sec) * 1000000.; + tv[1].tv_sec = req->nv2; + tv[1].tv_usec = (req->nv2 - tv[1].tv_sec) * 1000000.; + + times = tv; + } + else + times = 0; + + + req->result = req->type == REQ_FUTIME + ? futimes (req->int1, times) + : utimes (req->ptr1, times); + } + case REQ_GROUP: case REQ_NOP: break; @@ -1201,7 +1205,7 @@ goto quit; default: - req->result = ENOSYS; + req->result = -1; break; } @@ -1335,7 +1339,7 @@ newCONSTSUB (stash, "SIGIO", newSViv (SIGIO)); create_pipe (); - pthread_atfork (atfork_prepare, atfork_parent, atfork_child); + ATFORK (atfork_prepare, atfork_parent, atfork_child); } void @@ -1374,11 +1378,7 @@ RETVAL void -aio_open (pathname,flags,mode,callback=&PL_sv_undef) - SV8 * pathname - int flags - int mode - SV * callback +aio_open (SV8 *pathname, int flags, int mode, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ PPCODE: { @@ -1394,9 +1394,7 @@ } void -aio_close (fh,callback=&PL_sv_undef) - SV * fh - SV * callback +aio_close (SV *fh, SV *callback=&PL_sv_undef) PROTOTYPE: $;$ ALIAS: aio_close = REQ_CLOSE @@ -1407,20 +1405,14 @@ dREQ; req->type = ix; - req->fh = newSVsv (fh); + req->sv1 = newSVsv (fh); req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); REQ_SEND (req); } void -aio_read (fh,offset,length,data,dataoffset,callback=&PL_sv_undef) - SV * fh - UV offset - UV length - SV8 * data - UV dataoffset - SV * callback +aio_read (SV *fh, UV offset, UV length, SV8 *data, UV dataoffset, SV *callback=&PL_sv_undef) ALIAS: aio_read = REQ_READ aio_write = REQ_WRITE @@ -1458,19 +1450,19 @@ dREQ; req->type = ix; - req->fh = newSVsv (fh); + req->sv1 = newSVsv (fh); req->int1 = PerlIO_fileno (ix == REQ_READ ? IoIFP (sv_2io (fh)) : IoOFP (sv_2io (fh))); req->offs = offset; req->size = length; - req->sv1 = SvREFCNT_inc (data); + req->sv2 = SvREFCNT_inc (data); req->ptr1 = (char *)svptr + dataoffset; req->stroffset = dataoffset; if (!SvREADONLY (data)) { SvREADONLY_on (data); - req->flags |= FLAG_SV1_RO_OFF; + req->flags |= FLAG_SV2_RO_OFF; } REQ_SEND; @@ -1478,9 +1470,7 @@ } void -aio_readlink (path,callback=&PL_sv_undef) - SV8 * path - SV * callback +aio_readlink (SV8 *path, SV *callback=&PL_sv_undef) PROTOTYPE: $$;$ PPCODE: { @@ -1491,28 +1481,23 @@ SvPOK_on (data); req->type = REQ_READLINK; - req->fh = newSVsv (path); - req->ptr2 = SvPVbyte_nolen (req->fh); - req->sv1 = data; + req->sv1 = newSVsv (path); + req->ptr2 = SvPVbyte_nolen (req->sv1); + req->sv2 = data; req->ptr1 = SvPVbyte_nolen (data); REQ_SEND; } void -aio_sendfile (out_fh,in_fh,in_offset,length,callback=&PL_sv_undef) - SV * out_fh - SV * in_fh - UV in_offset - UV length - SV * callback +aio_sendfile (SV *out_fh, SV *in_fh, UV in_offset, UV length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$$;$ PPCODE: { dREQ; req->type = REQ_SENDFILE; - req->fh = newSVsv (out_fh); + req->sv1 = newSVsv (out_fh); req->int1 = PerlIO_fileno (IoIFP (sv_2io (out_fh))); req->sv2 = newSVsv (in_fh); req->int2 = PerlIO_fileno (IoIFP (sv_2io (in_fh))); @@ -1523,18 +1508,14 @@ } void -aio_readahead (fh,offset,length,callback=&PL_sv_undef) - SV * fh - UV offset - IV length - SV * callback +aio_readahead (SV *fh, UV offset, IV length, SV *callback=&PL_sv_undef) PROTOTYPE: $$$;$ PPCODE: { dREQ; req->type = REQ_READAHEAD; - req->fh = newSVsv (fh); + req->sv1 = newSVsv (fh); req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh))); req->offs = offset; req->size = length; @@ -1543,9 +1524,7 @@ } void -aio_stat (fh_or_path,callback=&PL_sv_undef) - SV8 * fh_or_path - SV * callback +aio_stat (SV8 *fh_or_path, SV *callback=&PL_sv_undef) ALIAS: aio_stat = REQ_STAT aio_lstat = REQ_LSTAT @@ -1561,17 +1540,16 @@ } req->flags |= FLAG_PTR2_FREE; + req->sv1 = newSVsv (fh_or_path); if (SvPOK (fh_or_path)) { req->type = ix; - req->sv1 = newSVsv (fh_or_path); req->ptr1 = SvPVbyte_nolen (req->sv1); } else { req->type = REQ_FSTAT; - req->fh = newSVsv (fh_or_path); req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); } @@ -1579,9 +1557,78 @@ } void -aio_unlink (pathname,callback=&PL_sv_undef) - SV8 * pathname - SV * callback +aio_utime (SV8 *fh_or_path, SV *atime, SV *mtime, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->nv1 = SvOK (atime) ? SvNV (atime) : -1.; + req->nv2 = SvOK (mtime) ? SvNV (mtime) : -1.; + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (fh_or_path)) + { + req->type = REQ_UTIME; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = REQ_FUTIME; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + REQ_SEND; +} + +void +aio_chmod (SV8 *fh_or_path, int mode, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->mode = mode; + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (fh_or_path)) + { + req->type = REQ_CHMOD; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = REQ_FCHMOD; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + REQ_SEND; +} + +void +aio_chown (SV8 *fh_or_path, SV *uid, SV *gid, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->int2 = SvOK (uid) ? SvIV (uid) : -1; + req->int3 = SvOK (gid) ? SvIV (gid) : -1; + req->sv1 = newSVsv (fh_or_path); + + if (SvPOK (fh_or_path)) + { + req->type = REQ_CHOWN; + req->ptr1 = SvPVbyte_nolen (req->sv1); + } + else + { + req->type = REQ_FCHOWN; + req->int1 = PerlIO_fileno (IoIFP (sv_2io (fh_or_path))); + } + + REQ_SEND; +} + +void +aio_unlink (SV8 *pathname, SV *callback=&PL_sv_undef) ALIAS: aio_unlink = REQ_UNLINK aio_rmdir = REQ_RMDIR @@ -1598,10 +1645,21 @@ } void -aio_link (oldpath,newpath,callback=&PL_sv_undef) - SV8 * oldpath - SV8 * newpath - SV * callback +aio_mkdir (SV8 *pathname, int mode, SV *callback=&PL_sv_undef) + PPCODE: +{ + dREQ; + + req->type = REQ_MKDIR; + req->sv1 = newSVsv (pathname); + req->ptr1 = SvPVbyte_nolen (req->sv1); + req->mode = mode; + + REQ_SEND; +} + +void +aio_link (SV8 *oldpath, SV8 *newpath, SV *callback=&PL_sv_undef) ALIAS: aio_link = REQ_LINK aio_symlink = REQ_SYMLINK @@ -1611,8 +1669,8 @@ dREQ; req->type = ix; - req->fh = newSVsv (oldpath); - req->ptr2 = SvPVbyte_nolen (req->fh); + req->sv2 = newSVsv (oldpath); + req->ptr2 = SvPVbyte_nolen (req->sv2); req->sv1 = newSVsv (newpath); req->ptr1 = SvPVbyte_nolen (req->sv1); @@ -1620,11 +1678,7 @@ } void -aio_mknod (pathname,mode,dev,callback=&PL_sv_undef) - SV8 * pathname - SV * callback - UV mode - UV dev +aio_mknod (SV8 *pathname, int mode, UV dev, SV *callback=&PL_sv_undef) PPCODE: { dREQ; @@ -1639,23 +1693,19 @@ } void -aio_busy (delay,callback=&PL_sv_undef) - double delay - SV * callback +aio_busy (double delay, SV *callback=&PL_sv_undef) PPCODE: { dREQ; req->type = REQ_BUSY; - req->int1 = delay < 0. ? 0 : delay; - req->int2 = delay < 0. ? 0 : 1000. * (delay - req->int1); + req->nv1 = delay < 0. ? 0. : delay; REQ_SEND; } void -aio_group (callback=&PL_sv_undef) - SV * callback +aio_group (SV *callback=&PL_sv_undef) PROTOTYPE: ;$ PPCODE: { @@ -1668,8 +1718,7 @@ } void -aio_nop (callback=&PL_sv_undef) - SV * callback +aio_nop (SV *callback=&PL_sv_undef) PPCODE: { dREQ;