--- IO-AIO/AIO.xs	2005/07/10 20:57:00	1.4
+++ IO-AIO/AIO.xs	2005/07/11 02:53:59	1.8
@@ -1,5 +1,3 @@
-#define PERL_NO_GET_CONTEXT
-
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -79,7 +77,7 @@
 }
 
 static int
-poll_cb (pTHX)
+poll_cb ()
 {
   dSP;
   int count = 0;
@@ -152,9 +150,12 @@
               XPUSHs (fh);
             }
 
-          PUTBACK;
-          call_sv (req->callback, G_VOID | G_EVAL);
-          SPAGAIN;
+          if (SvOK (req->callback))
+            {
+              PUTBACK;
+              call_sv (req->callback, G_VOID | G_EVAL);
+              SPAGAIN;
+            }
           
           if (req->callback)
             SvREFCNT_dec (req->callback);
@@ -229,8 +230,7 @@
 }
 
 static void
-read_write (pTHX_
-            int dowrite, int fd, off_t offset, size_t length,
+read_write (int dowrite, int fd, off_t offset, size_t length,
             SV *data, STRLEN dataoffset, SV *callback)
 {
   aio_req req;
@@ -366,6 +366,8 @@
 
 MODULE = IO::AIO                PACKAGE = IO::AIO
 
+PROTOTYPES: ENABLE
+
 BOOT:
 {
         if (pipe (respipe))
@@ -402,7 +404,7 @@
         while (started > nthreads)
           {
             poll_wait ();
-            poll_cb (aTHX);
+            poll_cb ();
           }
 }
 
@@ -415,12 +417,12 @@
         max_outstanding = nreqs;
 
 void
-aio_open(pathname,flags,mode,callback)
+aio_open(pathname,flags,mode,callback=&PL_sv_undef)
 	SV *	pathname
         int	flags
         int	mode
         SV *	callback
-	PROTOTYPE: $$$$
+	PROTOTYPE: $$$;$
 	CODE:
 {
         aio_req req;
@@ -441,10 +443,10 @@
 }
 
 void
-aio_close(fh,callback)
+aio_close(fh,callback=&PL_sv_undef)
         InputStream	fh
         SV *		callback
-	PROTOTYPE: $$
+	PROTOTYPE: $;$
         ALIAS:
            aio_close     = REQ_CLOSE
            aio_fsync     = REQ_FSYNC
@@ -466,36 +468,36 @@
 }
 
 void
-aio_read(fh,offset,length,data,dataoffset,callback)
+aio_read(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
         InputStream	fh
         UV		offset
         IV		length
         SV *		data
         IV		dataoffset
         SV *		callback
-	PROTOTYPE: $$$$$$
+	PROTOTYPE: $$$$$;$
         CODE:
-        read_write (aTHX_ 0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
+        read_write (0, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
 
 void
-aio_write(fh,offset,length,data,dataoffset,callback)
+aio_write(fh,offset,length,data,dataoffset,callback=&PL_sv_undef)
         OutputStream	fh
         UV		offset
         IV		length
         SV *		data
         IV		dataoffset
         SV *		callback
-	PROTOTYPE: $$$$$$
+	PROTOTYPE: $$$$$;$
         CODE:
-        read_write (aTHX_ 1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
+        read_write (1, PerlIO_fileno (fh), offset, length, data, dataoffset, callback);
 
 void
-aio_readahead(fh,offset,length,callback)
+aio_readahead(fh,offset,length,callback=&PL_sv_undef)
         InputStream	fh
         UV		offset
         IV		length
         SV *		callback
-	PROTOTYPE: $$$$
+	PROTOTYPE: $$$;$
         CODE:
 {
         aio_req req;
@@ -518,12 +520,12 @@
 }
 
 void
-aio_stat(fh_or_path,callback)
+aio_stat(fh_or_path,callback=&PL_sv_undef)
         SV *		fh_or_path
         SV *		callback
-	PROTOTYPE: $$
         ALIAS:
-           aio_lstat = 1
+           aio_stat  = REQ_STAT
+           aio_lstat = REQ_LSTAT
 	CODE:
 {
         aio_req req;
@@ -540,7 +542,7 @@
 
         if (SvPOK (fh_or_path))
           {
-            req->type = ix ? REQ_LSTAT : REQ_STAT;
+            req->type = ix;
             req->data = newSVsv (fh_or_path);
             req->dataptr = SvPV_nolen (req->data);
           }
@@ -556,10 +558,9 @@
 }
 
 void
-aio_unlink(pathname,callback)
+aio_unlink(pathname,callback=&PL_sv_undef)
 	SV * pathname
 	SV * callback
-	PROTOTYPE: $$
 	CODE:
 {
 	aio_req req;
@@ -577,6 +578,26 @@
 	send_req (req);
 }
 
+void
+flush()
+	PROTOTYPE:
+	CODE:
+        while (nreqs)
+          {
+            poll_wait ();
+            poll_cb ();
+          }
+
+void
+poll()
+	PROTOTYPE:
+	CODE:
+        if (nreqs)
+          {
+            poll_wait ();
+            poll_cb ();
+          }
+
 int
 poll_fileno()
 	PROTOTYPE:
@@ -589,7 +610,7 @@
 poll_cb(...)
 	PROTOTYPE:
 	CODE:
-        RETVAL = poll_cb (aTHX);
+        RETVAL = poll_cb ();
 	OUTPUT:
 	RETVAL