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.171 by root, Tue May 3 11:23:48 2011 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,2011 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>
… …
28#include <sproto.h> 29#include <sproto.h>
29#include <time.h> 30#include <time.h>
30 31
31#include <glib.h> 32#include <glib.h>
32 33
33#include <../random_maps/random_map.h> 34#include <rmg.h>
34#include <../random_maps/rproto.h> 35#include <rproto.h>
35#include "path.h" 36#include "path.h"
36
37static char days[7][4] = {
38 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
39};
40 37
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)
107 {
108 maptile *m = newmap;
109 sint16 nx = x + freearr_x[i];
110 sint16 ny = y + freearr_y[i];
111
112 if (xy_normalise (m, nx, ny))
170 { 113 {
171 x += freearr_x[i]; 114 newmap = m;
172 y += freearr_y[i]; 115 x = nx;
116 y = ny;
117 }
173 } 118 }
174 else 119 else
175 /* not much we can do in this case. */ 120 /* not much we can do in this case. */
176 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); 121 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
177 } 122 }
178 123
179 if (contr && map != newmap) 124 if (contr && map != newmap)
180 { 125 {
181 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
182 return; 127 return false;
183 128
184 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 129 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
185 return; 130 return false;
186 } 131 }
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 132
194 enemy = 0; 133 enemy = 0;
195 134
135 //newmap->insert (this, x, y);
136 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
137 prefetch_surrounding_maps ();
138
139 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
140 {
196 if (contr) 141 if (contr)
197 { 142 {
198 contr->maplevel = newmap->path; 143 contr->maplevel = newmap->path;
199 contr->count = 0; 144 contr->count = 0;
200 }
201 145
202 /* Update any golems */ 146 /* Update any golems */
203 if (type == 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 (golem->x - x, golem->y - y);
157 }
217 } 158 }
218 } 159 }
219 160
220 /* since the players map is already loaded, we don't need to worry 161 /* since the players map is already loaded, we don't need to worry
221 * about pending objects. 162 * about pending objects.
222 */ 163 */
223 remove_all_pets (newmap); 164 move_all_pets ();
165
166 return true;
167 }
168
169 return false;
224} 170}
225 171
226/* process_players1 and process_players2 do all the player related stuff. 172/* process_players1 and process_players2 do all the player related stuff.
227 * I moved it out of process events and process_map. This was to some 173 * I moved it out of process events and process_map. This was to some
228 * extent for debugging as well as to get a better idea of the time used 174 * extent for debugging as well as to get a better idea of the time used
… …
251 197
252 for_all_players (pl) 198 for_all_players (pl)
253 { 199 {
254 object *ob = pl->ob; 200 object *ob = pl->ob;
255 201
202 // process_objects destroys the speed_left value
203 pl->speed_left_save = ob->speed_left;
204
256 if (expect_false (!ob || !pl->ns || !ob->active)) 205 if (expect_false (!ob || !pl->ns || !ob->active))
257 continue; 206 continue;
258 207
259 do_some_living (ob); 208 do_some_living (ob);
260 } 209 }
… …
264process_players2 () 213process_players2 ()
265{ 214{
266 /* Then check if any players should use weapon-speed instead of speed */ 215 /* Then check if any players should use weapon-speed instead of speed */
267 for_all_players (pl) 216 for_all_players (pl)
268 { 217 {
218 // restore speed_left value saved by process_players1
219 pl->ob->speed_left = pl->speed_left_save;
220
269 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); 221 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
270 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 222 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
271 } 223 }
272} 224}
273 225
274void 226static void
275process_events () 227process_events ()
276{ 228{
277 process_players1 (); 229 process_players1 ();
278 230
279 for_all_actives (op) 231 for_all_actives (op)
280 { 232 {
233 // try to prefetch some stuff we expect to need
234 // obviously, it should be grouped into the same cacheline.
235 // preliminary results indicate that this gives halves the speed
236 // used for the inner loop
237 if (_i < actives.size ()) // HACK, rely on _i :/
238 {
239 object *next = actives [_i + 1];
240
241 prefetch (&next->flag , 0, 1);
242 prefetch (&next->speed , 0, 1);
243 prefetch (&next->anim_speed, 0, 1);
244 prefetch (&next->contr , 0, 1);
245 }
246
281 /* Now process op */ 247 /* Now process op */
282 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 248 if (expect_false (op->flag [FLAG_FREED]))
283 { 249 {
284 LOG (llevError, "BUG: process_events(): Free object on list\n"); 250 LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
285 op->set_speed (0); 251 op->set_speed (0);
286 continue; 252 continue;
287 } 253 }
288 254
289 if (expect_false (!op->has_active_speed ())) 255 if (expect_false (!op->has_active_speed ()))
… …
317 { 283 {
318 --op->speed_left; 284 --op->speed_left;
319 process_object (op); 285 process_object (op);
320 } 286 }
321 287
322 if (expect_true (!op->contr)) 288 // this will destroy the speed_left value for players, but
289 // process_players1 and ..2 save/restore the real value,
290 // so we can avoid a costly test here.
323 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 291 op->speed_left = min (op->speed, op->speed_left + op->speed);
324 } 292 }
325 293
326 process_players2 (); 294 process_players2 ();
327} 295}
328 296
329/* clean up everything before exiting */ 297/* clean up everything before exiting */
330void 298void
331emergency_save () 299emergency_save ()
332{ 300{
333 LOG (llevDebug, "emergency save begin.\n"); 301 LOG (llevInfo, "emergency_save: enter\n");
302
303 LOG (llevInfo, "emergency_save: saving book archive\n");
304 write_book_archive ();
334 305
335 cfperl_emergency_save (); 306 cfperl_emergency_save ();
336 307
337 LOG (llevDebug, "saving book archive.\n");
338 write_book_archive ();
339
340 LOG (llevDebug, "emergency save done.\n"); 308 LOG (llevInfo, "emergency_save: leave\n");
341} 309}
342 310
343// send all clients some informational text 311// send all clients some informational text
344static void 312static void
345cleanup_inform (const char *cause, bool make_core) 313cleanup_inform (const char *cause, bool make_core)
… …
364cleanup (const char *cause, bool make_core) 332cleanup (const char *cause, bool make_core)
365{ 333{
366 if (make_core) 334 if (make_core)
367 fork_abort (cause); 335 fork_abort (cause);
368 336
369 LOG (llevError, "cleanup cause: %s\n", cause); 337 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
370 338
371 if (!make_core) 339 if (!make_core)
372 cleanup_inform (cause, make_core); 340 cleanup_inform (cause, make_core);
373 341
374 LOG (llevDebug, "cleanup begin.\n"); 342 LOG (llevDebug, "cleanup begin.\n");
… …
412 * done on the same tick, but that will happen very infrequently 380 * done on the same tick, but that will happen very infrequently
413 * 381 *
414 * I also think this code makes it easier to see how often we really are 382 * I also think this code makes it easier to see how often we really are
415 * doing the various things. 383 * doing the various things.
416 */ 384 */
417void 385static void
418do_specials (void) 386do_specials ()
419{ 387{
420 shstr::gc (); 388 shstr::gc ();
421 archetype::gc (); 389 archetype::gc ();
422 390
423 if (expect_false (!(pticks % TICKS_PER_HOUR))) 391 if (expect_false (!(pticks % TICKS_PER_HOUR)))
424 adjust_daylight (); 392 maptile::adjust_daylight ();
425 393
426 if (expect_false (!(pticks % 2503))) 394 if (expect_false (!(pticks % 2503)))
427 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 395 fix_weight (); /* Hack to fix weightproblems caused by bugs */
428 396
429 if (expect_false (!(pticks % 5003))) 397 if (expect_false (!(pticks % 5003)))
… …
450 // then do some bookkeeping, should not really be here 418 // then do some bookkeeping, should not really be here
451 do_specials (); /* Routines called from time to time. */ 419 do_specials (); /* Routines called from time to time. */
452 attachable::check_mortals (); 420 attachable::check_mortals ();
453 421
454 ++pticks; 422 ++pticks;
455}
456 423
457#if 0 424 if (object::object_count >= RESTART_COUNT)
458// used fro benchmarking (x86/amd64-specific) 425 cleanup ("running out of protocol ID values - need full restart");
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} 426}
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 427
586// normal main 428// normal main
587int 429int
588main (int argc, char **argv) 430main (int argc, char **argv)
589{ 431{
590 settings.argc = argc; 432 settings.argc = argc;
591 settings.argv = argv; 433 settings.argv = argv;
592 434
435 rndm.seed (time (0));
593 g_thread_init (0); // for the slice allocator only 436 g_thread_init (0); // for the slice allocator only
594 437
438 // temporary(?) testing hack
439 if (argc >= 2 && !strcmp (argv [1], "--noise"))
440 {
441 void noise_test ();
442 noise_test ();
443 exit (0);
444 }
445
446#if 0
447 // code sometiems used for timing benchmarks
448 random_number_generator<freeciv_random_generator> rng;
449 rng.seed(0);
450 for (int i = 0; i < 10; ++i)
451 printf ("%08x\n", rng.get_u32());
452 for (int i = 0; i < 1000000; ++i)
453 volatile int r = rng.get_u32 ();
454 cstamp s = stamp ();
455 for (int i = 0; i < 1000000; ++i)
456 volatile int r = rng.next ();
457 printf ("c %d\n", (int)measure (s));
458 exit (0);
459#endif
460
595 init (argc, argv); 461 init (argc, argv);
596 462
597 for (;;) 463 for (;;)
598 cfperl_main (); 464 cfperl_main ();
599} 465}
600#endif
601 466
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