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.87 by root, Thu Jan 18 19:32:37 2007 UTC vs.
Revision 1.135 by root, Tue Dec 30 07:24:16 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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,
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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <object.h> 25#include <object.h>
27#include <tod.h> 26#include <tod.h>
28 27
29#include <sproto.h> 28#include <sproto.h>
30#include <time.h> 29#include <time.h>
31 30
31#include <glib.h>
32
32#include <../random_maps/random_map.h> 33#include <../random_maps/random_map.h>
33#include <../random_maps/rproto.h> 34#include <../random_maps/rproto.h>
34#include "path.h" 35#include "path.h"
35 36
36static char days[7][4] = { 37static char days[7][4] = {
… …
38}; 39};
39 40
40void 41void
41version (object *op) 42version (object *op)
42{ 43{
43 if (op)
44 clear_win_info (op);
45
46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
47 45
46#if 0
48 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
49 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 48 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 49 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
51 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); 50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
52 new_draw_info (NDI_UNIQUE, 0, op, ""); 51 new_draw_info (NDI_UNIQUE, 0, op, "");
… …
98 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); 98 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
100 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, ""); 100 new_draw_info (NDI_UNIQUE, 0, op, "");
102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
103} 103}
104 104
105/* This is a basic little function to put the player back to his 105/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
107 * savebed map may no longer exist, so we make sure the player 107 * savebed map may no longer exist, so we make sure the player
108 * goes someplace. 108 * goes someplace.
109 */ 109 */
110void 110void
111enter_player_savebed (object *op) 111enter_player_savebed (object *op)
112{ 112{
113 object *tmp = object::create (); 113 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
114 EXIT_PATH (tmp) = op->contr->savebed_map;
115 EXIT_X (tmp) = op->contr->bed_x;
116 EXIT_Y (tmp) = op->contr->bed_y;
117 op->enter_exit (tmp);
118 tmp->destroy ();
119} 114}
120 115
121/* 116/*
122 * enter_map(): Moves the player and pets from current map (if any) to 117 * enter_map(): Moves the player and pets from current map (if any) to
123 * new map. map, x, y must be set. map is the map we are moving the 118 * new map. map, x, y must be set. map is the map we are moving the
… …
126 * the function that calls this should figure them out. 121 * the function that calls this should figure them out.
127 */ 122 */
128void 123void
129object::enter_map (maptile *newmap, int x, int y) 124object::enter_map (maptile *newmap, int x, int y)
130{ 125{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
132 return; 127 return;
133 128
134 if (out_of_map (newmap, x, y)) 129 if (out_of_map (newmap, x, y))
135 { 130 {
136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 131 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
151 146
152 // remove, so stupid ob_locked does not trigger a failure 147 // remove, so stupid ob_locked does not trigger a failure
153 remove (); 148 remove ();
154 149
155 /* try to find a spot for the player */ 150 /* try to find a spot for the player */
156 if (ob_blocked (this, newmap, x, y)) 151 if (blocked (newmap, x, y))
157 { /* First choice blocked */ 152 { /* First choice blocked */
158 /* We try to find a spot for the player, starting closest in. 153 /* We try to find a spot for the player, starting closest in.
159 * We could use find_first_free_spot, but that doesn't randomize it at all, 154 * We could use find_first_free_spot, but that doesn't randomize it at all,
160 * So for example, if the north space is free, you would always end up there even 155 * So for example, if the north space is free, you would always end up there even
161 * if other spaces around are available. 156 * if other spaces around are available.
… …
203 contr->maplevel = newmap->path; 198 contr->maplevel = newmap->path;
204 contr->count = 0; 199 contr->count = 0;
205 } 200 }
206 201
207 /* Update any golems */ 202 /* Update any golems */
208 if (type == PLAYER && contr->ranges[range_golem]) 203 if (type == PLAYER)
204 if (object *golem = contr->golem)
209 { 205 {
210 int i = find_free_spot (contr->ranges[range_golem], newmap, x, y, 1, SIZEOFFREE); 206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
211 207
212 if (i < 0) 208 if (i < 0)
213 { 209 golem->drop_and_destroy ();
214 contr->ranges[range_golem]->destroy ();
215 contr->ranges[range_golem] = 0;
216 }
217 else 210 else
218 { 211 {
219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]); 212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
220 213 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
221 contr->ranges[range_golem]->direction =
222 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
223 } 214 }
224 } 215 }
225 216
226 /* since the players map is already loaded, we don't need to worry 217 /* since the players map is already loaded, we don't need to worry
227 * about pending objects. 218 * about pending objects.
228 */ 219 */
229 remove_all_pets (newmap); 220 remove_all_pets (newmap);
… …
237 * is needed after the players have been updated. 228 * is needed after the players have been updated.
238 */ 229 */
239static void 230static void
240process_players1 () 231process_players1 ()
241{ 232{
242 int flag;
243
244 /* Basically, we keep looping until all the players have done their actions. */ 233 /* Basically, we keep looping until all the players have done their actions. */
245 for (flag = 1; flag != 0;) 234 for (int flag = 1; flag != 0;)
246 { 235 {
247 flag = 0; 236 flag = 0;
248 for_all_players (pl) 237 for_all_players (pl)
249 { 238 {
250 pl->refcnt_chk (); 239 pl->refcnt_chk ();
251 240
252 if (!pl->ob || !pl->ns || !pl->ob->active) 241 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
253 continue; 242 continue;
254 243
255 if (pl->ob->speed_left > 0)
256 if (handle_newcs_player (pl->ob)) 244 if (handle_newcs_player (pl->ob))
257 flag = 1; 245 flag = 1;
258 246 }
259 /* If the player is not actively playing, don't make a 247 }
260 * backup save - nothing to save anyway. Plus, the
261 * map may not longer be valid. This can happen when the
262 * player quits - they exist for purposes of tracking on the map,
263 * but don't actually reside on any actual map.
264 */
265 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
266 continue;
267 } /* end of for loop for all the players */
268 } /* for flag */
269 248
270 for_all_players (pl) 249 for_all_players (pl)
271 { 250 {
251 object *ob = pl->ob;
252
272 if (!pl->ob || !pl->ns || !pl->ob->active) 253 if (expect_false (!ob || !pl->ns || !ob->active))
273 continue; 254 continue;
274 255
275 if (settings.casting_time)
276 {
277 if (pl->ob->casting_time > 0)
278 {
279 pl->ob->casting_time--;
280 pl->ob->start_holding = 1;
281 }
282
283 /* set spell_state so we can update the range in stats field */
284 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
285 pl->ob->start_holding = 0;
286 }
287
288 do_some_living (pl->ob); 256 do_some_living (ob);
289 } 257 }
290} 258}
291 259
292static void 260static void
293process_players2 () 261process_players2 ()
294{ 262{
295 /* Then check if any players should use weapon-speed instead of speed */ 263 /* Then check if any players should use weapon-speed instead of speed */
296 for_all_players (pl) 264 for_all_players (pl)
297 { 265 {
298 /* The code that did weapon_sp handling here was out of place - 266 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
299 * this isn't called until after the player has finished there 267 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
300 * actions, and is thus out of place. All we do here is bounds
301 * checking.
302 */
303 if (pl->has_hit)
304 {
305 if (pl->ob->speed_left > pl->weapon_sp)
306 pl->ob->speed_left = pl->weapon_sp;
307
308 /* This needs to be here - if the player is running, we need to
309 * clear this each tick, but new commands are not being received
310 * so execute_newserver_command() is never called
311 */
312 pl->has_hit = 0;
313 }
314 else if (pl->ob->speed_left > pl->ob->speed)
315 pl->ob->speed_left = pl->ob->speed;
316 } 268 }
317} 269}
318 270
319void 271void
320process_events () 272process_events ()
… …
322 process_players1 (); 274 process_players1 ();
323 275
324 for_all_actives (op) 276 for_all_actives (op)
325 { 277 {
326 /* Now process op */ 278 /* Now process op */
327 if (QUERY_FLAG (op, FLAG_FREED)) 279 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
328 { 280 {
329 LOG (llevError, "BUG: process_events(): Free object on list\n"); 281 LOG (llevError, "BUG: process_events(): Free object on list\n");
330 op->set_speed (0); 282 op->set_speed (0);
331 continue; 283 continue;
332 } 284 }
333 285
334 /* I've seen occasional crashes due to this - the object is removed,
335 * and thus the map it points to (last map it was on) may be bogus
336 * The real bug is to try to find out the cause of this - someone
337 * is probably calling remove_ob without either an insert_ob or
338 * free_object afterwards, leaving an object dangling. But I'd
339 * rather log this and continue on instead of crashing.
340 * Don't remove players - when a player quits, the object is in
341 * sort of a limbo, of removed, but something we want to keep
342 * around.
343 */
344 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
345 {
346 LOG (llevError, "BUG: process_events(): Removed object on list\n");
347 char *dump = dump_object (op);
348 LOG (llevError, dump);
349 free (dump);
350 op->destroy ();
351 continue;
352 }
353
354 if (!op->has_active_speed ()) 286 if (expect_false (!op->has_active_speed ()))
355 { 287 {
356 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 288 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
357 "but is on active list\n", op->debug_desc (), op->speed); 289 "but is on active list\n", op->debug_desc (), op->speed);
358 op->set_speed (0); 290 op->set_speed (0);
359 continue; 291 continue;
360 } 292 }
361 293
362 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 294 if (expect_false (op->flag [FLAG_REMOVED]))
363 { 295 {
364 LOG (llevError, "BUG: process_events(): Object without map or " 296 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
365 "inventory is on active list: %s (%d)\n", &op->name, op->count); 297 op->debug_desc ());
366 op->set_speed (0); 298 op->set_speed (0);
367 continue; 299 continue;
368 } 300 }
369 301
370 /* Animate the object. Bug or feature that anim_speed 302 /* Animate the object. Bug or feature that anim_speed
371 * is based on ticks, and not the creatures speed? 303 * is based on ticks, and not the creatures speed?
372 */ 304 */
373 if (op->anim_speed && op->last_anim >= op->anim_speed) 305 if (op->anim_speed && op->last_anim >= op->anim_speed)
374 { 306 {
375 if ((op->type == PLAYER))
376 animate_object (op, op->facing);
377 else
378 animate_object (op, op->direction); 307 animate_object (op, op->contr ? op->facing : op->direction);
379
380 op->last_anim = 1; 308 op->last_anim = 1;
381 } 309 }
382 else 310 else
383 op->last_anim++; 311 ++op->last_anim;
384 312
385 if (op->speed_left > 0) 313 if (expect_false (op->speed_left > 0.f))
386 {
387#if 0
388 /* I've seen occasional crashes in move_symptom() with it
389 * crashing because op is removed - add some debugging to
390 * track if it is removed at this point.
391 * This unfortunately is a bit too verbose it seems - not sure
392 * why - I think what happens is a map is freed or something and
393 * some objects get 'lost' - removed never to be reclaimed.
394 * removed objects generally shouldn't exist.
395 */
396 if (QUERY_FLAG (op, FLAG_REMOVED))
397 { 314 {
398 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
399 }
400#endif
401 --op->speed_left; 315 --op->speed_left;
402 process_object (op); 316 process_object (op);
403
404 if (op->destroyed ())
405 continue;
406 } 317 }
407 318
408 if (settings.casting_time == TRUE && op->casting_time > 0) 319 if (expect_true (!op->contr))
409 op->casting_time--; 320 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
410
411 if (op->speed_left <= 0)
412 op->speed_left += FABS (op->speed);
413 } 321 }
414 322
415 process_players2 (); 323 process_players2 ();
416} 324}
417 325
… …
431 339
432// send all clients some informational text 340// send all clients some informational text
433static void 341static void
434cleanup_inform (const char *cause, bool make_core) 342cleanup_inform (const char *cause, bool make_core)
435{ 343{
436 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 344 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
437 345
438 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 346 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
439 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 347 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
440 348
441 if (make_core) 349 if (make_core)
442 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 350 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
443 else 351 else
444 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players have been saved.\n"); 352 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
445 353
446 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 354 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
447 355
448 flush_sockets (); 356 client::flush_sockets ();
449} 357}
450 358
451/* clean up everything before exiting */ 359/* clean up everything before exiting */
452void 360void
453cleanup (const char *cause, bool make_core) 361cleanup (const char *cause, bool make_core)
… …
473 LOG (llevDebug, "running cleanup handlers.\n"); 381 LOG (llevDebug, "running cleanup handlers.\n");
474 INVOKE_GLOBAL (CLEANUP); 382 INVOKE_GLOBAL (CLEANUP);
475 383
476 LOG (llevDebug, "cleanup done.\n"); 384 LOG (llevDebug, "cleanup done.\n");
477 385
386 log_cleanup ();
387
478 if (make_core) 388 if (make_core)
479 {
480 cleanup_inform (cause, make_core); 389 cleanup_inform (cause, make_core);
481 _exit (1);
482 }
483 else 390 else
484 _exit (0);
485}
486
487int
488forbid_play (void)
489{
490#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
491 char buf[MAX_BUF], day[MAX_BUF];
492 FILE *fp;
493 time_t clock;
494 struct tm *tm;
495 int i, start, stop, forbit = 0, comp;
496
497 clock = time (NULL);
498 tm = (struct tm *) localtime (&clock);
499
500 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
501 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
502 return 0;
503
504 while (fgets (buf, MAX_BUF, fp))
505 {
506 if (buf[0] == '#')
507 continue;
508
509 if (!strncmp (buf, "msg", 3))
510 {
511 if (forbit)
512 while (fgets (buf, MAX_BUF, fp)) /* print message */
513 fputs (buf, logfile);
514 break;
515 }
516 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
517 {
518 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
519 continue;
520 }
521
522 for (i = 0; i < 7; i++)
523 {
524 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
525 forbit = 1;
526 }
527 } 391 {
392 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
393 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
394 client::flush_sockets ();
395 }
528 396
529 close_and_delete (fp, comp); 397 cfperl_cleanup (make_core);
530 398 _exit (make_core);
531 return forbit;
532#else
533 return 0;
534#endif
535} 399}
536 400
537/* 401/*
538 * do_specials() is a collection of functions to call from time to time. 402 * do_specials() is a collection of functions to call from time to time.
539 * Modified 2000-1-14 MSW to use the global pticks count to determine how 403 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
545 * done on the same tick, but that will happen very infrequently 409 * done on the same tick, but that will happen very infrequently
546 * 410 *
547 * I also think this code makes it easier to see how often we really are 411 * I also think this code makes it easier to see how often we really are
548 * doing the various things. 412 * doing the various things.
549 */ 413 */
550
551extern unsigned long todtick;
552
553void 414void
554do_specials (void) 415do_specials (void)
555{ 416{
556 if (!(pticks % PTICKS_PER_CLOCK))
557 tick_the_clock ();
558
559 if (!(pticks % 7))
560 shstr::gc (); 417 shstr::gc ();
418 archetype::gc ();
561 419
420 if (expect_false (!(pticks % TICKS_PER_HOUR)))
421 maptile::adjust_daylight ();
422
562 if (!(pticks % 2503)) 423 if (expect_false (!(pticks % 2503)))
563 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 424 fix_weight (); /* Hack to fix weightproblems caused by bugs */
564 425
565 if (!(pticks % 5003)) 426 if (expect_false (!(pticks % 5003)))
566 write_book_archive (); 427 write_book_archive ();
567 428
568 if (!(pticks % 5009)) 429 if (expect_false (!(pticks % 5009)))
569 clean_friendly_list (); 430 clean_friendly_list ();
570 431
571 if (!(pticks % 5011)) 432 if (expect_false (!(pticks % 5011)))
572 obsolete_parties (); 433 obsolete_parties ();
573 434
574 if (!(pticks % 12503)) 435 if (expect_false (!(pticks % 12503)))
575 fix_luck (); 436 fix_luck ();
576} 437}
577 438
578void 439void
579server_tick () 440server_tick ()
580{ 441{
581 // first do the user visible stuff 442 // first do the user visible stuff
582 doeric_server ();
583 INVOKE_GLOBAL (CLOCK); 443 INVOKE_GLOBAL (CLOCK);
584 process_events (); /* "do" something with objects with speed */ 444 process_events (); // "do" something with objects with speed
585 flush_sockets (); 445 client::clock (); // draw client maps etc.
586 446
587 // then do some bookkeeping, should not really be here 447 // then do some bookkeeping, should not really be here
588 do_specials (); /* Routines called from time to time. */ 448 do_specials (); /* Routines called from time to time. */
589 attachable::check_mortals (); 449 attachable::check_mortals ();
590 450
… …
637 } 497 }
638} 498}
639 499
640#else 500#else
641 501
502#if 0 // just goofing around, look elsewhere
503
504#include <malloc.h>
505#include <execinfo.h>
506
507static void tr_on ();
508static void tr_off ();
509
510static SMUTEX(tr_mutex);
511
512#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
513#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
514
515static void *
516tr_malloc (size_t size, const void *caller)
517{
518 ltr_off ();
519
520 void *bt [8];
521 backtrace (bt, 8);
522
523 void *ptr = malloc (size);
524
525 ltr_on ();
526 return (char *)ptr;
527}
528
529static void
530tr_free (void *ptr, const void *caller)
531{
532 ltr_off ();
533
534 free (ptr);
535
536 ltr_on ();
537}
538
539void static *
540tr_realloc (void *ptr, size_t size, const void *caller)
541{
542 ltr_off ();
543
544 void *nptr = realloc (ptr, size);
545
546 ltr_on ();
547 return nptr;
548}
549
550static void *
551tr_memalign (size_t size, size_t alignment, const void *caller)
552{
553 ltr_off ();
554
555 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
556
557 ltr_on ();
558 return ptr;
559}
560
561static void
562tr_on ()
563{
564 __malloc_hook = tr_malloc;
565 __realloc_hook = tr_realloc;
566 __free_hook = tr_free;
567 __memalign_hook = tr_memalign;
568}
569
570static void
571tr_off ()
572{
573 __malloc_hook = 0;
574 __realloc_hook = 0;
575 __free_hook = 0;
576 __memalign_hook = 0;
577}
578
579void (*__malloc_initialize_hook)(void) = tr_on;
580
581#endif
582
642// normal main 583// normal main
584//276637068 slice
585//394141716
643int 586int
644main (int argc, char **argv) 587main (int argc, char **argv)
645{ 588{
646 settings.argc = argc; 589 settings.argc = argc;
647 settings.argv = argv; 590 settings.argv = argv;
648 591
592 g_thread_init (0); // for the slice allocator only
593 rndm.seed (time (0));
594
649 init (argc, argv); 595 init (argc, argv);
650
651 initPlugins ();
652 596
653 for (;;) 597 for (;;)
654 cfperl_main (); 598 cfperl_main ();
655} 599}
656#endif 600#endif
657 601
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