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.64 by root, Fri Aug 10 11:02:44 2007 UTC vs.
Revision 1.69 by root, Tue Jan 22 15:53:01 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 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 */
… …
37#include <material.h> 37#include <material.h>
38 38
39#include <glib.h> 39#include <glib.h>
40 40
41refcnt_base::refcnt_t refcnt_dummy; 41refcnt_base::refcnt_t refcnt_dummy;
42 42size_t slice_alloc;
43rand_gen rndm; 43rand_gen rndm;
44 44
45void 45void
46tausworthe_random_generator::seed (uint32_t seed) 46tausworthe_random_generator::seed (uint32_t seed)
47{ 47{
… …
472void *salloc_ (int n) throw (std::bad_alloc) 472void *salloc_ (int n) throw (std::bad_alloc)
473{ 473{
474#ifdef PREFER_MALLOC 474#ifdef PREFER_MALLOC
475 void *ptr = malloc (n); 475 void *ptr = malloc (n);
476#else 476#else
477 slice_alloc += n;
477 void *ptr = g_slice_alloc (n); 478 void *ptr = g_slice_alloc (n);
478#endif 479#endif
479 480
480 if (!ptr) 481 if (!ptr)
481 throw std::bad_alloc (); 482 throw std::bad_alloc ();
… …
493 memset (ptr, 0, n); 494 memset (ptr, 0, n);
494 495
495 return ptr; 496 return ptr;
496} 497}
497 498
499/******************************************************************************/
500
501#ifdef DEBUG_SALLOC
502
503#define MAGIC 0xa1b2c35543deadL
504
505void *g_slice_alloc (unsigned long size)
506{
507 unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long));
508 *p++ = size ^ MAGIC;
509 //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D
510 return (void *)p;
511}
512
513void *g_slice_alloc0 (unsigned long size)
514{
515 return memset (g_slice_alloc (size), 0, size);
516}
517
518void g_slice_free1 (unsigned long size, void *ptr)
519{
520 if (expect_true (ptr))
521 {
522 //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D
523 unsigned long *p = (unsigned long *)ptr;
524 unsigned long s = *--p ^ MAGIC;
525
526 if ((*p ^ MAGIC) != size)
527 LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s);
528
529 *p = MAGIC;
530
531 (g_slice_free1)(s + sizeof (unsigned long), p);
532 }
533}
534
535#endif
536
537/******************************************************************************/
538
498void assign (char *dst, const char *src, int maxlen) 539void assign (char *dst, const char *src, int maxlen)
499{ 540{
500 if (!src) 541 if (!src)
501 src = ""; 542 src = "";
502 543
… …
517 } 558 }
518 else 559 else
519 memcpy (dst, src, len + 1); 560 memcpy (dst, src, len + 1);
520} 561}
521 562
522const std::string 563const char *
523format (const char *format, ...) 564format (const char *format, ...)
524{ 565{
525 int len; 566 static dynbuf_text buf;
526 567
527 { 568 buf.clear ();
528 char buf[128];
529 569
530 va_list ap; 570 va_list ap;
531 va_start (ap, format); 571 va_start (ap, format);
532 len = vsnprintf (buf, sizeof (buf), format, ap); 572 buf.vprintf (format, ap);
533 va_end (ap); 573 va_end (ap);
534 574
535 assert (len >= 0); // shield againstz broken vsnprintf's
536
537 // was our static buffer short enough?
538 if (len < sizeof (buf))
539 return std::string (buf, len);
540 }
541
542 {
543 // longer, try harder
544 char *buf = salloc<char> (len + 1);
545
546 va_list ap;
547 va_start (ap, format);
548 vsnprintf (buf, len + 1, format, ap);
549 va_end (ap);
550
551 const std::string s (buf, len);
552 sfree<char> (buf, len + 1);
553
554 return buf; 575 return buf;
555 }
556} 576}
557 577
558tstamp now () 578tstamp now ()
559{ 579{
560 struct timeval tv; 580 struct timeval tv;
… …
628 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, 648 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
629 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, 649 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
630 0x2d02ef8dL 650 0x2d02ef8dL
631}; 651};
632 652
633#if 0
634void xyzzy (object_ptr &a, object_ptr &o)
635{
636 asm volatile ("int3");
637 a = o;
638 asm volatile ("int3");
639}
640#endif
641

Diff Legend

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