ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/BDB/BDB.xs
(Generate patch)

Comparing BDB/BDB.xs (file contents):
Revision 1.20 by root, Tue Dec 4 10:13:50 2007 UTC vs.
Revision 1.26 by root, Mon Dec 10 21:19:07 2007 UTC

… …
102 102
103enum { 103enum {
104 REQ_QUIT, 104 REQ_QUIT,
105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT, 105 REQ_ENV_OPEN, REQ_ENV_CLOSE, REQ_ENV_TXN_CHECKPOINT, REQ_ENV_LOCK_DETECT,
106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE, 106 REQ_ENV_MEMP_SYNC, REQ_ENV_MEMP_TRICKLE,
107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, 107 REQ_DB_OPEN, REQ_DB_CLOSE, REQ_DB_COMPACT, REQ_DB_SYNC, REQ_DB_UPGRADE,
108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE, 108 REQ_DB_PUT, REQ_DB_GET, REQ_DB_PGET, REQ_DB_DEL, REQ_DB_KEY_RANGE,
109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH, 109 REQ_TXN_COMMIT, REQ_TXN_ABORT, REQ_TXN_FINISH,
110 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL, 110 REQ_C_CLOSE, REQ_C_COUNT, REQ_C_PUT, REQ_C_GET, REQ_C_PGET, REQ_C_DEL,
111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE, 111 REQ_SEQ_OPEN, REQ_SEQ_CLOSE, REQ_SEQ_GET, REQ_SEQ_REMOVE,
112}; 112};
… …
326 dbt_to_sv (req->sv1, &req->dbt1); 326 dbt_to_sv (req->sv1, &req->dbt1);
327 dbt_to_sv (req->sv2, &req->dbt2); 327 dbt_to_sv (req->sv2, &req->dbt2);
328 dbt_to_sv (req->sv3, &req->dbt3); 328 dbt_to_sv (req->sv3, &req->dbt3);
329 break; 329 break;
330 330
331 case REQ_DB_PUT:
332 case REQ_C_PUT:
333 dbt_to_sv (0, &req->dbt1);
334 dbt_to_sv (0, &req->dbt2);
335 break;
336
331 case REQ_DB_KEY_RANGE: 337 case REQ_DB_KEY_RANGE:
332 { 338 {
333 AV *av = newAV (); 339 AV *av = newAV ();
334 340
335 av_push (av, newSVnv (req->key_range.less)); 341 av_push (av, newSVnv (req->key_range.less));
… …
344 350
345 case REQ_SEQ_GET: 351 case REQ_SEQ_GET:
346 SvREADONLY_off (req->sv1); 352 SvREADONLY_off (req->sv1);
347 353
348 if (sizeof (IV) > 4) 354 if (sizeof (IV) > 4)
349 sv_setiv_mg (req->sv1, req->seq_t); 355 sv_setiv_mg (req->sv1, (IV)req->seq_t);
350 else 356 else
351 sv_setnv_mg (req->sv1, req->seq_t); 357 sv_setnv_mg (req->sv1, (NV)req->seq_t);
352 358
353 SvREFCNT_dec (req->sv1); 359 SvREFCNT_dec (req->sv1);
354 break; 360 break;
355 } 361 }
356 362
… …
381#endif 387#endif
382 388
383static void 389static void
384create_respipe () 390create_respipe ()
385{ 391{
392#ifdef _WIN32
393 int arg; /* argg */
394#endif
386 int old_readfd = respipe [0]; 395 int old_readfd = respipe [0];
387 396
388 if (respipe [1] >= 0) 397 if (respipe [1] >= 0)
389 respipe_close (TO_SOCKET (respipe [1])); 398 respipe_close (TO_SOCKET (respipe [1]));
390 399
… …
403 respipe_close (respipe [0]); 412 respipe_close (respipe [0]);
404 respipe [0] = old_readfd; 413 respipe [0] = old_readfd;
405 } 414 }
406 415
407#ifdef _WIN32 416#ifdef _WIN32
408 int arg = 1; 417 arg = 1;
409 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg) 418 if (ioctlsocket (TO_SOCKET (respipe [0]), FIONBIO, &arg)
410 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg)) 419 || ioctlsocket (TO_SOCKET (respipe [1]), FIONBIO, &arg))
411#else 420#else
412 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK) 421 if (fcntl (respipe [0], F_SETFL, O_NONBLOCK)
413 || fcntl (respipe [1], F_SETFL, O_NONBLOCK)) 422 || fcntl (respipe [1], F_SETFL, O_NONBLOCK))
… …
728 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0); 737 req->result = req->db->compact (req->db, req->txn, &req->dbt1, &req->dbt2, 0, req->uint1, 0);
729 break; 738 break;
730 739
731 case REQ_DB_SYNC: 740 case REQ_DB_SYNC:
732 req->result = req->db->sync (req->db, req->uint1); 741 req->result = req->db->sync (req->db, req->uint1);
742 break;
743
744 case REQ_DB_UPGRADE:
745 req->result = req->db->upgrade (req->db, req->buf1, req->uint1);
733 break; 746 break;
734 747
735 case REQ_DB_PUT: 748 case REQ_DB_PUT:
736 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1); 749 req->result = req->db->put (req->db, req->txn, &req->dbt1, &req->dbt2, req->uint1);
737 break; 750 break;
… …
1084 const_iv (LOG_BUFFER_FULL) 1097 const_iv (LOG_BUFFER_FULL)
1085 const_iv (NOSERVER) 1098 const_iv (NOSERVER)
1086 const_iv (NOSERVER_HOME) 1099 const_iv (NOSERVER_HOME)
1087 const_iv (NOSERVER_ID) 1100 const_iv (NOSERVER_ID)
1088 const_iv (NOTFOUND) 1101 const_iv (NOTFOUND)
1089 const_iv (OLD_VERSION)
1090 const_iv (PAGE_NOTFOUND) 1102 const_iv (PAGE_NOTFOUND)
1091 const_iv (REP_DUPMASTER) 1103 const_iv (REP_DUPMASTER)
1092 const_iv (REP_HANDLE_DEAD) 1104 const_iv (REP_HANDLE_DEAD)
1093 const_iv (REP_HOLDELECTION) 1105 const_iv (REP_HOLDELECTION)
1094 const_iv (REP_IGNORE) 1106 const_iv (REP_IGNORE)
… …
1131 }; 1143 };
1132 1144
1133 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1145 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1134 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1146 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1135 1147
1136 newCONSTSUB (stash, "DB_VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1)); 1148 newCONSTSUB (stash, "VERSION", newSVnv (DB_VERSION_MAJOR + DB_VERSION_MINOR * .1));
1137 newCONSTSUB (stash, "DB_VERSION_STRING", newSVpv (DB_VERSION_STRING, 0)); 1149 newCONSTSUB (stash, "VERSION_STRING", newSVpv (DB_VERSION_STRING, 0));
1138 1150
1139 create_respipe (); 1151 create_respipe ();
1140 1152
1141 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child); 1153 X_THREAD_ATFORK (atfork_prepare, atfork_parent, atfork_child);
1142#ifdef _WIN32 1154#ifdef _WIN32
… …
1444 req->uint1 = flags; 1456 req->uint1 = flags;
1445 REQ_SEND; 1457 REQ_SEND;
1446} 1458}
1447 1459
1448void 1460void
1461db_upgrade (DB *db, octetstring file, U32 flags = 0, SV *callback = &PL_sv_undef)
1462 CODE:
1463{
1464 dREQ (REQ_DB_SYNC);
1465 req->db = db;
1466 req->buf1 = strdup (file);
1467 req->uint1 = flags;
1468 REQ_SEND;
1469}
1470
1471void
1449db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef) 1472db_key_range (DB *db, DB_TXN_ornull *txn, SV *key, SV *key_range, U32 flags = 0, SV *callback = &PL_sv_undef)
1450 CODE: 1473 CODE:
1451{ 1474{
1452 dREQ (REQ_DB_KEY_RANGE); 1475 dREQ (REQ_DB_KEY_RANGE);
1453 req->db = db; 1476 req->db = db;
… …
1724 CODE: 1747 CODE:
1725 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache); 1748 RETVAL = env->set_cachesize (env, gbytes, bytes, ncache);
1726 OUTPUT: 1749 OUTPUT:
1727 RETVAL 1750 RETVAL
1728 1751
1729int set_flags (DB_ENV *env, U32 flags, int onoff) 1752int set_flags (DB_ENV *env, U32 flags, int onoff = 1)
1730 CODE: 1753 CODE:
1731 RETVAL = env->set_flags (env, flags, onoff); 1754 RETVAL = env->set_flags (env, flags, onoff);
1732 OUTPUT: 1755 OUTPUT:
1733 RETVAL 1756 RETVAL
1734 1757
… …
1738 1761
1739void set_msgfile (DB_ENV *env, FILE *msgfile = 0) 1762void set_msgfile (DB_ENV *env, FILE *msgfile = 0)
1740 CODE: 1763 CODE:
1741 env->set_msgfile (env, msgfile); 1764 env->set_msgfile (env, msgfile);
1742 1765
1743int set_verbose (DB_ENV *env, U32 which, int onoff = 1) 1766int set_verbose (DB_ENV *env, U32 which = -1, int onoff = 1)
1744 CODE: 1767 CODE:
1745 RETVAL = env->set_verbose (env, which, onoff); 1768 RETVAL = env->set_verbose (env, which, onoff);
1746 OUTPUT: 1769 OUTPUT:
1747 RETVAL 1770 RETVAL
1748 1771
… …
1808 1831
1809int set_lg_max (DB_ENV *env, U32 max) 1832int set_lg_max (DB_ENV *env, U32 max)
1810 CODE: 1833 CODE:
1811 RETVAL = env->set_lg_max (env, max); 1834 RETVAL = env->set_lg_max (env, max);
1812 OUTPUT: 1835 OUTPUT:
1836 RETVAL
1837
1838int mutex_set_max (DB_ENV *env, U32 max)
1839 CODE:
1840 RETVAL = env->mutex_set_max (env, max);
1841 OUTPUT:
1842 RETVAL
1843
1844int mutex_set_increment (DB_ENV *env, U32 increment)
1845 CODE:
1846 RETVAL = env->mutex_set_increment (env, increment);
1847 OUTPUT:
1848 RETVAL
1849
1850int mutex_set_tas_spins (DB_ENV *env, U32 tas_spins)
1851 CODE:
1852 RETVAL = env->mutex_set_tas_spins (env, tas_spins);
1853 OUTPUT:
1854 RETVAL
1855
1856int mutex_set_align (DB_ENV *env, U32 align)
1857 CODE:
1858 RETVAL = env->mutex_set_align (env, align);
1859 OUTPUT:
1813 RETVAL 1860 RETVAL
1814 1861
1815DB_TXN * 1862DB_TXN *
1816txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0) 1863txn_begin (DB_ENV *env, DB_TXN_ornull *parent = 0, U32 flags = 0)
1817 CODE: 1864 CODE:

Diff Legend

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