--- deliantra/server/common/utils.C 2007/04/27 14:41:37 1.52 +++ deliantra/server/common/utils.C 2009/11/11 03:52:44 1.94 @@ -1,29 +1,27 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * - * This program 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 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 + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * 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 + * . + * + * The authors can be reached via e-mail to */ /* - * General convenience functions for crossfire. + * General convenience functions for deliantra. */ #include @@ -34,23 +32,45 @@ #include #include -#include #include +#include + +#include +#include #include -rand_gen rndm; +refcnt_base::refcnt_t refcnt_dummy; +ssize_t slice_alloc; +rand_gen rndm, rmg_rndm; + +#if !GCC_VERSION(3,4) +int least_significant_bit (uint32_t x) +{ + x &= -x; // this isolates the lowest bit + + int r = 0; + + if (x & 0xaaaaaaaa) r += 1; + if (x & 0xcccccccc) r += 2; + if (x & 0xf0f0f0f0) r += 4; + if (x & 0xff00ff00) r += 8; + if (x & 0xffff0000) r += 16; + + return r; +} +#endif 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 ()(); + next (); } uint32_t @@ -64,590 +84,204 @@ return state [0] ^ state [1] ^ state [2] ^ state [3]; } +template uint32_t -tausworthe_random_generator::get_range (uint32_t num) +random_number_generator::get_range (uint32_t num) { - return (next () * (uint64_t)num) >> 32U; + return (this->next () * (uint64_t)num) >> 32U; } // return a number within (min .. max) +template int -tausworthe_random_generator::get_range (int r_min, int r_max) +random_number_generator::get_range (int r_min, int r_max) { return r_min + get_range (max (r_max - r_min + 1, 0)); } -/* - * The random functions here take luck into account when rolling random - * dice or numbers. This function has less of an impact the larger the - * difference becomes in the random numbers. IE, the effect is lessened - * on a 1-1000 roll, vs a 1-6 roll. This can be used by crafty programmers, - * to specifically disable luck in certain rolls, simply by making the - * numbers larger (ie, 1d1000 > 500 vs 1d6 > 3) - */ - -/* - * Roll a random number between min and max. Uses op to determine luck, - * and if goodbad is non-zero, luck increases the roll, if zero, it decreases. - * Generally, op should be the player/caster/hitter requesting the roll, - * 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) -{ - int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ - - if (r_max < 1 || r_max < r_min) - { - LOG (llevError, "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; - - if (rndm (base) < min (10, abs (luck))) - { - //TODO: take luck into account - } - } +template struct random_number_generator; +template struct random_number_generator; - return rndm (r_min, r_max); -} +/******************************************************************************/ -/* - * This is a 64 bit version of random_roll above. This is needed - * for exp loss calculations for players changing religions. +/* Checks a player-provided string which will become the msg property of + * an object for dangerous input. */ -sint64 -random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) +bool +msg_is_safe (const char *msg) { - sint64 omin, diff, luck, ran; - int base; + bool safe = true; - omin = min; - diff = max - min + 1; - ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ + /* Trying to cheat by getting data into the object */ + if (!strncmp (msg, "endmsg", sizeof ("endmsg") - 1) + || strstr (msg, "\nendmsg")) + safe = false; - if (max < 1 || diff < 1) - { - LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max); - return (min); /* avoids a float exception */ - } + /* Trying to make the object talk, and potentially access arbitrary code */ + if (object::msg_has_dialogue (msg)) + safe = false; - /* - * Make a call to get two 32 bit unsigned random numbers, and just to - * a little bitshifting. - */ - ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); - - if (op->type != PLAYER) - return ((ran % diff) + min); - - luck = op->stats.luck; - if (rndm (base) < MIN (10, abs (luck))) - { - /* we have a winner */ - ((luck > 0) ? (luck = 1) : (luck = -1)); - diff -= luck; - if (diff < 1) - return (omin); /*check again */ - ((goodbad) ? (min += luck) : (diff)); - - return (MAX (omin, MIN (max, (ran % diff) + min))); - } - - return ((ran % diff) + min); + return safe; } -/* - * 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. - * Generally, op should be the player/caster/hitter requesting the roll, - * not the recipient (ie, the poor slob getting hit). - * The args are num D size (ie 4d6) [garbled 20010916] - */ +///////////////////////////////////////////////////////////////////////////// -int -die_roll (int num, int size, const object *op, int goodbad) +void +fork_abort (const char *msg) { - int min, diff, luck, total, i, gotlucky, base; - - diff = size; - min = 1; - luck = total = gotlucky = 0; - ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ - if (size < 2 || diff < 1) - { - LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size); - return (num); /* avoids a float exception */ - } - - if (op->type == PLAYER) - luck = op->stats.luck; - - for (i = 0; i < num; i++) + if (!fork ()) { - if (rndm (base) < MIN (10, abs (luck)) && !gotlucky) - { - /* we have a winner */ - gotlucky++; - ((luck > 0) ? (luck = 1) : (luck = -1)); - diff -= luck; - if (diff < 1) - return (num); /*check again */ - ((goodbad) ? (min += luck) : (diff)); - total += MAX (1, MIN (size, rndm (diff) + min)); - } - else - total += rndm (size) + 1; - } + signal (SIGINT , SIG_IGN); + signal (SIGTERM, SIG_IGN); + signal (SIGABRT, SIG_IGN); + + signal (SIGSEGV, SIG_DFL); + signal (SIGBUS , SIG_DFL); + signal (SIGILL , SIG_DFL); + signal (SIGTRAP, SIG_DFL); - return total; -} - -/* decay and destroy perishable items in a map */ -void -maptile::decay_objects () -{ - if (!spaces) - return; + // try to put corefiles into a subdirectory, if existing, to allow + // an administrator to reduce the I/O load. + chdir ("cores"); - for (mapspace *ms = spaces + size (); ms-- > spaces; ) - for (object *above, *op = ms->bot; op; op = above) + // try to detach us from as many external dependencies as possible + // as coredumping can take time by closing all fd's. { - above = op->above; + struct rlimit lim; - bool destroy = 0; + if (getrlimit (RLIMIT_NOFILE, &lim)) + lim.rlim_cur = 1024; - // do not decay anything above unique floor tiles (yet :) - if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) - break; - - if (QUERY_FLAG (op, FLAG_IS_FLOOR) - || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) - || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) - || QUERY_FLAG (op, FLAG_UNIQUE) - || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) - || QUERY_FLAG (op, FLAG_UNPAID) - || op->is_alive ()) - ; // do not decay - else if (op->is_weapon ()) - { - op->stats.dam--; - if (op->stats.dam < 0) - destroy = 1; - } - else if (op->is_armor ()) - { - op->stats.ac--; - if (op->stats.ac < 0) - destroy = 1; - } - else if (op->type == FOOD) - { - op->stats.food -= rndm (5, 20); - if (op->stats.food < 0) - destroy = 1; - } - else - { - int mat = op->materials; - - if (mat & M_PAPER - || mat & M_LEATHER - || mat & M_WOOD - || mat & M_ORGANIC - || mat & M_CLOTH - || mat & M_LIQUID - || (mat & M_IRON && rndm (1, 5) == 1) - || (mat & M_GLASS && rndm (1, 2) == 1) - || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) - || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) - || (mat & M_ICE && temp > 32)) - destroy = 1; - } - - /* adjust overall chance below */ - if (destroy && rndm (0, 1)) - op->destroy (); + for (int i = 0; i < lim.rlim_cur; ++i) + close (i); } -} -/* convert materialname to materialtype_t */ + { + sigset_t empty; + sigemptyset (&empty); + sigprocmask (SIG_SETMASK, &empty, 0); + } -materialtype_t * -name_to_material (const shstr &name) -{ - for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) - if (name == mt->name) - return mt; + // try to coredump with SIGTRAP + kill (getpid (), SIGTRAP); + abort (); + } - return materialt; + LOG (llevError, "fork abort: %s\n", msg); } -/* 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) +void *salloc_ (int n) throw (std::bad_alloc) { - materialtype_t *mt; - int j; - - if (op->materialname == NULL) - return; - - if (change->materialname != NULL && strcmp (op->materialname, change->materialname)) - return; - - if (!op->is_armor ()) - return; + void *ptr = g_slice_alloc (n); - mt = name_to_material (op->materialname); - if (!mt) - { - LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname); - return; - } + if (!ptr) + throw std::bad_alloc (); - for (j = 0; j < NROFATTACKS; j++) - if (op->resist[j] == 0 && change->resist[j] != 0) - { - op->resist[j] += mt->mod[j]; - if (op->resist[j] > 100) - op->resist[j] = 100; - if (op->resist[j] < -100) - op->resist[j] = -100; - } + slice_alloc += n; + return ptr; } -/* set the materialname and type for an item */ -void -set_materialname (object *op, int difficulty, materialtype_t *nmt) +void *salloc_ (int n, void *src) throw (std::bad_alloc) { - 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; - } - } + void *ptr = salloc_ (n); -#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 (src) + memcpy (ptr, src, n); else - { - 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; - if (op->stats.dam < 1) - op->stats.dam = 1; - } + memset (ptr, 0, n); - if (op->stats.sp && op->type == BOW) - op->stats.sp += lmt->sp; - if (op->stats.wc && op->is_weapon ()) - op->stats.wc += lmt->wc; - if (op->is_armor ()) - { - if (op->stats.ac) - op->stats.ac += lmt->ac; - for (j = 0; j < NROFATTACKS; j++) - if (op->resist[j] != 0) - { - op->resist[j] += lmt->mod[j]; - if (op->resist[j] > 100) - op->resist[j] = 100; - if (op->resist[j] < -100) - 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 ()) - { - op->weight = (op->weight * lmt->weight) / 100; - op->value = (op->value * lmt->value) / 100; - } -#endif - } + return ptr; } -/* - * Strip out the media tags from a String. - * Warning the input string will contain the result string - */ -void -strip_media_tag (char *message) -{ - int in_tag = 0; - char *dest; - char *src; - - src = dest = message; - while (*src != '\0') - { - if (*src == '[') - { - in_tag = 1; - } - else if (in_tag && (*src == ']')) - in_tag = 0; - else if (!in_tag) - { - *dest = *src; - dest++; - } - src++; - } - *dest = '\0'; -} +/******************************************************************************/ -const char * -strrstr (const char *haystack, const char *needle) -{ - const char *lastneedle; +#if DEBUG_SALLOC - lastneedle = NULL; - while ((haystack = strstr (haystack, needle)) != NULL) - { - lastneedle = haystack; - haystack++; - } - return lastneedle; +#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; } -#define EOL_SIZE (sizeof("\n")-1) -void -strip_endline (char *buf) +void *g_slice_alloc0 (unsigned long size) { - if (strlen (buf) < sizeof ("\n")) - { - return; - } - if (!strcmp (buf + strlen (buf) - EOL_SIZE, "\n")) - buf[strlen (buf) - EOL_SIZE] = '\0'; + return memset (g_slice_alloc (size), 0, size); } -/** - * Replace in string src all occurrences of key by replacement. The resulting - * string is put into result; at most resultsize characters (including the - * terminating null character) will be written to result. - */ -void -replace (const char *src, const char *key, const char *replacement, char *result, size_t resultsize) +void g_slice_free1 (unsigned long size, void *ptr) { - size_t resultlen; - size_t keylen; - - /* special case to prevent infinite loop if key==replacement=="" */ - if (strcmp (key, replacement) == 0) + //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D + if (expect_true (ptr)) { - snprintf (result, resultsize, "%s", src); - return; - } - - keylen = strlen (key); + unsigned long *p = (unsigned long *)ptr; + unsigned long s = *--p ^ MAGIC; - resultlen = 0; - while (*src != '\0' && resultlen + 1 < resultsize) - { - if (strncmp (src, key, keylen) == 0) - { - snprintf (result + resultlen, resultsize - resultlen, "%s", replacement); - resultlen += strlen (result + resultlen); - src += keylen; - } - else + if (size != (unsigned long)(*p ^ MAGIC)) { - result[resultlen++] = *src++; + LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s); + abort (); } - } - result[resultlen] = '\0'; -} - -/** - * Taking a string as an argument, mutate it into a string that looks like a list. - * a 'list' for the purposes here, is a string of items, seperated by commas, except - * for the last entry, which has an 'and' before it, and a full stop (period) after it. - * This function will also strip all trailing non alphanumeric characters. - * It does not insert an oxford comma. - */ - -void -make_list_like (char *input) -{ - char *p, tmp[MAX_BUF]; - int i; - - if (!input || strlen (input) > MAX_BUF - 5) - return; - /* bad stuff would happen if we continued here, the -5 is to make space for ' and ' */ - - strncpy (tmp, input, MAX_BUF - 5); - /*trim all trailing commas, spaces etc. */ - for (i = strlen (tmp); !isalnum (tmp[i]) && i >= 0; i--) - tmp[i] = '\0'; - - strcat (tmp, "."); - - p = strrchr (tmp, ','); - if (p) - { - *p = '\0'; - strcpy (input, tmp); - p++; - strcat (input, " and"); - strcat (input, p); - } - else - strcpy (input, tmp); - return; -} + *p = MAGIC; -///////////////////////////////////////////////////////////////////////////// - -void -fork_abort (const char *msg) -{ - if (!fork ()) - { - signal (SIGABRT, SIG_DFL); - // try to put corefiles into a subdirectory, if existing, to allow - // an administrator to reduce the I/O load. - chdir ("cores"); - abort (); + (g_slice_free1)(s + sizeof (unsigned long), p); } - - LOG (llevError, "fork abort: %s\n", msg); } -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 (); - - return ptr; -} +/******************************************************************************/ -void *salloc_ (int n, void *src) throw (std::bad_alloc) -{ - void *ptr = salloc_ (n); - - if (src) - memcpy (ptr, src, n); - else - memset (ptr, 0, n); - - return ptr; -} - -void assign (char *dst, const char *src, int maxlen) +int +assign (char *dst, const char *src, int maxsize) { if (!src) src = ""; int len = strlen (src); - if (len >= maxlen - 1) + if (len >= maxsize) { - if (maxlen <= 4) + if (maxsize <= 4) { - memset (dst, '.', maxlen - 1); - dst [maxlen - 1] = 0; + memset (dst, '.', maxsize - 2); + dst [maxsize - 1] = 0; } else { - memcpy (dst, src, maxlen - 4); - memcpy (dst + maxlen - 4, "...", 4); + memcpy (dst, src, maxsize - 4); + memcpy (dst + maxsize - 4, "...", 4); } + + len = maxsize; } else - memcpy (dst, src, len + 1); + memcpy (dst, src, ++len); + + return len; } -const std::string -format (const char *format, ...) +char * +vformat (const char *format, va_list ap) { - int len; + static dynbuf_text buf; buf.clear (); + buf.vprintf (format, ap); + return buf; +} - { - char buf[128]; +char * +format (const char *format, ...) +{ + va_list ap; + va_start (ap, format); + char *buf = vformat (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 () @@ -725,4 +359,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); +}