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.82 by root, Tue Jan 9 01:28:32 2007 UTC vs.
Revision 1.113 by root, Mon Jul 30 02:03:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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. 20 *
21
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
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#ifdef HAVE_DES_H
30# include <des.h>
31#else
32# ifdef HAVE_CRYPT_H
33# include <crypt.h>
34# endif
35#endif
36
37#include <sproto.h> 28#include <sproto.h>
38#include <time.h> 29#include <time.h>
39 30
40#include <../random_maps/random_map.h> 31#include <../random_maps/random_map.h>
41#include <../random_maps/rproto.h> 32#include <../random_maps/rproto.h>
… …
46}; 37};
47 38
48void 39void
49version (object *op) 40version (object *op)
50{ 41{
51 if (op)
52 clear_win_info (op);
53
54 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
55 43
56 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 44 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>"); 45 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>"); 46 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>"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
48 new_draw_info (NDI_UNIQUE, 0, op, "");
49 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>"); 50 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>"); 51 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>"); 52 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>"); 53 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>"); 54 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>"); 85 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>"); 86 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>"); 87 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>"); 88 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"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
100 90 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 91 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 93 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>"); 94 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>"); 95 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>"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
97 new_draw_info (NDI_UNIQUE, 0, op, "");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 98 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
108} 99}
109 100
110/* This is a basic little function to put the player back to his 101/* This is a basic little function to put the player back to his
111 * savebed. We do some error checking - its possible that the 102 * savebed. We do some error checking - its possible that the
… …
208 contr->maplevel = newmap->path; 199 contr->maplevel = newmap->path;
209 contr->count = 0; 200 contr->count = 0;
210 } 201 }
211 202
212 /* Update any golems */ 203 /* Update any golems */
213 if (type == PLAYER && contr->ranges[range_golem]) 204 if (type == PLAYER)
214 { 205 if (object *golem = contr->golem)
215 int i = find_free_spot (contr->ranges[range_golem], newmap,
216 x, y, 1, SIZEOFFREE);
217
218 if (i == -1)
219 { 206 {
220 contr->ranges[range_golem]->destroy (); 207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
221 contr->ranges[range_golem] = 0; 208
222 } 209 if (i < 0)
210 golem->destroy ();
223 else 211 else
224 {
225 for (object *tmp = contr->ranges[range_golem]; tmp; tmp = tmp->more)
226 { 212 {
227 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x); 213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
228 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y); 214 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
229 tmp->map = newmap;
230 } 215 }
231
232 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
233 contr->ranges[range_golem]->direction =
234 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
235 } 216 }
236 }
237 217
238 /* since the players map is already loaded, we don't need to worry 218 /* since the players map is already loaded, we don't need to worry
239 * about pending objects. 219 * about pending objects.
240 */ 220 */
241 remove_all_pets (newmap); 221 remove_all_pets (newmap);
… …
249 * is needed after the players have been updated. 229 * is needed after the players have been updated.
250 */ 230 */
251static void 231static void
252process_players1 () 232process_players1 ()
253{ 233{
254 int flag;
255
256 /* Basically, we keep looping until all the players have done their actions. */ 234 /* Basically, we keep looping until all the players have done their actions. */
257 for (flag = 1; flag != 0;) 235 for (int flag = 1; flag != 0;)
258 { 236 {
259 flag = 0; 237 flag = 0;
260 for_all_players (pl) 238 for_all_players (pl)
261 { 239 {
262 pl->refcnt_chk (); 240 pl->refcnt_chk ();
263 241
264 if (!pl->ob || !pl->ns || !pl->ob->active) 242 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
265 continue; 243 continue;
266 244
267 if (pl->ob->speed_left > 0)
268 if (handle_newcs_player (pl->ob)) 245 if (handle_newcs_player (pl->ob))
269 flag = 1; 246 flag = 1;
270 247 }
271 /* If the player is not actively playing, don't make a 248 }
272 * backup save - nothing to save anyway. Plus, the
273 * map may not longer be valid. This can happen when the
274 * player quits - they exist for purposes of tracking on the map,
275 * but don't actually reside on any actual map.
276 */
277 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
278 continue;
279 } /* end of for loop for all the players */
280 } /* for flag */
281 249
282 for_all_players (pl) 250 for_all_players (pl)
283 { 251 {
252 object *ob = pl->ob;
253
284 if (!pl->ob || !pl->ns || !pl->ob->active) 254 if (expect_false (!ob || !pl->ns || !ob->active))
285 continue; 255 continue;
286 256
287 if (settings.casting_time)
288 {
289 if (pl->ob->casting_time > 0)
290 {
291 pl->ob->casting_time--;
292 pl->ob->start_holding = 1;
293 }
294
295 /* set spell_state so we can update the range in stats field */
296 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
297 pl->ob->start_holding = 0;
298 }
299
300 do_some_living (pl->ob); 257 do_some_living (ob);
301 } 258 }
302} 259}
303 260
304static void 261static void
305process_players2 () 262process_players2 ()
306{ 263{
307 /* Then check if any players should use weapon-speed instead of speed */ 264 /* Then check if any players should use weapon-speed instead of speed */
308 for_all_players (pl) 265 for_all_players (pl)
309 { 266 {
310 /* The code that did weapon_sp handling here was out of place - 267 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
311 * this isn't called until after the player has finished there 268 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
312 * actions, and is thus out of place. All we do here is bounds
313 * checking.
314 */
315 if (pl->has_hit)
316 {
317 if (pl->ob->speed_left > pl->weapon_sp)
318 pl->ob->speed_left = pl->weapon_sp;
319
320 /* This needs to be here - if the player is running, we need to
321 * clear this each tick, but new commands are not being received
322 * so execute_newserver_command() is never called
323 */
324 pl->has_hit = 0;
325 }
326 else if (pl->ob->speed_left > pl->ob->speed)
327 pl->ob->speed_left = pl->ob->speed;
328 } 269 }
329} 270}
330 271
331void 272void
332process_events () 273process_events ()
… …
334 process_players1 (); 275 process_players1 ();
335 276
336 for_all_actives (op) 277 for_all_actives (op)
337 { 278 {
338 /* Now process op */ 279 /* Now process op */
339 if (QUERY_FLAG (op, FLAG_FREED)) 280 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
340 { 281 {
341 LOG (llevError, "BUG: process_events(): Free object on list\n"); 282 LOG (llevError, "BUG: process_events(): Free object on list\n");
342 op->set_speed (0); 283 op->set_speed (0);
343 continue; 284 continue;
344 } 285 }
345 286
346 /* I've seen occasional crashes due to this - the object is removed,
347 * and thus the map it points to (last map it was on) may be bogus
348 * The real bug is to try to find out the cause of this - someone
349 * is probably calling remove_ob without either an insert_ob or
350 * free_object afterwards, leaving an object dangling. But I'd
351 * rather log this and continue on instead of crashing.
352 * Don't remove players - when a player quits, the object is in
353 * sort of a limbo, of removed, but something we want to keep
354 * around.
355 */
356 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
357 {
358 LOG (llevError, "BUG: process_events(): Removed object on list\n");
359 char *dump = dump_object (op);
360 LOG (llevError, dump);
361 free (dump);
362 op->destroy ();
363 continue;
364 }
365
366 if (!op->has_active_speed ()) 287 if (expect_false (!op->has_active_speed ()))
367 { 288 {
368 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 289 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
369 "but is on active list\n", op->debug_desc (), op->speed); 290 "but is on active list\n", op->debug_desc (), op->speed);
370 op->set_speed (0); 291 op->set_speed (0);
371 continue; 292 continue;
372 } 293 }
373 294
374 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 295 if (expect_false (op->flag [FLAG_REMOVED]))
375 { 296 {
376 LOG (llevError, "BUG: process_events(): Object without map or " 297 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
377 "inventory is on active list: %s (%d)\n", &op->name, op->count); 298 op->debug_desc ());
378 op->set_speed (0); 299 op->set_speed (0);
379 continue; 300 continue;
380 } 301 }
381 302
382 /* Animate the object. Bug or feature that anim_speed 303 /* Animate the object. Bug or feature that anim_speed
383 * is based on ticks, and not the creatures speed? 304 * is based on ticks, and not the creatures speed?
384 */ 305 */
385 if (op->anim_speed && op->last_anim >= op->anim_speed) 306 if (op->anim_speed && op->last_anim >= op->anim_speed)
386 { 307 {
387 if ((op->type == PLAYER))
388 animate_object (op, op->facing);
389 else
390 animate_object (op, op->direction); 308 animate_object (op, op->contr ? op->facing : op->direction);
391
392 op->last_anim = 1; 309 op->last_anim = 1;
393 } 310 }
394 else 311 else
395 op->last_anim++; 312 ++op->last_anim;
396 313
397 if (op->speed_left > 0) 314 if (op->speed_left > 0.f)
398 {
399#if 0
400 /* I've seen occasional crashes in move_symptom() with it
401 * crashing because op is removed - add some debugging to
402 * track if it is removed at this point.
403 * This unfortunately is a bit too verbose it seems - not sure
404 * why - I think what happens is a map is freed or something and
405 * some objects get 'lost' - removed never to be reclaimed.
406 * removed objects generally shouldn't exist.
407 */
408 if (QUERY_FLAG (op, FLAG_REMOVED))
409 { 315 {
410 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
411 }
412#endif
413 --op->speed_left; 316 --op->speed_left;
414 process_object (op); 317 process_object (op);
415 318
416 if (op->destroyed ()) 319 if (op->destroyed ())
417 continue; 320 continue;
418 } 321 }
419 322
420 if (settings.casting_time == TRUE && op->casting_time > 0) 323 if (!op->contr)
421 op->casting_time--; 324 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
422
423 if (op->speed_left <= 0)
424 op->speed_left += FABS (op->speed);
425 } 325 }
426 326
427 process_players2 (); 327 process_players2 ();
428} 328}
429 329
… …
431void 331void
432emergency_save () 332emergency_save ()
433{ 333{
434 LOG (llevDebug, "emergency save begin.\n"); 334 LOG (llevDebug, "emergency save begin.\n");
435 335
436 maptile::emergency_save (); 336 cfperl_emergency_save ();
437 337
438 LOG (llevDebug, "saving book archive.\n"); 338 LOG (llevDebug, "saving book archive.\n");
439 write_book_archive (); 339 write_book_archive ();
440 340
441 LOG (llevDebug, "emergency save done.\n"); 341 LOG (llevDebug, "emergency save done.\n");
… …
443 343
444// send all clients some informational text 344// send all clients some informational text
445static void 345static void
446cleanup_inform (const char *cause, bool make_core) 346cleanup_inform (const char *cause, bool make_core)
447{ 347{
348 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
349
448 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "The server will now shutdown.\n"); 350 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
449 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "Cause for this shtudown: %s\n", cause); 351 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
450 352
451 if (make_core) 353 if (make_core)
452 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered a crash.\n"); 354 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
453 else 355 else
454 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "This is considered to be a clean shutdown.\n"); 356 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
455 357
456 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 0, 0, "%s\n", CLEANUP_MESSAGE); 358 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
457 359
458 flush_sockets (); 360 client::flush_sockets ();
459} 361}
460 362
461/* clean up everything before exiting */ 363/* clean up everything before exiting */
462void 364void
463cleanup (const char *cause, bool make_core) 365cleanup (const char *cause, bool make_core)
464{ 366{
367 if (make_core)
368 fork_abort (cause);
369
465 LOG (llevError, "cleanup cause: %s\n", cause); 370 LOG (llevError, "cleanup cause: %s\n", cause);
466 371
467 if (!make_core) 372 if (!make_core)
468 cleanup_inform (cause, make_core); 373 cleanup_inform (cause, make_core);
469 374
… …
483 LOG (llevDebug, "cleanup done.\n"); 388 LOG (llevDebug, "cleanup done.\n");
484 389
485 if (make_core) 390 if (make_core)
486 { 391 {
487 cleanup_inform (cause, make_core); 392 cleanup_inform (cause, make_core);
488 abort (); 393 cfperl_cleanup (make_core);
394 _exit (1);
489 } 395 }
490 else 396 else
397 {
398 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
400 client::flush_sockets ();
401 cfperl_cleanup (make_core);
491 _exit (0); 402 _exit (0);
403 }
492} 404}
493 405
494int 406int
495forbid_play (void) 407forbid_play (void)
496{ 408{
… …
552 * done on the same tick, but that will happen very infrequently 464 * done on the same tick, but that will happen very infrequently
553 * 465 *
554 * I also think this code makes it easier to see how often we really are 466 * I also think this code makes it easier to see how often we really are
555 * doing the various things. 467 * doing the various things.
556 */ 468 */
557
558extern unsigned long todtick;
559
560void 469void
561do_specials (void) 470do_specials (void)
562{ 471{
563 if (!(pticks % PTICKS_PER_CLOCK)) 472 if (expect_false (!(pticks % TICKS_PER_HOUR)))
564 tick_the_clock (); 473 adjust_daylight ();
565 474
566 if (!(pticks % 7)) 475 if (expect_false (!(pticks % 7)))
567 shstr::gc (); 476 shstr::gc ();
568 477
569 if (!(pticks % 2503)) 478 if (expect_false (!(pticks % 2503)))
570 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 479 fix_weight (); /* Hack to fix weightproblems caused by bugs */
571 480
572 if (!(pticks % 5003)) 481 if (expect_false (!(pticks % 5003)))
573 write_book_archive (); 482 write_book_archive ();
574 483
575 if (!(pticks % 5009)) 484 if (expect_false (!(pticks % 5009)))
576 clean_friendly_list (); 485 clean_friendly_list ();
577 486
578 if (!(pticks % 5011)) 487 if (expect_false (!(pticks % 5011)))
579 obsolete_parties (); 488 obsolete_parties ();
580 489
581 if (!(pticks % 12503)) 490 if (expect_false (!(pticks % 12503)))
582 fix_luck (); 491 fix_luck ();
583} 492}
584 493
585void 494void
586server_tick () 495server_tick ()
587{ 496{
588 // first do the user visible stuff 497 // first do the user visible stuff
589 doeric_server ();
590 INVOKE_GLOBAL (CLOCK); 498 INVOKE_GLOBAL (CLOCK);
591 process_events (); /* "do" something with objects with speed */ 499 process_events (); // "do" something with objects with speed
592 flush_sockets (); 500 client::clock (); // draw client maps etc.
593 501
594 // then do some bookkeeping, should not really be here 502 // then do some bookkeeping, should not really be here
595 do_specials (); /* Routines called from time to time. */ 503 do_specials (); /* Routines called from time to time. */
596 attachable::check_mortals (); 504 attachable::check_mortals ();
597 505
598 ++pticks; 506 ++pticks;
599} 507}
600 508
509#if 0
510// used fro benchmarking (x86/amd64-specific)
511typedef unsigned long tval;
512typedef unsigned long long stamp64;
513
514extern inline tval
515stamp (void)
516{
517 tval tsc;
518 asm volatile ("rdtsc":"=a" (tsc)::"edx");
519
520 return tsc;
521}
522
523extern inline tval
524measure (tval t)
525{
526 tval tsc;
527 asm volatile ("rdtsc":"=a" (tsc)::"edx");
528
529 if (tsc > t)
530 return tsc - t;
531 else
532 return t - tsc;
533}
534
601int 535int
602main (int argc, char **argv) 536main (int argc, char **argv)
603{ 537{
538 rand_gen rg(0);
539 tval fastest = 0x7fffffff;
540 for (int loop = 10000; loop--; )
541 {
542 tval s = stamp ();
543 volatile int i = rg.get_int(25);
544 fastest = min (fastest, measure (s));
545 }
546
547 //printf ("fastest %d\n", fastest);
548 for (int i = 0; i < 1024*1024*3; ++i)
549 {
550 char c = rg.get_int (256);
551 write (2, &c, 1);
552 }
553}
554
555#else
556
557// normal main
558int
559main (int argc, char **argv)
560{
604 settings.argc = argc; 561 settings.argc = argc;
605 settings.argv = argv; 562 settings.argv = argv;
606 563
607 init (argc, argv); 564 init (argc, argv);
608 565
609 initPlugins (); 566 initPlugins ();
610 567
611 for (;;) 568 for (;;)
612 cfperl_main (); 569 cfperl_main ();
613} 570}
571#endif
614 572

Diff Legend

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