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.95 by root, Sat Mar 17 22:11:23 2007 UTC vs.
Revision 1.132 by root, Mon Sep 29 10:20:49 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 {
214 contr->ranges[range_golem]->destroy (); 210 golem->destroy_inv (true); // be explicit about dropping
215 contr->ranges[range_golem] = 0; 211 golem->destroy (true);
216 } 212 }
217 else 213 else
218 { 214 {
219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]); 215 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
220 216 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 } 217 }
224 } 218 }
225 219
226 /* since the players map is already loaded, we don't need to worry 220 /* since the players map is already loaded, we don't need to worry
227 * about pending objects. 221 * about pending objects.
228 */ 222 */
229 remove_all_pets (newmap); 223 remove_all_pets (newmap);
… …
245 flag = 0; 239 flag = 0;
246 for_all_players (pl) 240 for_all_players (pl)
247 { 241 {
248 pl->refcnt_chk (); 242 pl->refcnt_chk ();
249 243
250 if (!pl->ob || !pl->ns || !pl->ob->active) 244 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
251 continue; 245 continue;
252 246
253 if (pl->ob->speed_left > 0 && pl->ns)
254 if (handle_newcs_player (pl->ob)) 247 if (handle_newcs_player (pl->ob))
255 flag = 1; 248 flag = 1;
256 249 }
257 /* If the player is not actively playing, don't make a 250 }
258 * backup save - nothing to save anyway. Plus, the
259 * map may not longer be valid. This can happen when the
260 * player quits - they exist for purposes of tracking on the map,
261 * but don't actually reside on any actual map.
262 */
263 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
264 continue;
265 } /* end of for loop for all the players */
266 } /* for flag */
267 251
268 for_all_players (pl) 252 for_all_players (pl)
269 { 253 {
254 object *ob = pl->ob;
255
270 if (!pl->ob || !pl->ns || !pl->ob->active) 256 if (expect_false (!ob || !pl->ns || !ob->active))
271 continue; 257 continue;
272 258
273 if (settings.casting_time)
274 {
275 if (pl->ob->casting_time > 0)
276 {
277 pl->ob->casting_time--;
278 pl->ob->start_holding = 1;
279 }
280
281 /* set spell_state so we can update the range in stats field */
282 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
283 pl->ob->start_holding = 0;
284 }
285
286 do_some_living (pl->ob); 259 do_some_living (ob);
287 } 260 }
288} 261}
289 262
290static void 263static void
291process_players2 () 264process_players2 ()
292{ 265{
293 /* Then check if any players should use weapon-speed instead of speed */ 266 /* Then check if any players should use weapon-speed instead of speed */
294 for_all_players (pl) 267 for_all_players (pl)
295 { 268 {
296 /* The code that did weapon_sp handling here was out of place - 269 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
297 * this isn't called until after the player has finished there 270 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
298 * actions, and is thus out of place. All we do here is bounds
299 * checking.
300 */
301 if (pl->has_hit)
302 {
303 if (pl->ob->speed_left > pl->weapon_sp)
304 pl->ob->speed_left = pl->weapon_sp;
305
306 /* This needs to be here - if the player is running, we need to
307 * clear this each tick, but new commands are not being received
308 * so execute_newserver_command() is never called
309 */
310 pl->has_hit = 0;
311 }
312 else if (pl->ob->speed_left > pl->ob->speed)
313 pl->ob->speed_left = pl->ob->speed;
314 } 271 }
315} 272}
316 273
317void 274void
318process_events () 275process_events ()
… …
320 process_players1 (); 277 process_players1 ();
321 278
322 for_all_actives (op) 279 for_all_actives (op)
323 { 280 {
324 /* Now process op */ 281 /* Now process op */
325 if (QUERY_FLAG (op, FLAG_FREED)) 282 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
326 { 283 {
327 LOG (llevError, "BUG: process_events(): Free object on list\n"); 284 LOG (llevError, "BUG: process_events(): Free object on list\n");
328 op->set_speed (0); 285 op->set_speed (0);
329 continue; 286 continue;
330 } 287 }
331 288
332 /* I've seen occasional crashes due to this - the object is removed,
333 * and thus the map it points to (last map it was on) may be bogus
334 * The real bug is to try to find out the cause of this - someone
335 * is probably calling remove_ob without either an insert_ob or
336 * free_object afterwards, leaving an object dangling. But I'd
337 * rather log this and continue on instead of crashing.
338 * Don't remove players - when a player quits, the object is in
339 * sort of a limbo, of removed, but something we want to keep
340 * around.
341 */
342 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
343 {
344 LOG (llevError, "BUG: process_events(): Removed object on list\n");
345 char *dump = dump_object (op);
346 LOG (llevError, dump);
347 free (dump);
348 op->destroy ();
349 continue;
350 }
351
352 if (!op->has_active_speed ()) 289 if (expect_false (!op->has_active_speed ()))
353 { 290 {
354 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 291 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
355 "but is on active list\n", op->debug_desc (), op->speed); 292 "but is on active list\n", op->debug_desc (), op->speed);
356 op->set_speed (0); 293 op->set_speed (0);
357 continue; 294 continue;
358 } 295 }
359 296
360 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 297 if (expect_false (op->flag [FLAG_REMOVED]))
361 { 298 {
362 LOG (llevError, "BUG: process_events(): Object without map or " 299 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
363 "inventory is on active list: %s (%d)\n", &op->name, op->count); 300 op->debug_desc ());
364 op->set_speed (0); 301 op->set_speed (0);
365 continue; 302 continue;
366 } 303 }
367 304
368 /* Animate the object. Bug or feature that anim_speed 305 /* Animate the object. Bug or feature that anim_speed
369 * is based on ticks, and not the creatures speed? 306 * is based on ticks, and not the creatures speed?
370 */ 307 */
371 if (op->anim_speed && op->last_anim >= op->anim_speed) 308 if (op->anim_speed && op->last_anim >= op->anim_speed)
372 { 309 {
373 animate_object (op, op->type == PLAYER ? op->facing : op->direction); 310 animate_object (op, op->contr ? op->facing : op->direction);
374
375 op->last_anim = 1; 311 op->last_anim = 1;
376 } 312 }
377 else 313 else
378 op->last_anim++; 314 ++op->last_anim;
379 315
380 if (op->speed_left > 0) 316 if (expect_false (op->speed_left > 0.f))
381 {
382#if 0
383 /* I've seen occasional crashes in move_symptom() with it
384 * crashing because op is removed - add some debugging to
385 * track if it is removed at this point.
386 * This unfortunately is a bit too verbose it seems - not sure
387 * why - I think what happens is a map is freed or something and
388 * some objects get 'lost' - removed never to be reclaimed.
389 * removed objects generally shouldn't exist.
390 */
391 if (QUERY_FLAG (op, FLAG_REMOVED))
392 { 317 {
393 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
394 }
395#endif
396 --op->speed_left; 318 --op->speed_left;
397 process_object (op); 319 process_object (op);
398
399 if (op->destroyed ())
400 continue;
401 } 320 }
402 321
403 if (settings.casting_time == TRUE && op->casting_time > 0) 322 if (expect_true (!op->contr))
404 op->casting_time--; 323 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
405
406 if (op->speed_left <= 0)
407 op->speed_left += FABS (op->speed);
408 } 324 }
409 325
410 process_players2 (); 326 process_players2 ();
411} 327}
412 328
… …
426 342
427// send all clients some informational text 343// send all clients some informational text
428static void 344static void
429cleanup_inform (const char *cause, bool make_core) 345cleanup_inform (const char *cause, bool make_core)
430{ 346{
431 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 347 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
432 348
433 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 349 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
434 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 350 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
435 351
436 if (make_core) 352 if (make_core)
437 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 353 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
438 else 354 else
439 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.\n"); 355 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
440 356
441 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 357 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
442 358
443 flush_sockets (); 359 client::flush_sockets ();
444} 360}
445 361
446/* clean up everything before exiting */ 362/* clean up everything before exiting */
447void 363void
448cleanup (const char *cause, bool make_core) 364cleanup (const char *cause, bool make_core)
… …
468 LOG (llevDebug, "running cleanup handlers.\n"); 384 LOG (llevDebug, "running cleanup handlers.\n");
469 INVOKE_GLOBAL (CLEANUP); 385 INVOKE_GLOBAL (CLEANUP);
470 386
471 LOG (llevDebug, "cleanup done.\n"); 387 LOG (llevDebug, "cleanup done.\n");
472 388
389 log_cleanup ();
390
473 if (make_core) 391 if (make_core)
474 {
475 cleanup_inform (cause, make_core); 392 cleanup_inform (cause, make_core);
476 cfperl_cleanup (make_core);
477 _exit (1);
478 }
479 else 393 else
480 { 394 {
481 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n"); 395 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
482 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n"); 396 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
483 flush_sockets (); 397 client::flush_sockets ();
398 }
399
484 cfperl_cleanup (make_core); 400 cfperl_cleanup (make_core);
485 _exit (0); 401 _exit (make_core);
486 }
487}
488
489int
490forbid_play (void)
491{
492#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
493 char buf[MAX_BUF], day[MAX_BUF];
494 FILE *fp;
495 time_t clock;
496 struct tm *tm;
497 int i, start, stop, forbit = 0, comp;
498
499 clock = time (NULL);
500 tm = (struct tm *) localtime (&clock);
501
502 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
503 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
504 return 0;
505
506 while (fgets (buf, MAX_BUF, fp))
507 {
508 if (buf[0] == '#')
509 continue;
510
511 if (!strncmp (buf, "msg", 3))
512 {
513 if (forbit)
514 while (fgets (buf, MAX_BUF, fp)) /* print message */
515 fputs (buf, logfile);
516 break;
517 }
518 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
519 {
520 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
521 continue;
522 }
523
524 for (i = 0; i < 7; i++)
525 {
526 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
527 forbit = 1;
528 }
529 }
530
531 close_and_delete (fp, comp);
532
533 return forbit;
534#else
535 return 0;
536#endif
537} 402}
538 403
539/* 404/*
540 * do_specials() is a collection of functions to call from time to time. 405 * do_specials() is a collection of functions to call from time to time.
541 * Modified 2000-1-14 MSW to use the global pticks count to determine how 406 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
550 * doing the various things. 415 * doing the various things.
551 */ 416 */
552void 417void
553do_specials (void) 418do_specials (void)
554{ 419{
420 shstr::gc ();
421 archetype::gc ();
422
555 if (!(pticks % TICKS_PER_HOUR)) 423 if (expect_false (!(pticks % TICKS_PER_HOUR)))
556 adjust_daylight (); 424 adjust_daylight ();
557 425
558 if (!(pticks % 7))
559 shstr::gc ();
560
561 if (!(pticks % 2503)) 426 if (expect_false (!(pticks % 2503)))
562 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 427 fix_weight (); /* Hack to fix weightproblems caused by bugs */
563 428
564 if (!(pticks % 5003)) 429 if (expect_false (!(pticks % 5003)))
565 write_book_archive (); 430 write_book_archive ();
566 431
567 if (!(pticks % 5009)) 432 if (expect_false (!(pticks % 5009)))
568 clean_friendly_list (); 433 clean_friendly_list ();
569 434
570 if (!(pticks % 5011)) 435 if (expect_false (!(pticks % 5011)))
571 obsolete_parties (); 436 obsolete_parties ();
572 437
573 if (!(pticks % 12503)) 438 if (expect_false (!(pticks % 12503)))
574 fix_luck (); 439 fix_luck ();
575} 440}
576 441
577void 442void
578server_tick () 443server_tick ()
579{ 444{
580 // first do the user visible stuff 445 // first do the user visible stuff
581 doeric_server ();
582 INVOKE_GLOBAL (CLOCK); 446 INVOKE_GLOBAL (CLOCK);
583 process_events (); /* "do" something with objects with speed */ 447 process_events (); // "do" something with objects with speed
584 flush_sockets (); 448 client::clock (); // draw client maps etc.
585 449
586 // then do some bookkeeping, should not really be here 450 // then do some bookkeeping, should not really be here
587 do_specials (); /* Routines called from time to time. */ 451 do_specials (); /* Routines called from time to time. */
588 attachable::check_mortals (); 452 attachable::check_mortals ();
589 453
… …
636 } 500 }
637} 501}
638 502
639#else 503#else
640 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
641// normal main 586// normal main
642int 587int
643main (int argc, char **argv) 588main (int argc, char **argv)
644{ 589{
645 settings.argc = argc; 590 settings.argc = argc;
646 settings.argv = argv; 591 settings.argv = argv;
647 592
593 g_thread_init (0); // for the slice allocator only
594
648 init (argc, argv); 595 init (argc, argv);
649
650 initPlugins ();
651 596
652 for (;;) 597 for (;;)
653 cfperl_main (); 598 cfperl_main ();
654} 599}
655#endif 600#endif
656 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