* begin/end transaction in master_startup()

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f87b8b972609ca572c08b0096553823fb3daaa04..8ab50018efae03fd2637081f7eda716de88dd6e0 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 573.42  2000/12/07 20:21:39  ajc
+ * begin/end transaction in master_startup()
+
  Revision 573.41  2000/12/07 16:59:02  nbryant
  added --with-db and --with-gdbm options to configure
 
@@ -2191,4 +2194,3 @@ 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/citserver.c b/citadel/citserver.c
index 03ce8595f754012a67e63b2de7c2d4ad75713817..8b847717571759cc56e8103d93a5ff0852c96bc6 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -57,10 +57,12 @@ void master_startup(void) {
        lprintf(7, "Opening databases\n");
        open_databases();
 
-       if (do_defrag)
+       if (do_defrag) {
                defrag_databases();
+       }
+
+       cdb_begin_transaction();
 
-       lprintf(7, "Checking floor reference counts\n");
        check_ref_counts();
 
        lprintf(7, "Creating base rooms (if necessary)\n");
@@ -69,11 +71,11 @@ void master_startup(void) {
        create_room(SYSCONFIGROOM,      3, "", 0);
        create_room(config.c_twitroom,  0, "", 0);
 
-/* Seed the PRNG */
-       
        lprintf(7, "Seeding the pseudo-random number generator...\n");
        gettimeofday(&tv, NULL);
        srand(tv.tv_usec);
+
+       cdb_end_transaction();
 }
 
 /*

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index 03131854e02d72e1c460cfd317c456dbc4866a8b..d11100dd5aaef408efb3649269dddae7b373a4fd 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -261,7 +261,7 @@ int cdb_store(int cdb,
                                0);             /* flags */
        end_critical_section(S_DATABASE);
        if (ret) {
-               lprintf(1, "cdb_store: %s\n", db_strerror(ret));
+               lprintf(1, "cdb_store(%d): %s\n", cdb, db_strerror(ret));
                return (-1);
        }
        return (0);

diff --git a/citadel/housekeeping.c b/citadel/housekeeping.c
index aa380f12b8074ed61148a1b779b5e4900344db01..1d532b14a86bcb465bf8bbb7831d358a782ffa3b 100644 (file)
--- a/citadel/housekeeping.c
+++ b/citadel/housekeeping.c
@@ -169,19 +169,21 @@ void check_ref_counts_backend(struct quickroom *qrbuf, void *data) {
        ++flbuf.f_ref_count;
        flbuf.f_flags = flbuf.f_flags | QR_INUSE;
        putfloor(&flbuf, qrbuf->QRfloor);
-       }
+}
 
 void check_ref_counts(void) {
        struct floor flbuf;
        int a;
 
+       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;
                putfloor(&flbuf, a);
-               }
+       }
 
        ForEachRoom(check_ref_counts_backend, NULL);
-       }       
+}      
 

diff --git a/citadel/network/mail.sysinfo b/citadel/network/mail.sysinfo
index 1bce5d13af62d79910d1fa1795c99b0d169b667d..35893fae95e26bd5df1b402810a433a4bd804a91 100644 (file)
--- a/citadel/network/mail.sysinfo
+++ b/citadel/network/mail.sysinfo
@@ -1,78 +1,49 @@
-tiamat
-use uncnsrd
-phonenum netproc[32384]: Adding non-neighbor system <jacs> to map
-gdom bor system <jacs> to map
-humannode DragonHart Cove
-lastcontact 976081151 Wed Dec  6 00:39:11 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 975826743 Sun Dec  3 01:59:03 2000
-
-internet
-uum %s
-humannode Internet Gateway
-lastcontact 976085942 Wed Dec  6 01:59:02 2000
-
-uncnsrd
 bin Mail
-phonenum US 914 244 3252
-humannode Uncensored
-lastcontact 976081151 Wed Dec  6 00:39:11 2000
-
-test
 bin Mail
+humannode Ô\91\ 4\bhðÿ¿lðÿ¿
+lastcontact 976082265 Wed Dec  6 00:57:45 2000
 
-tesseract
-bin Mail
-phonenum US 800 555 1212
-humannode Tesseract Project
-lastcontact 976085943 Wed Dec  6 01:59:03 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
 
-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
 
-haven
+anansidel
 use uncnsrd
-phonenum netproc[4026]: Adding non-neighbor system <barbaria> to map
-gdom or system <barbaria> to map
-humannode Haven BBS
-lastcontact 976081148 Wed Dec  6 00:39:08 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
 
-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
 
-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 976172348 Thu Dec  7 01:59:08 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 976081151 Wed Dec  6 00:39:11 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
 
 aspen
 use uncnsrd
@@ -81,50 +52,79 @@ gdom bor system <bin Mail> to map
 humannode Retrovertigo
 lastcontact 976081151 Wed Dec  6 00:39:11 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
 
-marshill
+feathers
 use uncnsrd
 phonenum CA (604) 589-8539
 gdom BC
-humannode Mars Hill
-lastcontact 976081149 Wed Dec  6 00:39:09 2000
+humannode Feathers & Furballs
+lastcontact 975653963 Fri Dec  1 01:59:23 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
 
-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
 
-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 976081151 Wed Dec  6 00:39:11 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 976172349 Thu Dec  7 01:59:09 2000
 
+test
 bin Mail
+
+uncnsrd
 bin Mail
-humannode Ô\91\ 4\bhðÿ¿lðÿ¿
-lastcontact 976082265 Wed Dec  6 00:57:45 2000
+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