--- deliantra/server/common/object.C	2008/01/22 16:22:45	1.201
+++ deliantra/server/common/object.C	2008/04/11 17:01:52	1.204
@@ -35,46 +35,46 @@
 
 #include <bitset>
 
-int nrofallocobjects = 0;
-static UUID uuid;
-const uint64 UUID_SKIP = 1<<19;
+UUID UUID::cur;
+static uint64_t seq_next_save;
+static const uint64 UUID_GAP = 1<<19;
 
 objectvec objects;
 activevec actives;
 
-short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
-  0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
+short freearr_x[SIZEOFFREE] = {
+   0,
+   0,  1,  1,  1,  0, -1, -1, -1,
+   0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2, -2, -2, -2, -1,
+   0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
 };
-short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
-  -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
+short freearr_y[SIZEOFFREE] = {
+   0,
+  -1, -1,  0,  1,  1,  1,  0, -1,
+  -2, -2, -2, -1,  0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2,
+  -3, -3, -3, -3, -2, -1,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0, -1, -2, -3, -3, -3
 };
-int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
-  48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
+int maxfree[SIZEOFFREE] = {
+   0,
+   9, 10, 13, 14, 17, 18, 21, 22,
+  25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
+  49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
 };
 int freedir[SIZEOFFREE] = {
-  0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
-  1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
+   0,
+   1,  2,  3,  4,  5,  6,  7,  8,
+   1,  2,  2,  2,  3,  4,  4,  4,  5,  6,  6,  6,  7,  8,  8,  8,
+   1,  2,  2,  2,  2,  2,  3,  4,  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8,  8,  8
 };
 
 static void
-write_uuid (void)
+write_uuid (uval64 skip, bool sync)
 {
-  char filename1[MAX_BUF], filename2[MAX_BUF];
-
-  sprintf (filename1, "%s/uuid", settings.localdir);
-  sprintf (filename2, "%s/uuid~", settings.localdir);
-
-  FILE *fp;
-
-  if (!(fp = fopen (filename2, "w")))
-    {
-      LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
-      return;
-    }
-
-  fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
-  fclose (fp);
-  rename (filename2, filename1);
+  CALL_BEGIN (2);
+  CALL_ARG_SV (newSVval64 (skip));
+  CALL_ARG_SV (boolSV (sync));
+  CALL_CALL ("cf::write_uuid", G_DISCARD);
+  CALL_END;
 }
 
 static void
@@ -84,6 +84,8 @@
 
   sprintf (filename, "%s/uuid", settings.localdir);
 
+  seq_next_save = 0;
+
   FILE *fp;
 
   if (!(fp = fopen (filename, "r")))
@@ -91,8 +93,8 @@
       if (errno == ENOENT)
         {
           LOG (llevInfo, "RESET uid to 1\n");
-          uuid.seq = 0;
-          write_uuid ();
+          UUID::cur.seq = 0;
+          write_uuid (UUID_GAP, true);
           return;
         }
 
@@ -100,35 +102,41 @@
       _exit (1);
     }
 
-  int version;
-  unsigned long long uid;
-  if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
+  UUID::BUF buf;
+  buf[0] = 0;
+  fgets (buf, sizeof (buf), fp);
+
+  if (!UUID::cur.parse (buf))
     {
-      LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
+      LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
       _exit (1);
     }
 
-  uuid.seq = uid;
-  write_uuid ();
-  LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
+  LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
+
+  write_uuid (UUID_GAP, true);
   fclose (fp);
 }
 
 UUID
-gen_uuid ()
+UUID::gen ()
 {
   UUID uid;
 
-  uid.seq = ++uuid.seq;
+  uid.seq = ++cur.seq;
+
+  if (expect_false (cur.seq >= seq_next_save))
+    {
+      seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
+      write_uuid (UUID_GAP, false);
+    }
 
-  if (!(uuid.seq & (UUID_SKIP - 1)))
-    write_uuid ();
 
   return uid;
 }
 
 void
-init_uuid ()
+UUID::init ()
 {
   read_uuid ();
 }
@@ -431,12 +439,6 @@
   return op;
 }
 
-void
-free_all_object_data ()
-{
-  LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
-}
-
 /*
  * Sets the owner and sets the skill and exp pointers to owner's current
  * skill and experience objects.
@@ -605,7 +607,7 @@
 object::instantiate ()
 {
   if (!uuid.seq) // HACK
-    uuid = gen_uuid ();
+    uuid = UUID::gen ();
 
   speed_left = -0.1f;
   /* copy the body_info to the body_used - this is only really
@@ -774,7 +776,7 @@
 void object::link ()
 {
   assert (!index);//D
-  uuid = gen_uuid ();
+  uuid = UUID::gen ();
   count = ++object_count;
 
   refcnt_inc ();
@@ -2616,8 +2618,9 @@
   char info2[256 * 4];
   char *p = info;
 
-  p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
-                 count, uuid.seq,
+  p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
+                 count,
+                 uuid.c_str (),
                  &name,
                  title ? "\",title:\"" : "",
                  title ? (const char *)title : "",