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.137 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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>
… …
32 33
33#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
34#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
35#include "path.h" 36#include "path.h"
36 37
37static char days[7][4] = {
38 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
39};
40
41void 38void
42version (object *op) 39version (object *op)
43{ 40{
44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 41 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} 42}
104 43
105/* This is a basic little function to put the player back to his 44/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 45 * savebed.
107 * savebed map may no longer exist, so we make sure the player
108 * goes someplace.
109 */ 46 */
110void 47void
111enter_player_savebed (object *op) 48enter_player_savebed (object *op)
112{ 49{
113 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y); 50 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
… …
118 * new map. map, x, y must be set. map is the map we are moving the 55 * new map. map, x, y must be set. map is the map we are moving the
119 * player to - it could be the map he just came from if the load failed for 56 * player to - it could be the map he just came from if the load failed for
120 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
121 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
122 */ 59 */
123void 60bool
124object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
125{ 62{
126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) 63 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
127 return; 64 return false;
128 65
129 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
130 { 67 {
131 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 68 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
132 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
134 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
135 { 72 {
136 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 73 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
137 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
138 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
139 return; 76 return false;
140 } 77 }
141 } 78 }
142 79
143 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
144 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
145 return; 82 return false;
146 83
147 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
148 remove (); 85 remove ();
149 86
150 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
151 if (blocked (newmap, x, y)) 88 if (blocked (newmap, x, y))
152 { /* First choice blocked */ 89 { /* First choice blocked */
… …
157 * Note that for the second and third calls, we could start at a position other 94 * Note that for the second and third calls, we could start at a position other
158 * than one, but then we could end up on the other side of walls and so forth. 95 * than one, but then we could end up on the other side of walls and so forth.
159 */ 96 */
160 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 97 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
161 98
162 if (i == -1) 99 if (i < 0)
163 { 100 {
164 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
165 if (i == -1) 102 if (i < 0)
166 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
167 } 104 }
168 105
169 if (i != -1) 106 if (i >= 0)
170 { 107 {
171 x += freearr_x[i]; 108 x += freearr_x[i];
172 y += freearr_y[i]; 109 y += freearr_y[i];
173 } 110 }
174 else 111 else
… …
177 } 114 }
178 115
179 if (contr && map != newmap) 116 if (contr && map != newmap)
180 { 117 {
181 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 118 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
182 return; 119 return false;
183 120
184 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 121 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
185 return; 122 return false;
186 } 123 }
187
188 this->x = x;
189 this->y = y;
190 map = newmap;
191
192 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
193 124
194 enemy = 0; 125 enemy = 0;
195 126
127 //newmap->insert (this, x, y);
128 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
129
130 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
131 {
196 if (contr) 132 if (contr)
197 { 133 {
198 contr->maplevel = newmap->path; 134 contr->maplevel = newmap->path;
199 contr->count = 0; 135 contr->count = 0;
200 }
201 136
202 /* Update any golems */ 137 /* Update any golems */
203 if (type == PLAYER)
204 if (object *golem = contr->golem) 138 if (object *golem = contr->golem)
205 { 139 {
206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 140 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
207 141
208 if (i < 0) 142 if (i < 0)
209 golem->drop_and_destroy (); 143 golem->drop_and_destroy ();
210 else 144 else
211 { 145 {
212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 146 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
213 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 147 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
148 }
214 } 149 }
215 } 150 }
216 151
217 /* since the players map is already loaded, we don't need to worry 152 /* since the players map is already loaded, we don't need to worry
218 * about pending objects. 153 * about pending objects.
219 */ 154 */
220 remove_all_pets (newmap); 155 move_all_pets ();
156
157 return true;
158 }
159
160 return false;
221} 161}
222 162
223/* process_players1 and process_players2 do all the player related stuff. 163/* process_players1 and process_players2 do all the player related stuff.
224 * I moved it out of process events and process_map. This was to some 164 * I moved it out of process events and process_map. This was to some
225 * extent for debugging as well as to get a better idea of the time used 165 * extent for debugging as well as to get a better idea of the time used
… …
248 188
249 for_all_players (pl) 189 for_all_players (pl)
250 { 190 {
251 object *ob = pl->ob; 191 object *ob = pl->ob;
252 192
193 // process_objects destroys the speed_left value
194 pl->speed_left_save = ob->speed_left;
195
253 if (expect_false (!ob || !pl->ns || !ob->active)) 196 if (expect_false (!ob || !pl->ns || !ob->active))
254 continue; 197 continue;
255 198
256 do_some_living (ob); 199 do_some_living (ob);
257 } 200 }
… …
261process_players2 () 204process_players2 ()
262{ 205{
263 /* Then check if any players should use weapon-speed instead of speed */ 206 /* Then check if any players should use weapon-speed instead of speed */
264 for_all_players (pl) 207 for_all_players (pl)
265 { 208 {
209 // restore speed_left value saved by process_players1
210 pl->ob->speed_left = pl->speed_left_save;
211
266 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); 212 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
267 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 213 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
268 } 214 }
269} 215}
270 216
271void 217static void
272process_events () 218process_events ()
273{ 219{
274 process_players1 (); 220 process_players1 ();
275 221
276 for_all_actives (op) 222 for_all_actives (op)
277 { 223 {
224 // try to prefetch some stuff we expect to need
225 // obviously, it should be grouped into the same cacheline.
226 // preliminary results indicate that this gives halves the speed
227 // used for the inner loop
228 if (_i < actives.size ()) // HACK, rely on _i :/
229 {
230 object *next = actives [_i + 1];
231
232 prefetch (&next->flag , 0, 1);
233 prefetch (&next->speed , 0, 1);
234 prefetch (&next->anim_speed, 0, 1);
235 prefetch (&next->contr , 0, 1);
236 }
237
278 /* Now process op */ 238 /* Now process op */
279 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 239 if (expect_false (op->flag [FLAG_FREED]))
280 { 240 {
281 LOG (llevError, "BUG: process_events(): Free object on list\n"); 241 LOG (llevError, "BUG: process_events(): Free object on list\n");
282 op->set_speed (0); 242 op->set_speed (0);
283 continue; 243 continue;
284 } 244 }
… …
314 { 274 {
315 --op->speed_left; 275 --op->speed_left;
316 process_object (op); 276 process_object (op);
317 } 277 }
318 278
319 if (expect_true (!op->contr)) 279 // this will destroy the speed_left value for players, but
280 // process_players1 and ..2 save/restore the real value,
281 // so we can avoid a costly test here.
320 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 282 op->speed_left = min (op->speed, op->speed_left + op->speed);
321 } 283 }
322 284
323 process_players2 (); 285 process_players2 ();
324} 286}
325 287
326/* clean up everything before exiting */ 288/* clean up everything before exiting */
327void 289void
328emergency_save () 290emergency_save ()
329{ 291{
330 LOG (llevDebug, "emergency save begin.\n"); 292 LOG (llevInfo, "emergency_save: enter\n");
293
294 LOG (llevInfo, "emergency_save: saving book archive\n");
295 write_book_archive ();
331 296
332 cfperl_emergency_save (); 297 cfperl_emergency_save ();
333 298
334 LOG (llevDebug, "saving book archive.\n");
335 write_book_archive ();
336
337 LOG (llevDebug, "emergency save done.\n"); 299 LOG (llevInfo, "emergency_save: leave\n");
338} 300}
339 301
340// send all clients some informational text 302// send all clients some informational text
341static void 303static void
342cleanup_inform (const char *cause, bool make_core) 304cleanup_inform (const char *cause, bool make_core)
… …
361cleanup (const char *cause, bool make_core) 323cleanup (const char *cause, bool make_core)
362{ 324{
363 if (make_core) 325 if (make_core)
364 fork_abort (cause); 326 fork_abort (cause);
365 327
366 LOG (llevError, "cleanup cause: %s\n", cause); 328 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
367 329
368 if (!make_core) 330 if (!make_core)
369 cleanup_inform (cause, make_core); 331 cleanup_inform (cause, make_core);
370 332
371 LOG (llevDebug, "cleanup begin.\n"); 333 LOG (llevDebug, "cleanup begin.\n");
… …
409 * done on the same tick, but that will happen very infrequently 371 * done on the same tick, but that will happen very infrequently
410 * 372 *
411 * I also think this code makes it easier to see how often we really are 373 * I also think this code makes it easier to see how often we really are
412 * doing the various things. 374 * doing the various things.
413 */ 375 */
414void 376static void
415do_specials (void) 377do_specials ()
416{ 378{
417 shstr::gc (); 379 shstr::gc ();
418 archetype::gc (); 380 archetype::gc ();
419 381
420 if (expect_false (!(pticks % TICKS_PER_HOUR))) 382 if (expect_false (!(pticks % TICKS_PER_HOUR)))
… …
447 // then do some bookkeeping, should not really be here 409 // then do some bookkeeping, should not really be here
448 do_specials (); /* Routines called from time to time. */ 410 do_specials (); /* Routines called from time to time. */
449 attachable::check_mortals (); 411 attachable::check_mortals ();
450 412
451 ++pticks; 413 ++pticks;
452}
453 414
454#if 0 415 if (object::object_count >= RESTART_COUNT)
455// used fro benchmarking (x86/amd64-specific) 416 cleanup ("running out of protocol ID values - need full restart");
456typedef unsigned long tval;
457typedef unsigned long long stamp64;
458
459extern inline tval
460stamp (void)
461{
462 tval tsc;
463 asm volatile ("rdtsc":"=a" (tsc)::"edx");
464
465 return tsc;
466} 417}
467
468extern inline tval
469measure (tval t)
470{
471 tval tsc;
472 asm volatile ("rdtsc":"=a" (tsc)::"edx");
473
474 if (tsc > t)
475 return tsc - t;
476 else
477 return t - tsc;
478}
479
480int
481main (int argc, char **argv)
482{
483 rand_gen rg(0);
484 tval fastest = 0x7fffffff;
485 for (int loop = 10000; loop--; )
486 {
487 tval s = stamp ();
488 volatile int i = rg.get_int(25);
489 fastest = min (fastest, measure (s));
490 }
491
492 //printf ("fastest %d\n", fastest);
493 for (int i = 0; i < 1024*1024*3; ++i)
494 {
495 char c = rg.get_int (256);
496 write (2, &c, 1);
497 }
498}
499
500#else
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 418
583// normal main 419// normal main
584int 420int
585main (int argc, char **argv) 421main (int argc, char **argv)
586{ 422{
… …
593 init (argc, argv); 429 init (argc, argv);
594 430
595 for (;;) 431 for (;;)
596 cfperl_main (); 432 cfperl_main ();
597} 433}
598#endif
599 434
600#if 0
601int xyzzy ()
602{
603 return rndm(8);
604}
605
606void xyzzy (object_ptr &a, object_ptr &o)
607{
608 asm volatile ("int3");
609 a = o;
610 asm volatile ("int3");
611}
612#endif
613

Diff Legend

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