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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.98 by root, Sat Apr 23 04:56:47 2011 UTC vs.
Revision 1.103 by root, Mon Dec 17 02:07:15 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /*
  * General convenience functions for deliantra.
       signal (SIGINT , SIG_IGN);
       signal (SIGTERM, SIG_IGN);
       signal (SIGABRT, SIG_IGN);
       signal (SIGSEGV, SIG_DFL);
+      signal (SIGFPE , SIG_DFL);
+#ifdef SIGBUS
       signal (SIGBUS , SIG_DFL);
+#endif
       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.
     }
   LOG (llevError, "fork abort: %s\n", msg);
 }
+void *
-void *salloc_ (int n) throw (std::bad_alloc)
+salloc_ (int n) throw (std::bad_alloc)
 {
   void *ptr = g_slice_alloc (n);
   if (!ptr)
     throw std::bad_alloc ();
   slice_alloc += n;
   return ptr;
 }
+void *
-void *salloc_ (int n, void *src) throw (std::bad_alloc)
+salloc_ (int n, void *src) throw (std::bad_alloc)
 {
   void *ptr = salloc_ (n);
   if (src)
     memcpy (ptr, src, n);
 #if DEBUG_SALLOC
 #define MAGIC 0xa1b2c35543deadLL
+void *
-void *g_slice_alloc (unsigned long size)
+g_slice_alloc (unsigned long size)
 {
   unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
   *p++ = size ^ MAGIC;
   //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
   return (void *)p;
 }
+void *
-void *g_slice_alloc0 (unsigned long size)
+g_slice_alloc0 (unsigned long size)
 {
   return memset (g_slice_alloc (size), 0, size);
 }
+void
-void g_slice_free1 (unsigned long size, void *ptr)
+g_slice_free1 (unsigned long size, void *ptr)
 {
   //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
   if (expect_true (ptr))
     {
       unsigned long *p = (unsigned long *)ptr;
       (g_slice_free1)(s + sizeof (unsigned long), p);
     }
 }
 #endif
+/******************************************************************************/
+refcnt_buf::refcnt_buf (size_t size)
+{
+  static uint32_t empty_buf [2] = { 0, 1 }; // 2 == never deallocated
+  data = (char *)empty_buf + overhead;
+  assert (overhead == sizeof (empty_buf));
+  inc ();
+}
+refcnt_buf::refcnt_buf (void *data, size_t size)
+{
+  _alloc (size);
+  memcpy (this->data, data, size);
+}
+refcnt_buf::~refcnt_buf ()
+{
+  dec ();
+}
+void
+refcnt_buf::_dealloc ()
+{
+  sfree<char> (data - overhead, size () + overhead);
+}
+refcnt_buf &
+refcnt_buf::operator =(const refcnt_buf &src)
+{
+  dec ();
+  data = src.data;
+  inc ();
+  return *this;
+}
 /******************************************************************************/
 int
 assign (char *dst, const char *src, int maxsize)
   va_end (ap);
   return buf;
 }
-tstamp now ()
+tstamp
+now ()
 {
   struct timeval tv;
   gettimeofday (&tv, 0);
   return tstamp (tv.tv_sec) + tstamp (tv.tv_usec) * tstamp (1e-6);
     0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
     0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
     0x2d02ef8dL
 };
+void
-void thread::start (void *(*start_routine)(void *), void *arg)
+thread::start (void *(*start_routine)(void *), void *arg)
 {
   pthread_attr_t attr;
   pthread_attr_init (&attr);
   pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);

Diff Legend

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

Comparing deliantra/server/common/utils.C (file contents): Revision 1.98 by root, Sat Apr 23 04:56:47 2011 UTC vs. Revision 1.103 by root, Mon Dec 17 02:07:15 2012 UTC

Diff Legend

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.98 by root, Sat Apr 23 04:56:47 2011 UTC vs.
Revision 1.103 by root, Mon Dec 17 02:07:15 2012 UTC