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.81 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.104 by root, Thu May 17 14:14:55 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <object.h> 26#include <object.h>
27#include <tod.h> 27#include <tod.h>
28
29#ifdef HAVE_DES_H
30# include <des.h>
31#else
32# ifdef HAVE_CRYPT_H
33# include <crypt.h>
34# endif
35#endif
36 28
37#include <sproto.h> 29#include <sproto.h>
38#include <time.h> 30#include <time.h>
39 31
40#include <../random_maps/random_map.h> 32#include <../random_maps/random_map.h>
… …
55 47
56 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 48 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
57 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 49 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 50 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
59 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); 51 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
52 new_draw_info (NDI_UNIQUE, 0, op, "");
53 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
60 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>"); 54 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>"); 56 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>"); 57 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>"); 58 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
… …
95 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
96 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>"); 90 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
97 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>"); 91 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
100 94 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 97 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
104 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 98 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
105 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
106 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); 100 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, "");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
108} 103}
109 104
110/* 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
111 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
… …
152 147
153 if (contr && map != newmap && map) 148 if (contr && map != newmap && map)
154 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
155 return; 150 return;
156 151
157 /* If it is a player login, he has yet to be inserted anyplace. 152 // remove, so stupid ob_locked does not trigger a failure
158 * otherwise, we need to deal with removing the player here.
159 */
160 remove (); 153 remove ();
161 154
162 /* try to find a spot for the player */ 155 /* try to find a spot for the player */
163 if (ob_blocked (this, newmap, x, y)) 156 if (ob_blocked (this, newmap, x, y))
164 { /* First choice blocked */ 157 { /* First choice blocked */
… …
201 this->y = y; 194 this->y = y;
202 map = newmap; 195 map = newmap;
203 196
204 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
205 198
206 enemy = NULL; 199 enemy = 0;
207 200
208 if (contr) 201 if (contr)
209 { 202 {
210 contr->maplevel = newmap->path; 203 contr->maplevel = newmap->path;
211 contr->count = 0; 204 contr->count = 0;
212 } 205 }
213 206
214 /* Update any golems */ 207 /* Update any golems */
215 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER)
216 { 209 if (object *golem = contr->golem)
217 int i = find_free_spot (contr->ranges[range_golem], newmap,
218 x, y, 1, SIZEOFFREE);
219
220 contr->ranges[range_golem]->remove ();
221
222 if (i == -1)
223 { 210 {
224 remove_friendly_object (contr->ranges[range_golem]); 211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
225 contr->ranges[range_golem]->destroy (); 212
226 contr->ranges[range_golem] = 0; 213 if (i < 0)
227 } 214 golem->destroy ();
228 else 215 else
229 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
231 { 216 {
232 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x); 217 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
233 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y); 218 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
234 tmp->map = newmap;
235 } 219 }
236
237 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
238 contr->ranges[range_golem]->direction =
239 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
240 } 220 }
241 }
242 221
243 /* since the players map is already loaded, we don't need to worry 222 /* since the players map is already loaded, we don't need to worry
244 * about pending objects. 223 * about pending objects.
245 */ 224 */
246 remove_all_pets (newmap); 225 remove_all_pets (newmap);
… …
254 * is needed after the players have been updated. 233 * is needed after the players have been updated.
255 */ 234 */
256static void 235static void
257process_players1 () 236process_players1 ()
258{ 237{
259 int flag;
260
261 /* Basically, we keep looping until all the players have done their actions. */ 238 /* Basically, we keep looping until all the players have done their actions. */
262 for (flag = 1; flag != 0;) 239 for (int flag = 1; flag != 0;)
263 { 240 {
264 flag = 0; 241 flag = 0;
265 for_all_players (pl) 242 for_all_players (pl)
266 { 243 {
267 pl->refcnt_chk (); 244 pl->refcnt_chk ();
268 245
269 if (!pl->ob || !pl->ns || !pl->ob->active) 246 if (!pl->ob || !pl->ns || !pl->ob->active)
270 continue; 247 continue;
271 248
272 if (pl->ob->speed_left > 0) 249 if (pl->ob->speed_left > 0.f && pl->ns)
273 if (handle_newcs_player (pl->ob)) 250 if (handle_newcs_player (pl->ob))
274 flag = 1; 251 flag = 1;
275 252
276 /* If the player is not actively playing, don't make a 253 /* If the player is not actively playing, don't make a
277 * backup save - nothing to save anyway. Plus, the 254 * backup save - nothing to save anyway. Plus, the
… …
284 } /* end of for loop for all the players */ 261 } /* end of for loop for all the players */
285 } /* for flag */ 262 } /* for flag */
286 263
287 for_all_players (pl) 264 for_all_players (pl)
288 { 265 {
266 object *ob = pl->ob;
267
289 if (!pl->ob || !pl->ns || !pl->ob->active) 268 if (!ob || !pl->ns || !ob->active)
290 continue; 269 continue;
291 270
292 if (settings.casting_time) 271 // process_events might steal us one speed slot, so adjust accordingly
293 { 272 if (ob->speed_left > 0.f)
294 if (pl->ob->casting_time > 0) 273 ++ob->speed_left;
295 {
296 pl->ob->casting_time--;
297 pl->ob->start_holding = 1;
298 }
299 274
300 /* set spell_state so we can update the range in stats field */
301 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
302 pl->ob->start_holding = 0;
303 }
304
305 do_some_living (pl->ob); 275 do_some_living (ob);
306 } 276 }
307} 277}
308 278
309static void 279static void
310process_players2 () 280process_players2 ()
311{ 281{
312 /* Then check if any players should use weapon-speed instead of speed */ 282 /* Then check if any players should use weapon-speed instead of speed */
313 for_all_players (pl) 283 for_all_players (pl)
314 { 284 {
315 /* The code that did weapon_sp handling here was out of place -
316 * this isn't called until after the player has finished there
317 * actions, and is thus out of place. All we do here is bounds
318 * checking.
319 */
320 if (pl->has_hit) 285 if (pl->has_hit)
321 { 286 {
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288
322 if (pl->ob->speed_left > pl->weapon_sp) 289 if (pl->ob->speed_left > 0.f)
323 pl->ob->speed_left = pl->weapon_sp;
324
325 /* This needs to be here - if the player is running, we need to
326 * clear this each tick, but new commands are not being received
327 * so execute_newserver_command() is never called
328 */
329 pl->has_hit = 0; 290 pl->has_hit = 0;
330 } 291 }
331 else if (pl->ob->speed_left > pl->ob->speed) 292 else
332 pl->ob->speed_left = pl->ob->speed; 293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
333 } 294 }
334} 295}
335 296
336void 297void
337process_events () 298process_events ()
… …
343 /* Now process op */ 304 /* Now process op */
344 if (QUERY_FLAG (op, FLAG_FREED)) 305 if (QUERY_FLAG (op, FLAG_FREED))
345 { 306 {
346 LOG (llevError, "BUG: process_events(): Free object on list\n"); 307 LOG (llevError, "BUG: process_events(): Free object on list\n");
347 op->set_speed (0); 308 op->set_speed (0);
348 continue;
349 }
350
351 /* I've seen occasional crashes due to this - the object is removed,
352 * and thus the map it points to (last map it was on) may be bogus
353 * The real bug is to try to find out the cause of this - someone
354 * is probably calling remove_ob without either an insert_ob or
355 * free_object afterwards, leaving an object dangling. But I'd
356 * rather log this and continue on instead of crashing.
357 * Don't remove players - when a player quits, the object is in
358 * sort of a limbo, of removed, but something we want to keep
359 * around.
360 */
361 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
362 {
363 LOG (llevError, "BUG: process_events(): Removed object on list\n");
364 char *dump = dump_object (op);
365 LOG (llevError, dump);
366 free (dump);
367 op->destroy ();
368 continue; 309 continue;
369 } 310 }
370 311
371 if (!op->has_active_speed ()) 312 if (!op->has_active_speed ())
372 { 313 {
… …
374 "but is on active list\n", op->debug_desc (), op->speed); 315 "but is on active list\n", op->debug_desc (), op->speed);
375 op->set_speed (0); 316 op->set_speed (0);
376 continue; 317 continue;
377 } 318 }
378 319
379 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 320 if (op->flag [FLAG_REMOVED])
380 { 321 {
381 LOG (llevError, "BUG: process_events(): Object without map or " 322 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
382 "inventory is on active list: %s (%d)\n", &op->name, op->count); 323 op->debug_desc ());
383 op->set_speed (0); 324 op->set_speed (0);
384 continue; 325 continue;
385 } 326 }
386 327
387 /* Animate the object. Bug or feature that anim_speed 328 /* Animate the object. Bug or feature that anim_speed
388 * is based on ticks, and not the creatures speed? 329 * is based on ticks, and not the creatures speed?
389 */ 330 */
390 if (op->anim_speed && op->last_anim >= op->anim_speed) 331 if (op->anim_speed && op->last_anim >= op->anim_speed)
391 { 332 {
392 if ((op->type == PLAYER))
393 animate_object (op, op->facing);
394 else
395 animate_object (op, op->direction); 333 animate_object (op, op->contr ? op->facing : op->direction);
396
397 op->last_anim = 1; 334 op->last_anim = 1;
398 } 335 }
399 else 336 else
400 op->last_anim++; 337 ++op->last_anim;
401 338
402 if (op->speed_left > 0) 339 if (op->speed_left > 0.f)
403 {
404#if 0
405 /* I've seen occasional crashes in move_symptom() with it
406 * crashing because op is removed - add some debugging to
407 * track if it is removed at this point.
408 * This unfortunately is a bit too verbose it seems - not sure
409 * why - I think what happens is a map is freed or something and
410 * some objects get 'lost' - removed never to be reclaimed.
411 * removed objects generally shouldn't exist.
412 */
413 if (QUERY_FLAG (op, FLAG_REMOVED))
414 { 340 {
415 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
416 }
417#endif
418 --op->speed_left; 341 --op->speed_left;
419 process_object (op); 342 process_object (op);
420 343
421 if (op->destroyed ()) 344 if (op->destroyed ())
422 continue; 345 continue;
423 } 346 }
424 347
425 if (settings.casting_time == TRUE && op->casting_time > 0) 348 if (!op->contr)
426 op->casting_time--; 349 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
427
428 if (op->speed_left <= 0)
429 op->speed_left += FABS (op->speed);
430 } 350 }
431 351
432 process_players2 (); 352 process_players2 ();
433} 353}
434 354
… …
436void 356void
437emergency_save () 357emergency_save ()
438{ 358{
439 LOG (llevDebug, "emergency save begin.\n"); 359 LOG (llevDebug, "emergency save begin.\n");
440 360
441 maptile::emergency_save (); 361 cfperl_emergency_save ();
442 362
443 LOG (llevDebug, "saving book archive.\n"); 363 LOG (llevDebug, "saving book archive.\n");
444 write_book_archive (); 364 write_book_archive ();
445 365
446 LOG (llevDebug, "emergency save done.\n"); 366 LOG (llevDebug, "emergency save done.\n");
… …
448 368
449// send all clients some informational text 369// send all clients some informational text
450static void 370static void
451cleanup_inform (const char *cause, bool make_core) 371cleanup_inform (const char *cause, bool make_core)
452{ 372{
373 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
374
453 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "The server will now shutdown.\n"); 375 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
454 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "Cause for this shtudown: %s\n", cause); 376 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
455 377
456 if (make_core) 378 if (make_core)
457 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered a crash.\n"); 379 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
458 else 380 else
459 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered to be a clean shutdown.\n"); 381 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");
460 382
461 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "%s\n", CLEANUP_MESSAGE); 383 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
462 384
463 flush_sockets (); 385 flush_sockets ();
464} 386}
465 387
466/* clean up everything before exiting */ 388/* clean up everything before exiting */
467void 389void
468cleanup (const char *cause, bool make_core) 390cleanup (const char *cause, bool make_core)
469{ 391{
392 if (make_core)
393 fork_abort (cause);
394
470 LOG (llevError, "cleanup cause: %s\n", cause); 395 LOG (llevError, "cleanup cause: %s\n", cause);
471 396
472 if (!make_core) 397 if (!make_core)
473 cleanup_inform (cause, make_core); 398 cleanup_inform (cause, make_core);
474 399
… …
488 LOG (llevDebug, "cleanup done.\n"); 413 LOG (llevDebug, "cleanup done.\n");
489 414
490 if (make_core) 415 if (make_core)
491 { 416 {
492 cleanup_inform (cause, make_core); 417 cleanup_inform (cause, make_core);
493 abort (); 418 cfperl_cleanup (make_core);
419 _exit (1);
494 } 420 }
495 else 421 else
422 {
423 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
424 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
425 flush_sockets ();
426 cfperl_cleanup (make_core);
496 _exit (0); 427 _exit (0);
428 }
497} 429}
498 430
499int 431int
500forbid_play (void) 432forbid_play (void)
501{ 433{
… …
557 * done on the same tick, but that will happen very infrequently 489 * done on the same tick, but that will happen very infrequently
558 * 490 *
559 * I also think this code makes it easier to see how often we really are 491 * I also think this code makes it easier to see how often we really are
560 * doing the various things. 492 * doing the various things.
561 */ 493 */
562
563extern unsigned long todtick;
564
565void 494void
566do_specials (void) 495do_specials (void)
567{ 496{
568 if (!(pticks % PTICKS_PER_CLOCK)) 497 if (!(pticks % TICKS_PER_HOUR))
569 tick_the_clock (); 498 adjust_daylight ();
570 499
571 if (!(pticks % 7)) 500 if (!(pticks % 7))
572 shstr::gc (); 501 shstr::gc ();
573 502
574 if (!(pticks % 2503)) 503 if (!(pticks % 2503))
… …
601 attachable::check_mortals (); 530 attachable::check_mortals ();
602 531
603 ++pticks; 532 ++pticks;
604} 533}
605 534
535#if 0
536// used fro benchmarking (x86/amd64-specific)
537typedef unsigned long tval;
538typedef unsigned long long stamp64;
539
540extern inline tval
541stamp (void)
542{
543 tval tsc;
544 asm volatile ("rdtsc":"=a" (tsc)::"edx");
545
546 return tsc;
547}
548
549extern inline tval
550measure (tval t)
551{
552 tval tsc;
553 asm volatile ("rdtsc":"=a" (tsc)::"edx");
554
555 if (tsc > t)
556 return tsc - t;
557 else
558 return t - tsc;
559}
560
606int 561int
607main (int argc, char **argv) 562main (int argc, char **argv)
608{ 563{
564 rand_gen rg(0);
565 tval fastest = 0x7fffffff;
566 for (int loop = 10000; loop--; )
567 {
568 tval s = stamp ();
569 volatile int i = rg.get_int(25);
570 fastest = min (fastest, measure (s));
571 }
572
573 //printf ("fastest %d\n", fastest);
574 for (int i = 0; i < 1024*1024*3; ++i)
575 {
576 char c = rg.get_int (256);
577 write (2, &c, 1);
578 }
579}
580
581#else
582
583// normal main
584int
585main (int argc, char **argv)
586{
609 settings.argc = argc; 587 settings.argc = argc;
610 settings.argv = argv; 588 settings.argv = argv;
611 589
612 init (argc, argv); 590 init (argc, argv);
613 591
614 initPlugins (); 592 initPlugins ();
615 593
616 for (;;) 594 for (;;)
617 cfperl_main (); 595 cfperl_main ();
618} 596}
597#endif
619 598

Diff Legend

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