[ViewVC] Diff of: cvs/deliantra/server/server/main.C

Comparing deliantra/server/server/main.C (file contents):
Revision 1.121 by root, Sun Dec 16 02:36:29 2007 UTC vs.
Revision 1.132 by root, Mon Sep 29 10:20:49 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <object.h>
 #include <tod.h>
 #include <sproto.h>
 #include <time.h>
+#include <glib.h>
 #include <../random_maps/random_map.h>
 #include <../random_maps/rproto.h>
 #include "path.h"
  * goes someplace.
  */
 void
 enter_player_savebed (object *op)
 {
-  object *tmp = object::create ();
+  op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
-  EXIT_PATH (tmp) = op->contr->savebed_map;
-  EXIT_X (tmp) = op->contr->bed_x;
-  EXIT_Y (tmp) = op->contr->bed_y;
-  op->enter_exit (tmp);
-  tmp->destroy ();
 }
 /*
  * enter_map():  Moves the player and pets from current map (if any) to
  * new map.  map, x, y must be set.  map is the map we are moving the
  * the function that calls this should figure them out.
  */
 void
 object::enter_map (maptile *newmap, int x, int y)
 {
-  if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
+  if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
     return;
   if (out_of_map (newmap, x, y))
     {
       LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
     if (object *golem = contr->golem)
       {
         int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
         if (i < 0)
+          {
+            golem->destroy_inv (true); // be explicit about dropping
-          golem->destroy ();
+            golem->destroy (true);
+          }
         else
           {
             newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
             golem->direction = find_dir_2 (x - golem->x, y - golem->y);
           }
           op->last_anim = 1;
         }
       else
         ++op->last_anim;
-      if (op->speed_left > 0.f)
+      if (expect_false (op->speed_left > 0.f))
         {
           --op->speed_left;
           process_object (op);
-          if (op->destroyed ())
-            continue;
         }
-      if (!op->contr)
+      if (expect_true (!op->contr))
         op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
     }
   process_players2 ();
 }
   LOG (llevDebug, "running cleanup handlers.\n");
   INVOKE_GLOBAL (CLEANUP);
   LOG (llevDebug, "cleanup done.\n");
+  log_cleanup ();
   if (make_core)
-    {
-      cleanup_inform (cause, make_core);
+    cleanup_inform (cause, make_core);
-      cfperl_cleanup (make_core);
-      _exit (1);
-    }
   else
     {
       new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
       new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
       client::flush_sockets ();
+    }
-      cfperl_cleanup (make_core);
+  cfperl_cleanup (make_core);
-      _exit (0);
+  _exit (make_core);
-    }
 }
 /*
  * do_specials() is a collection of functions to call from time to time.
  * Modified 2000-1-14 MSW to use the global pticks count to determine how
  * doing the various things.
  */
 void
 do_specials (void)
 {
+  shstr::gc ();
+  archetype::gc ();
   if (expect_false (!(pticks % TICKS_PER_HOUR)))
     adjust_daylight ();
-  if (expect_false (!(pticks % 89)))
-    shstr::gc ();
   if (expect_false (!(pticks % 2503)))
     fix_weight ();              /* Hack to fix weightproblems caused by bugs */
   if (expect_false (!(pticks % 5003)))
     }
 }
 #else
+#if 0 // just goofing around, look elsewhere
+#include <malloc.h>
+#include <execinfo.h>
+static void tr_on ();
+static void tr_off ();
+static SMUTEX(tr_mutex);
+#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
+#define ltr_on()  tr_on (); SMUTEX_UNLOCK (tr_mutex);
+static void *
+tr_malloc (size_t size, const void *caller)
+{
+  ltr_off ();
+  void *bt [8];
+  backtrace (bt, 8);
+  void *ptr = malloc (size);
+  ltr_on ();
+  return (char *)ptr;
+}
+static void
+tr_free (void *ptr, const void *caller)
+{
+  ltr_off ();
+  free (ptr);
+  ltr_on ();
+}
+void static *
+tr_realloc (void *ptr, size_t size, const void *caller)
+{
+  ltr_off ();
+  void *nptr = realloc (ptr, size);
+  ltr_on ();
+  return nptr;
+}
+static void *
+tr_memalign (size_t size, size_t alignment, const void *caller)
+{
+  ltr_off ();
+  void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
+  ltr_on ();
+  return ptr;
+}
+static void
+tr_on ()
+{
+  __malloc_hook   = tr_malloc;
+  __realloc_hook  = tr_realloc;
+  __free_hook     = tr_free;
+  __memalign_hook = tr_memalign;
+}
+static void
+tr_off ()
+{
+  __malloc_hook   = 0;
+  __realloc_hook  = 0;
+  __free_hook     = 0;
+  __memalign_hook = 0;
+}
+void (*__malloc_initialize_hook)(void) = tr_on;
+#endif
 // normal main
 int
 main (int argc, char **argv)
 {
   settings.argc = argc;
   settings.argv = argv;
+  g_thread_init (0); // for the slice allocator only
   init (argc, argv);
   for (;;)
     cfperl_main ();
 }

Diff Legend

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

Comparing deliantra/server/server/main.C (file contents): Revision 1.121 by root, Sun Dec 16 02:36:29 2007 UTC vs. Revision 1.132 by root, Mon Sep 29 10:20:49 2008 UTC

Diff Legend

Comparing deliantra/server/server/main.C (file contents):
Revision 1.121 by root, Sun Dec 16 02:36:29 2007 UTC vs.
Revision 1.132 by root, Mon Sep 29 10:20:49 2008 UTC