[ViewVC] Diff of: cvs/BDB/BDB.pm

Comparing BDB/BDB.pm (file contents):
Revision 1.41 by root, Wed Jul 9 12:15:36 2008 UTC vs.
Revision 1.52 by root, Mon Oct 20 02:33:40 2008 UTC

 no warnings;
 use strict 'vars';
 use base 'Exporter';
+our $VERSION;
 BEGIN {
-   our $VERSION = '1.6';
+   $VERSION = '1.81';
    our @BDB_REQ = qw(
       db_env_open db_env_close db_env_txn_checkpoint db_env_lock_detect
       db_env_memp_sync db_env_memp_trickle db_env_dbrename db_env_dbremove
       db_open db_close db_compact db_sync db_upgrade
-      db_put db_get db_pget db_del db_key_range
+      db_put db_exists db_get db_pget db_del db_key_range
       db_txn_commit db_txn_abort db_txn_finish
       db_c_close db_c_count db_c_put db_c_get db_c_pget db_c_del
       db_sequence_open db_sequence_close
       db_sequence_get db_sequence_remove
    );
       flags: FREELIST_ONLY FREE_SPACE
    db_sync (DB *db, U32 flags = 0, SV *callback = &PL_sv_undef)
    db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
    db_put (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
       flags: APPEND NODUPDATA NOOVERWRITE
+   db_exists (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = 0) (v4.6)
    db_get (DB *db, DB_TXN_ornull *txn, SV *key, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
       flags: CONSUME CONSUME_WAIT GET_BOTH SET_RECNO MULTIPLE READ_COMMITTED READ_UNCOMMITTED RMW
    db_pget (DB *db, DB_TXN_ornull *txn, SV *key, SV *pkey, SV *data, U32 flags = 0, SV *callback = &PL_sv_undef)
       flags: CONSUME CONSUME_WAIT GET_BOTH SET_RECNO MULTIPLE READ_COMMITTED READ_UNCOMMITTED RMW
    db_del (DB *db, DB_TXN_ornull *txn, SV *key, U32 flags = 0, SV *callback = &PL_sv_undef)
    $int = $env->set_tmp_dir (const char *dir)
    $int = $env->set_lg_dir (const char *dir)
    $int = $env->set_shm_key (long shm_key)
    $int = $env->set_cachesize (U32 gbytes, U32 bytes, int ncache = 0)
    $int = $env->set_flags (U32 flags, int onoff = 1)
-   $int = $env->log_set_config (U32 flags, int onoff = 1) [v4.7]
+   $int = $env->log_set_config (U32 flags, int onoff = 1) (v4.7)
-   $int = $env->set_intermediate_dir_mode (const char *modestring) [v4.7]
+   $int = $env->set_intermediate_dir_mode (const char *modestring) (v4.7)
    $env->set_errfile (FILE *errfile = 0)
    $env->set_msgfile (FILE *msgfile = 0)
    $int = $env->set_verbose (U32 which, int onoff = 1)
    $int = $env->set_encrypt (const char *password, U32 flags = 0)
    $int = $env->set_timeout (NV timeout_seconds, U32 flags = SET_TXN_TIMEOUT)
    $int = $env->mutex_set_max (U32 max)
    $int = $env->mutex_set_align (U32 align)
    $txn = $env->txn_begin (DB_TXN_ornull *parent = 0, U32 flags = 0)
       flags: READ_COMMITTED READ_UNCOMMITTED TXN_NOSYNC TXN_NOWAIT TXN_SNAPSHOT TXN_SYNC TXN_WAIT TXN_WRITE_NOSYNC
+   $txn = $env->cdsgroup_begin; (v4.5)
 =head4 Example:
    use AnyEvent;
    use BDB;
    DESTROY (DBC_ornull *dbc)
            CODE:
            if (dbc)
              dbc->c_close (dbc);
-   $int = $cursor->set_priority ($priority = PRIORITY_*)
+   $int = $cursor->set_priority ($priority = PRIORITY_*) (v4.6)
 =head4 Example:
    my $c = $db->cursor;
 BerkeleyDB comes in various versions, many of them have minor
 incompatibilities. This means that traditional "at least version x.x"
 checks are often not sufficient.
-Example: set the log_autoremove option in a way compatible with <v.47 and
+Example: set the log_autoremove option in a way compatible with <v4.7 and
 v4.7. Note the use of & on the constants to avoid triggering a compiletime
 bug when the symbol isn't available.
    $DB_ENV->set_flags      (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
    $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
 =back
 =cut
 sub VERSION {
+   # I was dumb enough to override the VERSION method here, so let's try
+   # to fix it up.
+   if ($_[0] eq __PACKAGE__) {
+      $VERSION
+   } else {
-   if (@_ > 0) {
+      if (@_ > 0) {
-      return undef if VERSION_v lt $_[0];
+         return undef if VERSION_v lt $_[0];
-      if (@_ > 1) {
+         if (@_ > 1) {
-         return undef if VERSION_v ge $_[1];
+            return undef if VERSION_v ge $_[1];
+         }
       }
+      VERSION_v
    }
-   VERSION_v
 }
 =head3 CONTROLLING THE NUMBER OF THREADS
 =over 4
 You can still queue as many requests as you want. Therefore,
 C<max_oustsanding> is mainly useful in simple scripts (with low values) or
 as a stop gap to shield against fatal memory overflow (with large values).
-=item BDB::set_sync_prepare $cb
+=item $old_cb = BDB::set_sync_prepare $cb
 Sets a callback that is called whenever a request is created without an
 explicit callback. It has to return two code references. The first is used
 as the request callback (it should save the return status), and the second
 is called to wait until the first callback has been called (it must set
 C<$!> to the return status).
 This mechanism can be used to include BDB into other event mechanisms,
-such as L<AnyEvent::BDB> or L<Coro::BDB>.
+such as L<Coro::BDB>.
-The default implementation works like this:
+To allow other, callback-based, events to be executed while callback-less
+ones are run, you could use this sync prepare function:
    sub {
       my $status;
       (
          sub { $status = $! },
          sub { BDB::poll while !defined $status; $! = $status },
       )
    }
-It simply blocks the process till the request has finished and then sets
+It works by polling for results till the request has finished and then
-C<$!> to the return value. This means that if you don't use a callback,
+sets C<$!> to the return value. This means that if you don't use a
-BDB will simply fall back to synchronous operations.
+callback, BDB would simply fall back to synchronous operations.
+By default, or if the sync prepare function is set to C<undef>, is to
+execute callback-less BDB requests in the foreground thread, setting C<$!>
+to the return value, without polling for other events.
 =back
 =head3 STATISTICAL INFORMATION
 =back
 =cut
-set_sync_prepare {
+set_sync_prepare (undef);
-   my $status;
-   (
-      sub {
-         $status = $!;
-      },
-      sub {
-         BDB::poll while !defined $status;
-         $! = $status;
-      },
-   )
-};
 min_parallel 8;
 END { flush }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing BDB/BDB.pm (file contents): Revision 1.41 by root, Wed Jul 9 12:15:36 2008 UTC vs. Revision 1.52 by root, Mon Oct 20 02:33:40 2008 UTC

Diff Legend

Comparing BDB/BDB.pm (file contents):
Revision 1.41 by root, Wed Jul 9 12:15:36 2008 UTC vs.
Revision 1.52 by root, Mon Oct 20 02:33:40 2008 UTC