--- deliantra/server/common/utils.C 2007/06/07 19:12:22 1.59
+++ deliantra/server/common/utils.C 2008/04/15 03:16:02 1.75
@@ -1,25 +1,24 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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
*
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Deliantra is free software: you can redistribute it and/or modify
+ * it under the terms of the 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.
+ * 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 GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/*
@@ -39,15 +38,17 @@
#include
+refcnt_base::refcnt_t refcnt_dummy;
+ssize_t slice_alloc;
rand_gen rndm;
void
tausworthe_random_generator::seed (uint32_t seed)
{
- state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
- 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 [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U;
+ state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
+ 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 [3] = state [2] * 69069U; if (state [0] < 128U) state [0] += 128U;
for (int i = 11; --i; )
operator ()();
@@ -215,13 +216,12 @@
if (name == mt->name)
return mt;
- return materialt;
+ return 0;
}
/* when doing transmutation of objects, we have to recheck the resistances,
* as some that did not apply previously, may apply now.
*/
-
void
transmute_materialname (object *op, const object *change)
{
@@ -261,53 +261,27 @@
{
materialtype_t *mt, *lmt;
-#ifdef NEW_MATERIAL_CODE
- int j;
-#endif
-
if (op->materialname != NULL)
return;
-
-
if (nmt == NULL)
{
lmt = NULL;
-#ifndef NEW_MATERIAL_CODE
- for (mt = materialt; mt && mt->next; mt = mt->next)
- {
- if (op->materials & mt->material)
- {
- lmt = mt;
- break;
- }
- }
-#else
for (mt = materialt; mt && mt->next; mt = mt->next)
- {
- if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
- difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
- {
- lmt = mt;
- if (!(op->is_weapon () || op->is_armor ()))
- break;
- }
- }
-#endif
+ if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
+ difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
+ {
+ lmt = mt;
+ if (!(op->is_weapon () || op->is_armor ()))
+ break;
+ }
}
else
- {
- lmt = nmt;
- }
+ lmt = nmt;
if (lmt != NULL)
{
-#ifndef NEW_MATERIAL_CODE
- op->materialname = lmt->name;
- return;
-#else
-
if (op->stats.dam && op->is_weapon ())
{
op->stats.dam += lmt->damage;
@@ -323,7 +297,8 @@
{
if (op->stats.ac)
op->stats.ac += lmt->ac;
- for (j = 0; j < NROFATTACKS; j++)
+
+ for (int j = 0; j < NROFATTACKS; j++)
if (op->resist[j] != 0)
{
op->resist[j] += lmt->mod[j];
@@ -333,6 +308,7 @@
op->resist[j] = -100;
}
}
+
op->materialname = lmt->name;
/* dont make it unstackable if it doesn't need to be */
if (op->is_weapon () || op->is_armor ())
@@ -340,7 +316,6 @@
op->weight = (op->weight * lmt->weight) / 100;
op->value = (op->value * lmt->value) / 100;
}
-#endif
}
}
@@ -445,7 +420,6 @@
* This function will also strip all trailing non alphanumeric characters.
* It does not insert an oxford comma.
*/
-
void
make_list_like (char *input)
{
@@ -497,15 +471,12 @@
void *salloc_ (int n) throw (std::bad_alloc)
{
-#ifdef PREFER_MALLOC
- void *ptr = malloc (n);
-#else
void *ptr = g_slice_alloc (n);
-#endif
if (!ptr)
throw std::bad_alloc ();
+ slice_alloc += n;
return ptr;
}
@@ -521,6 +492,49 @@
return ptr;
}
+/******************************************************************************/
+
+#if DEBUG_SALLOC
+
+#define MAGIC 0xa1b2c35543deadLL
+
+void *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 *g_slice_alloc0 (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))
+ {
+ unsigned long *p = (unsigned long *)ptr;
+ unsigned long s = *--p ^ MAGIC;
+
+ if (size != (unsigned long)(*p ^ MAGIC))
+ {
+ 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);
+ }
+}
+
+#endif
+
+/******************************************************************************/
+
void assign (char *dst, const char *src, int maxlen)
{
if (!src)
@@ -545,40 +559,19 @@
memcpy (dst, src, len + 1);
}
-const std::string
+const char *
format (const char *format, ...)
{
- int len;
+ static dynbuf_text buf;
+
+ buf.clear ();
- {
- char buf[128];
+ va_list ap;
+ va_start (ap, format);
+ buf.vprintf (format, ap);
+ va_end (ap);
- va_list ap;
- va_start (ap, format);
- len = vsnprintf (buf, sizeof (buf), format, ap);
- va_end (ap);
-
- assert (len >= 0); // shield againstz broken vsnprintf's
-
- // was our static buffer short enough?
- if (len < sizeof (buf))
- return std::string (buf, len);
- }
-
- {
- // longer, try harder
- char *buf = salloc (len + 1);
-
- va_list ap;
- va_start (ap, format);
- vsnprintf (buf, len + 1, format, ap);
- va_end (ap);
-
- const std::string s (buf, len);
- sfree (buf, len + 1);
-
- return buf;
- }
+ return buf;
}
tstamp now ()
@@ -656,4 +649,26 @@
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);
+}