* Wrap txn_begin and txn_end in S_DATABASE mutex

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 8ab50018efae03fd2637081f7eda716de88dd6e0..f93ef6058ba5bf5a22e521d03b9662ad9c9f1d69 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.43  2000/12/08 17:06:33  ajc
+ * Wrap txn_begin and txn_end in S_DATABASE mutex
+
  Revision 573.42  2000/12/07 20:21:39  ajc
  * begin/end transaction in master_startup()
 
@@ -2194,3 +2197,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
+

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index d11100dd5aaef408efb3649269dddae7b373a4fd..2781ea9d02c509e8b9c2aeff442b4deec711e183 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -394,7 +394,9 @@ struct cdbdata *cdb_next_item(int cdb)
 void cdb_begin_transaction(void) {
 
 #ifdef TRANSACTION_BASED
+       begin_critical_section(S_DATABASE);
        txn_begin(dbenv, NULL, &MYTID, 0);
+       end_critical_section(S_DATABASE);
 #else
        MYTID = NULL;
 #endif
@@ -402,6 +404,8 @@ void cdb_begin_transaction(void) {
 
 void cdb_end_transaction(void) {
 #ifdef TRANSACTION_BASED
+       begin_critical_section(S_DATABASE);
        txn_commit(MYTID, 0);
+       end_critical_section(S_DATABASE);
 #endif
 }

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index 1d532b14a86bcb465bf8bbb7831d358a782ffa3b..15f43df16fd8a1efbb3dbb2b394f4cc241151525 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -177,7 +177,6 @@ void check_ref_counts(void) {
 
        lprintf(7, "Checking floor reference counts\n");
        for (a=0; a<MAXFLOORS; ++a) {
-               lprintf(9, "Resetting floor %d\n", a);
                getfloor(&flbuf, a);
                flbuf.f_ref_count = 0;
                flbuf.f_flags = flbuf.f_flags & ~QR_INUSE;

diff --git a/citadel/network/mail.sysinfo b/citadel/network/mail.sysinfo
index 35893fae95e26bd5df1b402810a433a4bd804a91..a39d9e82d6105c891e1410f6c27d0757f0a59d89 100644 (file)
--- a/citadel/network/mail.sysinfo
+++ b/citadel/network/mail.sysinfo
@@ -1,49 +1,78 @@
+tiamat
+use uncnsrd
+phonenum netproc[32384]: Adding non-neighbor system <jacs> to map
+gdom bor system <jacs> to map
+humannode DragonHart Cove
+lastcontact 976172347 Thu Dec  7 01:59:07 2000
+
+jacs
+use uncnsrd
+phonenum US6093461224
+gdom NJ
+humannode JACS
+lastcontact 976081144 Wed Dec  6 00:39:04 2000
+
+ctestsys
+use uncnsrd
+phonenum US 612 470 9635
+gdom MN
+humannode C-86 Test System
+lastcontact 976258745 Fri Dec  8 01:59:05 2000
+
+internet
+uum %s
+humannode Internet Gateway
+lastcontact 976258745 Fri Dec  8 01:59:05 2000
+
+uncnsrd
 bin Mail
+phonenum US 914 244 3252
+humannode Uncensored
+lastcontact 976258746 Fri Dec  8 01:59:06 2000
+
+test
 bin Mail
-humannode Ô\91\ 4\bhðÿ¿lðÿ¿
-lastcontact 976082265 Wed Dec  6 00:57:45 2000
 
-iscabbs
-use uncnsrd
-phonenum netproc[23043]: Adding non-neighbor system <catchat> to map
-gdom bor system <catchat> to map
-humannode ISCA BBS
-lastcontact 975653967 Fri Dec  1 01:59:27 2000
+tesseract
+bin Mail
+phonenum US 800 555 1212
+humannode Tesseract Project
+lastcontact 976258746 Fri Dec  8 01:59:06 2000
 
-catchat
+pixel
 use uncnsrd
-phonenum netproc[23043]: Adding non-neighbor system <anansidel> to map
-gdom bor system <anansidel> to map
-humannode 'Cat Chat
-lastcontact 975653966 Fri Dec  1 01:59:26 2000
+phonenum netproc[4026]: Adding non-neighbor system <tesseract> to map
+gdom or system <tesseract> to map
+humannode PixelBBS
+lastcontact 976258746 Fri Dec  8 01:59:06 2000
 
-anansidel
+haven
 use uncnsrd
-phonenum netproc[23043]: Adding non-neighbor system <twwol> to map
-gdom bor system <twwol> to map
-humannode Anansi-Del
-lastcontact 975653965 Fri Dec  1 01:59:25 2000
+phonenum netproc[4026]: Adding non-neighbor system <barbaria> to map
+gdom or system <barbaria> to map
+humannode Haven BBS
+lastcontact 976172347 Thu Dec  7 01:59:07 2000
 
-twwol
+amigazon
 use uncnsrd
-phonenum netproc[23043]: Adding non-neighbor system <marshill> to map
-gdom bor system <marshill> to map
-humannode TWWOL
-lastcontact 975653964 Fri Dec  1 01:59:24 2000
+phonenum US (609) 953 8159
+gdom NJ
+humannode The Amiga Zone
+lastcontact 975653967 Fri Dec  1 01:59:27 2000
 
-marshill
+feathers
 use uncnsrd
 phonenum CA (604) 589-8539
 gdom BC
-humannode Mars Hill
-lastcontact 976172348 Thu Dec  7 01:59:08 2000
+humannode Feathers & Furballs
+lastcontact 975653963 Fri Dec  1 01:59:23 2000
 
-bellicose
+dogpound2
 use uncnsrd
-phonenum netproc[23043]: Adding non-neighbor system <aspen> to map
-gdom bor system <aspen> to map
-humannode The Bellicose BBS
-lastcontact 975653967 Fri Dec  1 01:59:27 2000
+phonenum netproc[4026]: Adding non-neighbor system <sbn> to map
+gdom or system <sbn> to map
+humannode Dog Pound BBS II
+lastcontact 976172348 Thu Dec  7 01:59:08 2000
 
 aspen
 use uncnsrd
@@ -52,79 +81,50 @@ gdom bor system <bin Mail> to map
 humannode Retrovertigo
 lastcontact 976081151 Wed Dec  6 00:39:11 2000
 
-dogpound2
+bellicose
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <sbn> to map
-gdom or system <sbn> to map
-humannode Dog Pound BBS II
-lastcontact 976172348 Thu Dec  7 01:59:08 2000
+phonenum netproc[23043]: Adding non-neighbor system <aspen> to map
+gdom bor system <aspen> to map
+humannode The Bellicose BBS
+lastcontact 975653967 Fri Dec  1 01:59:27 2000
 
-feathers
+marshill
 use uncnsrd
 phonenum CA (604) 589-8539
 gdom BC
-humannode Feathers & Furballs
-lastcontact 975653963 Fri Dec  1 01:59:23 2000
+humannode Mars Hill
+lastcontact 976258745 Fri Dec  8 01:59:05 2000
 
-amigazon
+twwol
 use uncnsrd
-phonenum US (609) 953 8159
-gdom NJ
-humannode The Amiga Zone
-lastcontact 975653967 Fri Dec  1 01:59:27 2000
+phonenum netproc[23043]: Adding non-neighbor system <marshill> to map
+gdom bor system <marshill> to map
+humannode TWWOL
+lastcontact 975653964 Fri Dec  1 01:59:24 2000
 
-haven
+anansidel
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <barbaria> to map
-gdom or system <barbaria> to map
-humannode Haven BBS
-lastcontact 976172347 Thu Dec  7 01:59:07 2000
+phonenum netproc[23043]: Adding non-neighbor system <twwol> to map
+gdom bor system <twwol> to map
+humannode Anansi-Del
+lastcontact 975653965 Fri Dec  1 01:59:25 2000
 
-pixel
+catchat
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <tesseract> to map
-gdom or system <tesseract> to map
-humannode PixelBBS
-lastcontact 976081151 Wed Dec  6 00:39:11 2000
+phonenum netproc[23043]: Adding non-neighbor system <anansidel> to map
+gdom bor system <anansidel> to map
+humannode 'Cat Chat
+lastcontact 975653966 Fri Dec  1 01:59:26 2000
 
-tesseract
-bin Mail
-phonenum US 800 555 1212
-humannode Tesseract Project
-lastcontact 976172349 Thu Dec  7 01:59:09 2000
+iscabbs
+use uncnsrd
+phonenum netproc[23043]: Adding non-neighbor system <catchat> to map
+gdom bor system <catchat> to map
+humannode ISCA BBS
+lastcontact 975653967 Fri Dec  1 01:59:27 2000
 
-test
 bin Mail
-
-uncnsrd
 bin Mail
-phonenum US 914 244 3252
-humannode Uncensored
-lastcontact 976172348 Thu Dec  7 01:59:08 2000
-
-internet
-uum %s
-humannode Internet Gateway
-lastcontact 976172347 Thu Dec  7 01:59:07 2000
-
-ctestsys
-use uncnsrd
-phonenum US 612 470 9635
-gdom MN
-humannode C-86 Test System
-lastcontact 975826743 Sun Dec  3 01:59:03 2000
-
-jacs
-use uncnsrd
-phonenum US6093461224
-gdom NJ
-humannode JACS
-lastcontact 976081144 Wed Dec  6 00:39:04 2000
-
-tiamat
-use uncnsrd
-phonenum netproc[32384]: Adding non-neighbor system <jacs> to map
-gdom bor system <jacs> to map
-humannode DragonHart Cove
-lastcontact 976172347 Thu Dec  7 01:59:07 2000
+humannode Ô\91\ 4\bhðÿ¿lðÿ¿
+lastcontact 976082265 Wed Dec  6 00:57:45 2000