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.80 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.97 by root, Sat Apr 21 22:57:16 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 && contr->ranges[range_golem])
216 { 209 {
217 int i = find_free_spot (contr->ranges[range_golem], newmap, 210 int i = find_free_spot (contr->ranges[range_golem], newmap, x, y, 1, SIZEOFFREE);
218 x, y, 1, SIZEOFFREE);
219 211
220 contr->ranges[range_golem]->remove ();
221
222 if (i == -1) 212 if (i < 0)
223 { 213 {
224 remove_friendly_object (contr->ranges[range_golem]);
225 contr->ranges[range_golem]->destroy (); 214 contr->ranges[range_golem]->destroy ();
226 contr->ranges[range_golem] = 0; 215 contr->ranges[range_golem] = 0;
227 } 216 }
228 else 217 else
229 { 218 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]);
231 {
232 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x);
233 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y);
234 tmp->map = newmap;
235 }
236 220
237 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
238 contr->ranges[range_golem]->direction = 221 contr->ranges[range_golem]->direction =
239 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); 222 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
240 } 223 }
241 } 224 }
242 225
… …
254 * is needed after the players have been updated. 237 * is needed after the players have been updated.
255 */ 238 */
256static void 239static void
257process_players1 () 240process_players1 ()
258{ 241{
259 int flag;
260
261 /* Basically, we keep looping until all the players have done their actions. */ 242 /* Basically, we keep looping until all the players have done their actions. */
262 for (flag = 1; flag != 0;) 243 for (int flag = 1; flag != 0;)
263 { 244 {
264 flag = 0; 245 flag = 0;
265 for_all_players (pl) 246 for_all_players (pl)
266 { 247 {
267 pl->refcnt_chk (); 248 pl->refcnt_chk ();
268 249
269 if (!pl->ob || !pl->ns || !pl->ob->active ()) 250 if (!pl->ob || !pl->ns || !pl->ob->active)
270 continue; 251 continue;
271 252
272 if (pl->ob->speed_left > 0) 253 if (pl->ob->speed_left > 0 && pl->ns)
273 if (handle_newcs_player (pl->ob)) 254 if (handle_newcs_player (pl->ob))
274 flag = 1; 255 flag = 1;
275 256
276 /* If the player is not actively playing, don't make a 257 /* If the player is not actively playing, don't make a
277 * backup save - nothing to save anyway. Plus, the 258 * backup save - nothing to save anyway. Plus, the
… …
279 * player quits - they exist for purposes of tracking on the map, 260 * player quits - they exist for purposes of tracking on the map,
280 * but don't actually reside on any actual map. 261 * but don't actually reside on any actual map.
281 */ 262 */
282 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 263 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
283 continue; 264 continue;
284
285#ifdef AUTOSAVE
286 /* check for ST_PLAYING state so that we don't try to save off when
287 * the player is logging in.
288 */
289 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
290 {
291 pl->ob->contr->save ();
292 pl->last_save_tick = pticks;
293 }
294#endif
295 } /* end of for loop for all the players */ 265 } /* end of for loop for all the players */
296 } /* for flag */ 266 } /* for flag */
297 267
298 for_all_players (pl) 268 for_all_players (pl)
299 { 269 {
300 if (!pl->ob || !pl->ns || !pl->ob->active ()) 270 if (!pl->ob || !pl->ns || !pl->ob->active)
301 continue; 271 continue;
302 272
303 if (settings.casting_time) 273 if (settings.casting_time)
304 { 274 {
305 if (pl->ob->casting_time > 0) 275 if (pl->ob->casting_time > 0)
… …
345} 315}
346 316
347void 317void
348process_events () 318process_events ()
349{ 319{
350 object *op;
351
352 static object_ptr marker_;
353
354 if (!marker_)
355 marker_ = object::create ();
356
357 object *marker = marker_;
358
359 process_players1 (); 320 process_players1 ();
360 321
361 marker->active_next = active_objects; 322 for_all_actives (op)
362
363 if (marker->active_next)
364 marker->active_next->active_prev = marker;
365
366 marker->active_prev = 0;
367 active_objects = marker;
368
369 while (marker->active_next)
370 { 323 {
371 op = marker->active_next;
372
373 /* Move marker forward - swap op and marker */
374 op->active_prev = marker->active_prev;
375
376 if (op->active_prev)
377 op->active_prev->active_next = op;
378 else
379 active_objects = op;
380
381 marker->active_next = op->active_next;
382
383 if (marker->active_next)
384 marker->active_next->active_prev = marker;
385
386 marker->active_prev = op;
387 op->active_next = marker;
388
389 /* Now process op */ 324 /* Now process op */
390 if (QUERY_FLAG (op, FLAG_FREED)) 325 if (QUERY_FLAG (op, FLAG_FREED))
391 { 326 {
392 LOG (llevError, "BUG: process_events(): Free object on list\n"); 327 LOG (llevError, "BUG: process_events(): Free object on list\n");
393 op->set_speed (0); 328 op->set_speed (0);
394 continue;
395 }
396
397 /* I've seen occasional crashes due to this - the object is removed,
398 * and thus the map it points to (last map it was on) may be bogus
399 * The real bug is to try to find out the cause of this - someone
400 * is probably calling remove_ob without either an insert_ob or
401 * free_object afterwards, leaving an object dangling. But I'd
402 * rather log this and continue on instead of crashing.
403 * Don't remove players - when a player quits, the object is in
404 * sort of a limbo, of removed, but something we want to keep
405 * around.
406 */
407 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
408 {
409 LOG (llevError, "BUG: process_events(): Removed object on list\n");
410 char *dump = dump_object (op);
411 LOG (llevError, dump);
412 free (dump);
413 op->destroy ();
414 continue; 329 continue;
415 } 330 }
416 331
417 if (!op->has_active_speed ()) 332 if (!op->has_active_speed ())
418 { 333 {
… …
420 "but is on active list\n", op->debug_desc (), op->speed); 335 "but is on active list\n", op->debug_desc (), op->speed);
421 op->set_speed (0); 336 op->set_speed (0);
422 continue; 337 continue;
423 } 338 }
424 339
425 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 340 if (op->flag [FLAG_REMOVED])
426 { 341 {
427 LOG (llevError, "BUG: process_events(): Object without map or " 342 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
428 "inventory is on active list: %s (%d)\n", &op->name, op->count); 343 op->debug_desc ());
429 op->set_speed (0); 344 op->set_speed (0);
430 continue; 345 continue;
431 } 346 }
432 347
433 /* Animate the object. Bug or feature that anim_speed 348 /* Animate the object. Bug or feature that anim_speed
434 * is based on ticks, and not the creatures speed? 349 * is based on ticks, and not the creatures speed?
435 */ 350 */
436 if (op->anim_speed && op->last_anim >= op->anim_speed) 351 if (op->anim_speed && op->last_anim >= op->anim_speed)
437 { 352 {
438 if ((op->type == PLAYER)) 353 animate_object (op, op->type == PLAYER ? op->facing : op->direction);
439 animate_object (op, op->facing);
440 else
441 animate_object (op, op->direction);
442 354
443 op->last_anim = 1; 355 op->last_anim = 1;
444 } 356 }
445 else 357 else
446 op->last_anim++; 358 op->last_anim++;
… …
473 385
474 if (op->speed_left <= 0) 386 if (op->speed_left <= 0)
475 op->speed_left += FABS (op->speed); 387 op->speed_left += FABS (op->speed);
476 } 388 }
477 389
478 /* Remove marker object from active list */
479 if (marker->active_prev != NULL)
480 marker->active_prev->active_next = NULL;
481 else
482 active_objects = NULL;
483
484 process_players2 (); 390 process_players2 ();
485} 391}
486 392
487/* clean up everything before exiting */ 393/* clean up everything before exiting */
488void 394void
489emergency_save () 395emergency_save ()
490{ 396{
491 LOG (llevDebug, "emergency save begin.\n"); 397 LOG (llevDebug, "emergency save begin.\n");
492 398
493 LOG (llevDebug, "saving players.\n");
494 for_all_players (pl)
495 if (pl->enable_save && pl->ob && pl->ns)
496 {
497 pl->save (true);
498 pl->enable_save = true;
499 }
500
501// for_all_players (pl)
502// if (pl->ob)
503// pl->ob->remove ();
504
505 LOG (llevDebug, "saving maps.\n");
506 maptile::emergency_save (); 399 cfperl_emergency_save ();
507 400
508 LOG (llevDebug, "saving book archive.\n"); 401 LOG (llevDebug, "saving book archive.\n");
509 write_book_archive (); 402 write_book_archive ();
510 403
511 LOG (llevDebug, "emergency save done.\n"); 404 LOG (llevDebug, "emergency save done.\n");
… …
513 406
514// send all clients some informational text 407// send all clients some informational text
515static void 408static void
516cleanup_inform (const char *cause, bool make_core) 409cleanup_inform (const char *cause, bool make_core)
517{ 410{
411 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
412
518 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "The server will now shutdown.\n"); 413 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
519 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "Cause for this shtudown: %s\n", cause); 414 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
520 415
521 if (make_core) 416 if (make_core)
522 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered a crash.\n"); 417 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
523 else 418 else
524 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered to be a clean shutdown.\n"); 419 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");
525 420
526 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "%s\n", CLEANUP_MESSAGE); 421 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
527 422
528 flush_sockets (); 423 flush_sockets ();
529} 424}
530 425
531/* clean up everything before exiting */ 426/* clean up everything before exiting */
532void 427void
533cleanup (const char *cause, bool make_core) 428cleanup (const char *cause, bool make_core)
534{ 429{
430 if (make_core)
431 fork_abort (cause);
432
535 LOG (llevError, "cleanup cause: %s\n", cause); 433 LOG (llevError, "cleanup cause: %s\n", cause);
536 434
537 if (!make_core) 435 if (!make_core)
538 cleanup_inform (cause, make_core); 436 cleanup_inform (cause, make_core);
539 437
… …
553 LOG (llevDebug, "cleanup done.\n"); 451 LOG (llevDebug, "cleanup done.\n");
554 452
555 if (make_core) 453 if (make_core)
556 { 454 {
557 cleanup_inform (cause, make_core); 455 cleanup_inform (cause, make_core);
558 abort (); 456 cfperl_cleanup (make_core);
457 _exit (1);
559 } 458 }
560 else 459 else
460 {
461 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
462 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
463 flush_sockets ();
464 cfperl_cleanup (make_core);
561 _exit (0); 465 _exit (0);
466 }
562} 467}
563 468
564int 469int
565forbid_play (void) 470forbid_play (void)
566{ 471{
… …
622 * done on the same tick, but that will happen very infrequently 527 * done on the same tick, but that will happen very infrequently
623 * 528 *
624 * I also think this code makes it easier to see how often we really are 529 * I also think this code makes it easier to see how often we really are
625 * doing the various things. 530 * doing the various things.
626 */ 531 */
627
628extern unsigned long todtick;
629
630void 532void
631do_specials (void) 533do_specials (void)
632{ 534{
633 if (!(pticks % PTICKS_PER_CLOCK)) 535 if (!(pticks % TICKS_PER_HOUR))
634 tick_the_clock (); 536 adjust_daylight ();
635 537
636 if (!(pticks % 7)) 538 if (!(pticks % 7))
637 shstr::gc (); 539 shstr::gc ();
638 540
639 if (!(pticks % 2503)) 541 if (!(pticks % 2503))
… …
666 attachable::check_mortals (); 568 attachable::check_mortals ();
667 569
668 ++pticks; 570 ++pticks;
669} 571}
670 572
573#if 0
574// used fro benchmarking (x86/amd64-specific)
575typedef unsigned long tval;
576typedef unsigned long long stamp64;
577
578extern inline tval
579stamp (void)
580{
581 tval tsc;
582 asm volatile ("rdtsc":"=a" (tsc)::"edx");
583
584 return tsc;
585}
586
587extern inline tval
588measure (tval t)
589{
590 tval tsc;
591 asm volatile ("rdtsc":"=a" (tsc)::"edx");
592
593 if (tsc > t)
594 return tsc - t;
595 else
596 return t - tsc;
597}
598
671int 599int
672main (int argc, char **argv) 600main (int argc, char **argv)
673{ 601{
602 rand_gen rg(0);
603 tval fastest = 0x7fffffff;
604 for (int loop = 10000; loop--; )
605 {
606 tval s = stamp ();
607 volatile int i = rg.get_int(25);
608 fastest = min (fastest, measure (s));
609 }
610
611 //printf ("fastest %d\n", fastest);
612 for (int i = 0; i < 1024*1024*3; ++i)
613 {
614 char c = rg.get_int (256);
615 write (2, &c, 1);
616 }
617}
618
619#else
620
621// normal main
622int
623main (int argc, char **argv)
624{
625 rndm.seed(1);
626 for (int i = 0; i < 100; ++i)
627 fprintf (stderr, "%3d %5d\n", i, rndm (10));//D
628 exit(5);
629
674 settings.argc = argc; 630 settings.argc = argc;
675 settings.argv = argv; 631 settings.argv = argv;
676 632
677 init (argc, argv); 633 init (argc, argv);
678 634
679 initPlugins (); 635 initPlugins ();
680 636
681 for (;;) 637 for (;;)
682 cfperl_main (); 638 cfperl_main ();
683} 639}
640#endif
684 641

Diff Legend

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