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.140 by root, Wed Nov 4 00:08:44 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>
… …
40 41
41void 42void
42version (object *op) 43version (object *op)
43{ 44{
44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 45 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
45
46#if 0
47 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
48 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
51 new_draw_info (NDI_UNIQUE, 0, op, "");
52 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
53 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
54 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
55 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
56 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
59 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
60 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
88 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
90 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
91 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
92 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
93 new_draw_info (NDI_UNIQUE, 0, op, "");
94 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
95 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
96 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
97 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
103} 46}
104 47
105/* This is a basic little function to put the player back to his 48/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 49 * savebed. We do some error checking - its possible that the
107 * savebed map may no longer exist, so we make sure the player 50 * savebed map may no longer exist, so we make sure the player
… …
204 if (object *golem = contr->golem) 147 if (object *golem = contr->golem)
205 { 148 {
206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 149 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
207 150
208 if (i < 0) 151 if (i < 0)
209 {
210 golem->destroy_inv (true); // be explicit about dropping
211 golem->destroy (true); 152 golem->drop_and_destroy ();
212 }
213 else 153 else
214 { 154 {
215 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 155 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
216 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 156 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
217 } 157 }
… …
419{ 359{
420 shstr::gc (); 360 shstr::gc ();
421 archetype::gc (); 361 archetype::gc ();
422 362
423 if (expect_false (!(pticks % TICKS_PER_HOUR))) 363 if (expect_false (!(pticks % TICKS_PER_HOUR)))
424 adjust_daylight (); 364 maptile::adjust_daylight ();
425 365
426 if (expect_false (!(pticks % 2503))) 366 if (expect_false (!(pticks % 2503)))
427 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 367 fix_weight (); /* Hack to fix weightproblems caused by bugs */
428 368
429 if (expect_false (!(pticks % 5003))) 369 if (expect_false (!(pticks % 5003)))
… …
452 attachable::check_mortals (); 392 attachable::check_mortals ();
453 393
454 ++pticks; 394 ++pticks;
455} 395}
456 396
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 397// normal main
587int 398int
588main (int argc, char **argv) 399main (int argc, char **argv)
589{ 400{
590 settings.argc = argc; 401 settings.argc = argc;
591 settings.argv = argv; 402 settings.argv = argv;
592 403
404 rndm.seed (time (0));
593 g_thread_init (0); // for the slice allocator only 405 g_thread_init (0); // for the slice allocator only
594 406
595 init (argc, argv); 407 init (argc, argv);
596 408
597 for (;;) 409 for (;;)
598 cfperl_main (); 410 cfperl_main ();
599} 411}
600#endif
601 412
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