ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.63 by root, Mon Aug 6 10:54:11 2007 UTC vs.
Revision 1.77 by root, Sun May 4 14:12:37 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* 24/*
25 * General convenience functions for crossfire. 25 * General convenience functions for crossfire.
26 */ 26 */
… …
31#include <sys/time.h> 31#include <sys/time.h>
32#include <time.h> 32#include <time.h>
33#include <signal.h> 33#include <signal.h>
34 34
35#include <global.h> 35#include <global.h>
36#include <funcpoint.h>
37#include <material.h> 36#include <material.h>
38 37
39#include <glib.h> 38#include <glib.h>
40 39
41refcnt_base::refcnt_t refcnt_dummy; 40refcnt_base::refcnt_t refcnt_dummy;
42 41ssize_t slice_alloc;
43rand_gen rndm; 42rand_gen rndm, rmg_rndm;
44 43
45void 44void
46tausworthe_random_generator::seed (uint32_t seed) 45tausworthe_random_generator::seed (uint32_t seed)
47{ 46{
48 state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U; 47 state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
49 state [1] = state [0] * 69069U; if (state [0] < 8U) state [0] += 8U; 48 state [1] = state [0] * 69069U; if (state [0] < 8U) state [0] += 8U;
50 state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] += 16U; 49 state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] += 16U;
51 state [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U; 50 state [3] = state [2] * 69069U; if (state [0] < 128U) state [0] += 128U;
52 51
53 for (int i = 11; --i; ) 52 for (int i = 11; --i; )
54 operator ()(); 53 operator ()();
55} 54}
56 55
… …
220} 219}
221 220
222/* when doing transmutation of objects, we have to recheck the resistances, 221/* when doing transmutation of objects, we have to recheck the resistances,
223 * as some that did not apply previously, may apply now. 222 * as some that did not apply previously, may apply now.
224 */ 223 */
225
226void 224void
227transmute_materialname (object *op, const object *change) 225transmute_materialname (object *op, const object *change)
228{ 226{
229 materialtype_t *mt; 227 materialtype_t *mt;
230 int j; 228 int j;
… …
419 * a 'list' for the purposes here, is a string of items, seperated by commas, except 417 * a 'list' for the purposes here, is a string of items, seperated by commas, except
420 * for the last entry, which has an 'and' before it, and a full stop (period) after it. 418 * for the last entry, which has an 'and' before it, and a full stop (period) after it.
421 * This function will also strip all trailing non alphanumeric characters. 419 * This function will also strip all trailing non alphanumeric characters.
422 * It does not insert an oxford comma. 420 * It does not insert an oxford comma.
423 */ 421 */
424
425void 422void
426make_list_like (char *input) 423make_list_like (char *input)
427{ 424{
428 char *p, tmp[MAX_BUF]; 425 char *p, tmp[MAX_BUF];
429 int i; 426 int i;
… …
471 LOG (llevError, "fork abort: %s\n", msg); 468 LOG (llevError, "fork abort: %s\n", msg);
472} 469}
473 470
474void *salloc_ (int n) throw (std::bad_alloc) 471void *salloc_ (int n) throw (std::bad_alloc)
475{ 472{
476#ifdef PREFER_MALLOC
477 void *ptr = malloc (n);
478#else
479 void *ptr = g_slice_alloc (n); 473 void *ptr = g_slice_alloc (n);
480#endif
481 474
482 if (!ptr) 475 if (!ptr)
483 throw std::bad_alloc (); 476 throw std::bad_alloc ();
484 477
478 slice_alloc += n;
485 return ptr; 479 return ptr;
486} 480}
487 481
488void *salloc_ (int n, void *src) throw (std::bad_alloc) 482void *salloc_ (int n, void *src) throw (std::bad_alloc)
489{ 483{
… …
495 memset (ptr, 0, n); 489 memset (ptr, 0, n);
496 490
497 return ptr; 491 return ptr;
498} 492}
499 493
494/******************************************************************************/
495
496#if DEBUG_SALLOC
497
498#define MAGIC 0xa1b2c35543deadLL
499
500void *g_slice_alloc (unsigned long size)
501{
502 unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
503 *p++ = size ^ MAGIC;
504 //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
505 return (void *)p;
506}
507
508void *g_slice_alloc0 (unsigned long size)
509{
510 return memset (g_slice_alloc (size), 0, size);
511}
512
513void g_slice_free1 (unsigned long size, void *ptr)
514{
515 //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
516 if (expect_true (ptr))
517 {
518 unsigned long *p = (unsigned long *)ptr;
519 unsigned long s = *--p ^ MAGIC;
520
521 if (size != (unsigned long)(*p ^ MAGIC))
522 {
523 LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
524 abort ();
525 }
526
527 *p = MAGIC;
528
529 (g_slice_free1)(s + sizeof (unsigned long), p);
530 }
531}
532
533#endif
534
535/******************************************************************************/
536
500void assign (char *dst, const char *src, int maxlen) 537void assign (char *dst, const char *src, int maxlen)
501{ 538{
502 if (!src) 539 if (!src)
503 src = ""; 540 src = "";
504 541
… …
519 } 556 }
520 else 557 else
521 memcpy (dst, src, len + 1); 558 memcpy (dst, src, len + 1);
522} 559}
523 560
524const std::string 561const char *
525format (const char *format, ...) 562format (const char *format, ...)
526{ 563{
527 int len; 564 static dynbuf_text buf;
528 565
529 { 566 buf.clear ();
530 char buf[128];
531 567
532 va_list ap; 568 va_list ap;
533 va_start (ap, format); 569 va_start (ap, format);
534 len = vsnprintf (buf, sizeof (buf), format, ap); 570 buf.vprintf (format, ap);
535 va_end (ap); 571 va_end (ap);
536 572
537 assert (len >= 0); // shield againstz broken vsnprintf's
538
539 // was our static buffer short enough?
540 if (len < sizeof (buf))
541 return std::string (buf, len);
542 }
543
544 {
545 // longer, try harder
546 char *buf = salloc<char> (len + 1);
547
548 va_list ap;
549 va_start (ap, format);
550 vsnprintf (buf, len + 1, format, ap);
551 va_end (ap);
552
553 const std::string s (buf, len);
554 sfree<char> (buf, len + 1);
555
556 return buf; 573 return buf;
557 }
558} 574}
559 575
560tstamp now () 576tstamp now ()
561{ 577{
562 struct timeval tv; 578 struct timeval tv;
… …
630 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 646 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
631 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 647 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
632 0x2d02ef8dL 648 0x2d02ef8dL
633}; 649};
634 650
635#if 0 651void thread::start (void *(*start_routine)(void *), void *arg)
636void xyzzy (object_ptr &a, object_ptr &o)
637{ 652{
638 asm volatile ("int3"); 653 pthread_attr_t attr;
639 a = o; 654
640 asm volatile ("int3"); 655 pthread_attr_init (&attr);
641} 656 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
657 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096
658 ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
659#ifdef PTHREAD_SCOPE_PROCESS
660 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
642#endif 661#endif
643 662
663 sigset_t fullsigset, oldsigset;
664 sigfillset (&fullsigset);
665
666 pthread_sigmask (SIG_SETMASK, &fullsigset, &oldsigset);
667
668 if (pthread_create (&id, &attr, start_routine, arg))
669 cleanup ("unable to create a new thread");
670
671 pthread_sigmask (SIG_SETMASK, &oldsigset, 0);
672}
673

Diff Legend

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