--- BDB/BDB.xs	2007/12/22 07:33:48	1.28
+++ BDB/BDB.xs	2008/05/10 20:23:06	1.37
@@ -42,8 +42,14 @@
 typedef DB          DB_ornull;
 typedef DB_SEQUENCE DB_SEQUENCE_ornull;
 
+typedef DB_ENV      DB_ENV_ornuked;
+typedef DB_TXN      DB_TXN_ornuked;
+typedef DBC         DBC_ornuked;
+typedef DB          DB_ornuked;
+typedef DB_SEQUENCE DB_SEQUENCE_ornuked;
+
 typedef SV SV8; /* byte-sv, used for argument-checking */
-typedef char *octetstring;
+typedef char *bdb_filename;
 
 static SV *prepare_cb;
 
@@ -57,6 +63,36 @@
 # define c_put   put   
 #endif
 
+static char *
+get_bdb_filename (SV *sv)
+{
+  if (!SvOK (sv))
+    return 0;
+
+#if _WIN32
+  /* win32 madness + win32 perl absolutely brokenness make for horrible hacks */
+  {
+    STRLEN len;
+    char *src = SvPVbyte (sv, len);
+    SV *t1 = sv_newmortal ();
+    SV *t2 = sv_newmortal ();
+
+    sv_upgrade (t1, SVt_PV); SvPOK_only (t1); SvGROW (t1, len * 16 + 1);
+    sv_upgrade (t2, SVt_PV); SvPOK_only (t2); SvGROW (t2, len * 16 + 1);
+
+    len = MultiByteToWideChar (CP_ACP, 0, src, len, (WCHAR *)SvPVX (t1), SvLEN (t1) / sizeof (WCHAR));
+    len = WideCharToMultiByte (CP_UTF8, 0, (WCHAR *)SvPVX (t1), len, SvPVX (t2), SvLEN (t2), 0, 0);
+    SvPOK_only (t2);
+    SvPVX (t2)[len] = 0;
+    SvCUR_set (t2, len);
+
+    return SvPVX (t2);
+  }
+#else
+  return SvPVbyte_nolen (sv);
+#endif
+}
+
 static void
 debug_errcall (const DB_ENV *dbenv, const char *errpfx, const char *msg)
 {
@@ -147,6 +183,8 @@
 
 #define AIO_TICKS ((1000000 + 1023) >> 10)
 
+static SV *on_next_submit;
+
 static unsigned int max_poll_time = 0;
 static unsigned int max_poll_reqs = 0;
 
@@ -201,7 +239,7 @@
 
 #if WORDACCESS_UNSAFE
 
-static unsigned int get_nready ()
+static unsigned int get_nready (void)
 {
   unsigned int retval;
 
@@ -212,7 +250,7 @@
   return retval;
 }
 
-static unsigned int get_npending ()
+static unsigned int get_npending (void)
 {
   unsigned int retval;
 
@@ -223,7 +261,7 @@
   return retval;
 }
 
-static unsigned int get_nthreads ()
+static unsigned int get_nthreads (void)
 {
   unsigned int retval;
 
@@ -296,7 +334,7 @@
   abort ();
 }
 
-static int poll_cb ();
+static int poll_cb (void);
 static void req_free (bdb_req req);
 static void req_cancel (bdb_req req);
 
@@ -387,7 +425,7 @@
 #endif
 
 static void
-create_respipe ()
+create_respipe (void)
 {
 #ifdef _WIN32
   int arg; /* argg */
@@ -451,7 +489,7 @@
   X_UNLOCK (wrklock);
 }
 
-static void maybe_start_thread ()
+static void maybe_start_thread (void)
 {
   if (get_nthreads () >= wanted)
     return;
@@ -467,6 +505,18 @@
 {
   SV *wait_callback = 0;
 
+  if (on_next_submit)
+    {
+      dSP;
+      SV *cb = sv_2mortal (on_next_submit);
+
+      on_next_submit = 0;
+
+      PUSHMARK (SP);
+      PUTBACK;
+      call_sv (cb, G_DISCARD | G_EVAL);
+    }
+
   // synthesize callback if none given
   if (!SvOK (req->callback))
     {
@@ -546,7 +596,7 @@
     end_thread ();
 }
 
-static void poll_wait ()
+static void poll_wait (void)
 {
   fd_set rfd;
 
@@ -569,7 +619,7 @@
     }
 }
 
-static int poll_cb ()
+static int poll_cb (void)
 {
   dSP;
   int count = 0;
@@ -924,10 +974,10 @@
 #define REQ_SEND						\
   req_send (req)
 
-#define SvPTR(var, arg, type, class, nullok)                    		\
+#define SvPTR(var, arg, type, class, nullok)                   			\
   if (!SvOK (arg))								\
     {										\
-      if (!nullok)								\
+      if (nullok != 1)								\
         croak (# var " must be a " # class " object, not undef");		\
 										\
       (var) = 0;								\
@@ -936,7 +986,7 @@
     {                                                           		\
       IV tmp = SvIV ((SV*) SvRV (arg));                         		\
       (var) = INT2PTR (type, tmp);                              		\
-      if (!var)									\
+      if (!var && nullok != 2)									\
         croak (# var " is not a valid " # class " object anymore");		\
     }                                                           		\
   else                                                          		\
@@ -950,6 +1000,45 @@
   sv_setiv (SvRV (sv), 0);
 }
 
+static int
+errno_get (pTHX_ SV *sv, MAGIC *mg)
+{
+  if (*mg->mg_ptr == '!') // should always be the case
+    if (-30999 <= errno && errno <= -30800)
+      {
+        sv_setnv (sv, (NV)errno);
+        sv_setpv (sv, db_strerror (errno));
+        SvNOK_on (sv); /* what a wonderful hack! */
+                       // ^^^ copied from perl sources
+        return 0;
+      }
+
+  return PL_vtbl_sv.svt_get (aTHX_ sv, mg);
+}
+
+static MGVTBL vtbl_errno;
+
+// this wonderful hack :( patches perl's $! variable to support our errno values
+static void
+patch_errno (void)
+{
+  SV *sv;
+  MAGIC *mg;
+
+  if (!(sv = get_sv ("!", 1)))
+    return;
+
+  if (!(mg = mg_find (sv, PERL_MAGIC_sv)))
+    return;
+
+  if (mg->mg_virtual != &PL_vtbl_sv)
+    return;
+
+  vtbl_errno = PL_vtbl_sv;
+  vtbl_errno.svt_get = errno_get;
+  mg->mg_virtual = &vtbl_errno;
+}
+
 MODULE = BDB                PACKAGE = BDB
 
 PROTOTYPES: ENABLE
@@ -1155,6 +1244,7 @@
 
         X_COND_CHECK  (reqwait);
 #endif
+        patch_errno ();
 }
 
 void
@@ -1304,6 +1394,11 @@
 	OUTPUT:
         RETVAL
 
+void _on_next_submit (SV *cb)
+        CODE:
+        SvREFCNT_dec (on_next_submit);
+        on_next_submit = SvOK (cb) ? newSVsv (cb) : 0;
+
 DB_ENV *
 db_env_create (U32 env_flags = 0)
 	CODE:
@@ -1322,13 +1417,11 @@
 	RETVAL
 
 void
-db_env_open (DB_ENV *env, octetstring db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
+db_env_open (DB_ENV *env, bdb_filename db_home, U32 open_flags, int mode, SV *callback = &PL_sv_undef)
 	CODE:
 {
         dREQ (REQ_ENV_OPEN);
 
-  	env->set_thread_count (env, wanted + 2);
-
         req->env   = env;
         req->uint1 = open_flags | DB_THREAD;
         req->int1  = mode;
@@ -1405,7 +1498,7 @@
 	RETVAL
 
 void
-db_open (DB *db, DB_TXN_ornull *txnid, octetstring file, octetstring database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
+db_open (DB *db, DB_TXN_ornull *txnid, bdb_filename file, bdb_filename database, int type, U32 flags, int mode, SV *callback = &PL_sv_undef)
 	CODE:
 {
         dREQ (REQ_DB_OPEN);
@@ -1455,7 +1548,7 @@
 }
 
 void
-db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
+db_upgrade (DB *db, bdb_filename file, U32 flags = 0, SV *callback = &PL_sv_undef)
 	CODE:
 {
         dREQ (REQ_DB_SYNC);
@@ -1715,7 +1808,7 @@
 MODULE = BDB		PACKAGE = BDB::Env
 
 void
-DESTROY (DB_ENV_ornull *env)
+DESTROY (DB_ENV_ornuked *env)
 	CODE:
         if (env)
           env->close (env, 0);
@@ -1872,7 +1965,7 @@
 MODULE = BDB		PACKAGE = BDB::Db
 
 void
-DESTROY (DB_ornull *db)
+DESTROY (DB_ornuked *db)
 	CODE:
         if (db)
           {
@@ -1977,7 +2070,7 @@
 MODULE = BDB		PACKAGE = BDB::Txn
 
 void
-DESTROY (DB_TXN_ornull *txn)
+DESTROY (DB_TXN_ornuked *txn)
 	CODE:
         if (txn)
           txn->abort (txn);
@@ -1998,7 +2091,7 @@
 MODULE = BDB		PACKAGE = BDB::Cursor
 
 void
-DESTROY (DBC_ornull *dbc)
+DESTROY (DBC_ornuked *dbc)
 	CODE:
         if (dbc)
           dbc->c_close (dbc);
@@ -2014,7 +2107,7 @@
 MODULE = BDB		PACKAGE = BDB::Sequence
 
 void
-DESTROY (DB_SEQUENCE_ornull *seq)
+DESTROY (DB_SEQUENCE_ornuked *seq)
 	CODE:
         if (seq)
           seq->close (seq, 0);
@@ -2043,3 +2136,4 @@
 	OUTPUT:
         RETVAL
 
+