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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.132 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.139 by root, Mon Oct 12 14:00:59 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
204 if (object *golem = contr->golem) 205 if (object *golem = contr->golem)
205 { 206 {
206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
207 208
208 if (i < 0) 209 if (i < 0)
209 {
210 golem->destroy_inv (true); // be explicit about dropping
211 golem->destroy (true); 210 golem->drop_and_destroy ();
212 }
213 else 211 else
214 { 212 {
215 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
216 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 214 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
217 } 215 }
… …
419{ 417{
420 shstr::gc (); 418 shstr::gc ();
421 archetype::gc (); 419 archetype::gc ();
422 420
423 if (expect_false (!(pticks % TICKS_PER_HOUR))) 421 if (expect_false (!(pticks % TICKS_PER_HOUR)))
424 adjust_daylight (); 422 maptile::adjust_daylight ();
425 423
426 if (expect_false (!(pticks % 2503))) 424 if (expect_false (!(pticks % 2503)))
427 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 425 fix_weight (); /* Hack to fix weightproblems caused by bugs */
428 426
429 if (expect_false (!(pticks % 5003))) 427 if (expect_false (!(pticks % 5003)))
… …
452 attachable::check_mortals (); 450 attachable::check_mortals ();
453 451
454 ++pticks; 452 ++pticks;
455} 453}
456 454
457#if 0
458// used fro benchmarking (x86/amd64-specific)
459typedef unsigned long tval;
460typedef unsigned long long stamp64;
461
462extern inline tval
463stamp (void)
464{
465 tval tsc;
466 asm volatile ("rdtsc":"=a" (tsc)::"edx");
467
468 return tsc;
469}
470
471extern inline tval
472measure (tval t)
473{
474 tval tsc;
475 asm volatile ("rdtsc":"=a" (tsc)::"edx");
476
477 if (tsc > t)
478 return tsc - t;
479 else
480 return t - tsc;
481}
482
483int
484main (int argc, char **argv)
485{
486 rand_gen rg(0);
487 tval fastest = 0x7fffffff;
488 for (int loop = 10000; loop--; )
489 {
490 tval s = stamp ();
491 volatile int i = rg.get_int(25);
492 fastest = min (fastest, measure (s));
493 }
494
495 //printf ("fastest %d\n", fastest);
496 for (int i = 0; i < 1024*1024*3; ++i)
497 {
498 char c = rg.get_int (256);
499 write (2, &c, 1);
500 }
501}
502
503#else
504
505#if 0 // just goofing around, look elsewhere
506
507#include <malloc.h>
508#include <execinfo.h>
509
510static void tr_on ();
511static void tr_off ();
512
513static SMUTEX(tr_mutex);
514
515#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
516#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
517
518static void *
519tr_malloc (size_t size, const void *caller)
520{
521 ltr_off ();
522
523 void *bt [8];
524 backtrace (bt, 8);
525
526 void *ptr = malloc (size);
527
528 ltr_on ();
529 return (char *)ptr;
530}
531
532static void
533tr_free (void *ptr, const void *caller)
534{
535 ltr_off ();
536
537 free (ptr);
538
539 ltr_on ();
540}
541
542void static *
543tr_realloc (void *ptr, size_t size, const void *caller)
544{
545 ltr_off ();
546
547 void *nptr = realloc (ptr, size);
548
549 ltr_on ();
550 return nptr;
551}
552
553static void *
554tr_memalign (size_t size, size_t alignment, const void *caller)
555{
556 ltr_off ();
557
558 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
559
560 ltr_on ();
561 return ptr;
562}
563
564static void
565tr_on ()
566{
567 __malloc_hook = tr_malloc;
568 __realloc_hook = tr_realloc;
569 __free_hook = tr_free;
570 __memalign_hook = tr_memalign;
571}
572
573static void
574tr_off ()
575{
576 __malloc_hook = 0;
577 __realloc_hook = 0;
578 __free_hook = 0;
579 __memalign_hook = 0;
580}
581
582void (*__malloc_initialize_hook)(void) = tr_on;
583
584#endif
585
586// normal main 455// normal main
587int 456int
588main (int argc, char **argv) 457main (int argc, char **argv)
589{ 458{
590 settings.argc = argc; 459 settings.argc = argc;
591 settings.argv = argv; 460 settings.argv = argv;
592 461
462 rndm.seed (time (0));
593 g_thread_init (0); // for the slice allocator only 463 g_thread_init (0); // for the slice allocator only
594 464
595 init (argc, argv); 465 init (argc, argv);
596 466
597 for (;;) 467 for (;;)
598 cfperl_main (); 468 cfperl_main ();
599} 469}
600#endif
601 470
602#if 0
603int xyzzy ()
604{
605 return rndm(8);
606}
607
608void xyzzy (object_ptr &a, object_ptr &o)
609{
610 asm volatile ("int3");
611 a = o;
612 asm volatile ("int3");
613}
614#endif
615

Diff Legend

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