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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.70 by root, Fri Jan 25 18:09:23 2008 UTC vs.
Revision 1.81 by root, Wed Sep 10 21:29:39 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 (©) 2002,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 <sys/time.h>
 #include <time.h>
 #include <signal.h>
 #include <global.h>
-#include <funcpoint.h>
 #include <material.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 #include <glib.h>
 refcnt_base::refcnt_t refcnt_dummy;
-size_t slice_alloc;
+ssize_t slice_alloc;
-rand_gen rndm;
+rand_gen rndm, rmg_rndm;
 void
 tausworthe_random_generator::seed (uint32_t seed)
 {
-  state [0] = seed      * 69069U; if (state [0] <  2U) state [0] +=   2U;
+  state [0] = seed      * 69069U; if (state [0] <   2U) state [0] +=   2U;
-  state [1] = state [0] * 69069U; if (state [0] <  8U) state [0] +=   8U;
+  state [1] = state [0] * 69069U; if (state [0] <   8U) state [0] +=   8U;
-  state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] +=  16U;
+  state [2] = state [1] * 69069U; if (state [0] <  16U) state [0] +=  16U;
-  state [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U;
+  state [3] = state [2] * 69069U; if (state [0] < 128U) state [0] += 128U;
   for (int i = 11; --i; )
     operator ()();
 }
  * not the recipient (ie, the poor slob getting hit). [garbled 20010916]
  */
 int
 random_roll (int r_min, int r_max, const object *op, int goodbad)
 {
+  r_max = max (r_min, r_max);
   int base = r_max - r_min > 1 ? 20 : 50;     /* d2 and d3 are corner cases */
-  if (r_max < r_min)
-    {
-      LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max);
-      return r_min;
-    }
   if (op->type == PLAYER)
     {
       int luck = op->stats.luck;
 /*
  * This is a 64 bit version of random_roll above.  This is needed
  * for exp loss calculations for players changing religions.
  */
 sint64
-random_roll64 (sint64 min, sint64 max, const object *op, int goodbad)
+random_roll64 (sint64 r_min, sint64 r_max, const object *op, int goodbad)
 {
-  sint64 omin = min;
+  sint64 omin = r_min;
-  sint64 diff = max - min + 1;
+  sint64 range = max (0, r_max - r_min + 1);
-  int base = diff > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
+  int base = range > 2 ? 20 : 50;     /* d2 and d3 are corner cases */
-  if (diff < 0)
-    {
-      LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max);
-      return (min);             /* avoids a float exception */
-    }
   /*
    * Make a call to get two 32 bit unsigned random numbers, and just to
    * a little bitshifting.
    */
   sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31);
   if (op->type != PLAYER)
-    return ((ran % diff) + min);
+    return ((ran % range) + r_min);
   int luck = op->stats.luck;
-  if (rndm (base) < MIN (10, abs (luck)))
+  if (rndm (base) < min (10, abs (luck)))
     {
       /* we have a winner */
       ((luck > 0) ? (luck = 1) : (luck = -1));
-      diff -= luck;
+      range -= luck;
-      if (diff < 1)
+      if (range < 1)
         return (omin);          /*check again */
-      ((goodbad) ? (min += luck) : (diff));
+      ((goodbad) ? (r_min += luck) : (range));
-      return (MAX (omin, MIN (max, (ran % diff) + min)));
+      return (max (omin, min (r_max, (ran % range) + r_min)));
     }
-  return ran % diff + min;
+  return ran % range + r_min;
 }
 /*
  * Roll a number of dice (2d3, 4d6).  Uses op to determine luck,
  * If goodbad is non-zero, luck increases the roll, if zero, it decreases.
 void
 fork_abort (const char *msg)
 {
   if (!fork ())
     {
+      fprintf (stderr, "background fork_abort in progress, remove me when debugged.\n");//D
+      signal (SIGINT , SIG_IGN);
+      signal (SIGTERM, SIG_IGN);
-      signal (SIGABRT, SIG_DFL);
+      signal (SIGABRT, SIG_IGN);
+      signal (SIGSEGV, SIG_DFL);
+      signal (SIGBUS , SIG_DFL);
+      signal (SIGILL , SIG_DFL);
+      signal (SIGTRAP, SIG_DFL);
       // try to put corefiles into a subdirectory, if existing, to allow
       // an administrator to reduce the I/O load.
       chdir ("cores");
+      // try to detach us from as many external dependencies as possible
+      // as coredumping can take time by closing all fd's.
+      {
+        struct rlimit lim;
+        if (getrlimit (RLIMIT_NOFILE, &lim))
+          lim.rlim_cur = 1024;
+        for (int i = 0; i < lim.rlim_cur; ++i)
+          close (i);
+      }
+      {
+        sigset_t empty;
+        sigemptyset (&empty);
+        sigprocmask (SIG_SETMASK, &empty, 0);
+      }
+      // try to coredump with SIGTRAP
+      kill (getpid (), SIGTRAP);
       abort ();
     }
   LOG (llevError, "fork abort: %s\n", msg);
 }
 void *salloc_ (int n) throw (std::bad_alloc)
 {
-#ifdef PREFER_MALLOC
-  void *ptr = malloc (n);
-#else
-  slice_alloc += n;
   void *ptr = g_slice_alloc (n);
-#endif
   if (!ptr)
     throw std::bad_alloc ();
+  slice_alloc += n;
   return ptr;
 }
 void *salloc_ (int n, void *src) throw (std::bad_alloc)
 {
   return ptr;
 }
 /******************************************************************************/
-#ifdef DEBUG_SALLOC
+#if DEBUG_SALLOC
 #define MAGIC 0xa1b2c35543deadLL
 void *g_slice_alloc (unsigned long size)
 {
   return memset (g_slice_alloc (size), 0, size);
 }
 void g_slice_free1 (unsigned long size, void *ptr)
 {
+  //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
   if (expect_true (ptr))
     {
-      //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
       unsigned long *p = (unsigned long *)ptr;
       unsigned long s = *--p ^ MAGIC;
-      if ((*p ^ MAGIC) != size)
+      if (size != (unsigned long)(*p ^ MAGIC))
+        {
-        LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
+          LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
+          abort ();
+        }
       *p = MAGIC;
       (g_slice_free1)(s + sizeof (unsigned long), p);
     }
     0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
     0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
     0x2d02ef8dL
 };
+void thread::start (void *(*start_routine)(void *), void *arg)
+{
+  pthread_attr_t attr;
+  pthread_attr_init (&attr);
+  pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
+  pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096
+                                    ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
+#ifdef PTHREAD_SCOPE_PROCESS
+  pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
+#endif
+  sigset_t fullsigset, oldsigset;
+  sigfillset (&fullsigset);
+  pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
+  if (pthread_create (&id, &attr, start_routine, arg))
+    cleanup ("unable to create a new thread");
+  pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
+}

Diff Legend

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

Comparing deliantra/server/common/utils.C (file contents): Revision 1.70 by root, Fri Jan 25 18:09:23 2008 UTC vs. Revision 1.81 by root, Wed Sep 10 21:29:39 2008 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.70 by root, Fri Jan 25 18:09:23 2008 UTC vs.
Revision 1.81 by root, Wed Sep 10 21:29:39 2008 UTC