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.87 by root, Thu Jan 18 19:32:37 2007 UTC vs.
Revision 1.139 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
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 28
29#include <sproto.h> 29#include <sproto.h>
30#include <time.h> 30#include <time.h>
31 31
32#include <glib.h>
33
32#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
33#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
34#include "path.h" 36#include "path.h"
35 37
36static char days[7][4] = { 38static char days[7][4] = {
… …
38}; 40};
39 41
40void 42void
41version (object *op) 43version (object *op)
42{ 44{
43 if (op)
44 clear_win_info (op);
45
46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 45 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
47 46
47#if 0
48 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:");
49 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>");
50 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>");
51 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, ""); 52 new_draw_info (NDI_UNIQUE, 0, op, "");
… …
98 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>");
99 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>");
100 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, ""); 101 new_draw_info (NDI_UNIQUE, 0, op, "");
102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
103#endif
103} 104}
104 105
105/* This is a basic little function to put the player back to his 106/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 107 * savebed. We do some error checking - its possible that the
107 * savebed map may no longer exist, so we make sure the player 108 * savebed map may no longer exist, so we make sure the player
108 * goes someplace. 109 * goes someplace.
109 */ 110 */
110void 111void
111enter_player_savebed (object *op) 112enter_player_savebed (object *op)
112{ 113{
113 object *tmp = object::create (); 114 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
114 EXIT_PATH (tmp) = op->contr->savebed_map;
115 EXIT_X (tmp) = op->contr->bed_x;
116 EXIT_Y (tmp) = op->contr->bed_y;
117 op->enter_exit (tmp);
118 tmp->destroy ();
119} 115}
120 116
121/* 117/*
122 * enter_map(): Moves the player and pets from current map (if any) to 118 * enter_map(): Moves the player and pets from current map (if any) to
123 * new map. map, x, y must be set. map is the map we are moving the 119 * new map. map, x, y must be set. map is the map we are moving the
… …
126 * the function that calls this should figure them out. 122 * the function that calls this should figure them out.
127 */ 123 */
128void 124void
129object::enter_map (maptile *newmap, int x, int y) 125object::enter_map (maptile *newmap, int x, int y)
130{ 126{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 127 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
132 return; 128 return;
133 129
134 if (out_of_map (newmap, x, y)) 130 if (out_of_map (newmap, x, y))
135 { 131 {
136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 132 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
151 147
152 // remove, so stupid ob_locked does not trigger a failure 148 // remove, so stupid ob_locked does not trigger a failure
153 remove (); 149 remove ();
154 150
155 /* try to find a spot for the player */ 151 /* try to find a spot for the player */
156 if (ob_blocked (this, newmap, x, y)) 152 if (blocked (newmap, x, y))
157 { /* First choice blocked */ 153 { /* First choice blocked */
158 /* We try to find a spot for the player, starting closest in. 154 /* We try to find a spot for the player, starting closest in.
159 * We could use find_first_free_spot, but that doesn't randomize it at all, 155 * We could use find_first_free_spot, but that doesn't randomize it at all,
160 * So for example, if the north space is free, you would always end up there even 156 * So for example, if the north space is free, you would always end up there even
161 * if other spaces around are available. 157 * if other spaces around are available.
… …
203 contr->maplevel = newmap->path; 199 contr->maplevel = newmap->path;
204 contr->count = 0; 200 contr->count = 0;
205 } 201 }
206 202
207 /* Update any golems */ 203 /* Update any golems */
208 if (type == PLAYER && contr->ranges[range_golem]) 204 if (type == PLAYER)
205 if (object *golem = contr->golem)
209 { 206 {
210 int i = find_free_spot (contr->ranges[range_golem], newmap, x, y, 1, SIZEOFFREE); 207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
211 208
212 if (i < 0) 209 if (i < 0)
213 { 210 golem->drop_and_destroy ();
214 contr->ranges[range_golem]->destroy ();
215 contr->ranges[range_golem] = 0;
216 }
217 else 211 else
218 { 212 {
219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]); 213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
220 214 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
221 contr->ranges[range_golem]->direction =
222 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
223 } 215 }
224 } 216 }
225 217
226 /* 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
227 * about pending objects. 219 * about pending objects.
228 */ 220 */
229 remove_all_pets (newmap); 221 remove_all_pets (newmap);
… …
237 * is needed after the players have been updated. 229 * is needed after the players have been updated.
238 */ 230 */
239static void 231static void
240process_players1 () 232process_players1 ()
241{ 233{
242 int flag;
243
244 /* 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. */
245 for (flag = 1; flag != 0;) 235 for (int flag = 1; flag != 0;)
246 { 236 {
247 flag = 0; 237 flag = 0;
248 for_all_players (pl) 238 for_all_players (pl)
249 { 239 {
250 pl->refcnt_chk (); 240 pl->refcnt_chk ();
251 241
252 if (!pl->ob || !pl->ns || !pl->ob->active) 242 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
253 continue; 243 continue;
254 244
255 if (pl->ob->speed_left > 0)
256 if (handle_newcs_player (pl->ob)) 245 if (handle_newcs_player (pl->ob))
257 flag = 1; 246 flag = 1;
258 247 }
259 /* If the player is not actively playing, don't make a 248 }
260 * backup save - nothing to save anyway. Plus, the
261 * map may not longer be valid. This can happen when the
262 * player quits - they exist for purposes of tracking on the map,
263 * but don't actually reside on any actual map.
264 */
265 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
266 continue;
267 } /* end of for loop for all the players */
268 } /* for flag */
269 249
270 for_all_players (pl) 250 for_all_players (pl)
271 { 251 {
252 object *ob = pl->ob;
253
272 if (!pl->ob || !pl->ns || !pl->ob->active) 254 if (expect_false (!ob || !pl->ns || !ob->active))
273 continue; 255 continue;
274 256
275 if (settings.casting_time)
276 {
277 if (pl->ob->casting_time > 0)
278 {
279 pl->ob->casting_time--;
280 pl->ob->start_holding = 1;
281 }
282
283 /* set spell_state so we can update the range in stats field */
284 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
285 pl->ob->start_holding = 0;
286 }
287
288 do_some_living (pl->ob); 257 do_some_living (ob);
289 } 258 }
290} 259}
291 260
292static void 261static void
293process_players2 () 262process_players2 ()
294{ 263{
295 /* 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 */
296 for_all_players (pl) 265 for_all_players (pl)
297 { 266 {
298 /* 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);
299 * 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);
300 * actions, and is thus out of place. All we do here is bounds
301 * checking.
302 */
303 if (pl->has_hit)
304 {
305 if (pl->ob->speed_left > pl->weapon_sp)
306 pl->ob->speed_left = pl->weapon_sp;
307
308 /* This needs to be here - if the player is running, we need to
309 * clear this each tick, but new commands are not being received
310 * so execute_newserver_command() is never called
311 */
312 pl->has_hit = 0;
313 }
314 else if (pl->ob->speed_left > pl->ob->speed)
315 pl->ob->speed_left = pl->ob->speed;
316 } 269 }
317} 270}
318 271
319void 272void
320process_events () 273process_events ()
… …
322 process_players1 (); 275 process_players1 ();
323 276
324 for_all_actives (op) 277 for_all_actives (op)
325 { 278 {
326 /* Now process op */ 279 /* Now process op */
327 if (QUERY_FLAG (op, FLAG_FREED)) 280 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
328 { 281 {
329 LOG (llevError, "BUG: process_events(): Free object on list\n"); 282 LOG (llevError, "BUG: process_events(): Free object on list\n");
330 op->set_speed (0); 283 op->set_speed (0);
331 continue; 284 continue;
332 } 285 }
333 286
334 /* I've seen occasional crashes due to this - the object is removed,
335 * and thus the map it points to (last map it was on) may be bogus
336 * The real bug is to try to find out the cause of this - someone
337 * is probably calling remove_ob without either an insert_ob or
338 * free_object afterwards, leaving an object dangling. But I'd
339 * rather log this and continue on instead of crashing.
340 * Don't remove players - when a player quits, the object is in
341 * sort of a limbo, of removed, but something we want to keep
342 * around.
343 */
344 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
345 {
346 LOG (llevError, "BUG: process_events(): Removed object on list\n");
347 char *dump = dump_object (op);
348 LOG (llevError, dump);
349 free (dump);
350 op->destroy ();
351 continue;
352 }
353
354 if (!op->has_active_speed ()) 287 if (expect_false (!op->has_active_speed ()))
355 { 288 {
356 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 289 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
357 "but is on active list\n", op->debug_desc (), op->speed); 290 "but is on active list\n", op->debug_desc (), op->speed);
358 op->set_speed (0); 291 op->set_speed (0);
359 continue; 292 continue;
360 } 293 }
361 294
362 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 295 if (expect_false (op->flag [FLAG_REMOVED]))
363 { 296 {
364 LOG (llevError, "BUG: process_events(): Object without map or " 297 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
365 "inventory is on active list: %s (%d)\n", &op->name, op->count); 298 op->debug_desc ());
366 op->set_speed (0); 299 op->set_speed (0);
367 continue; 300 continue;
368 } 301 }
369 302
370 /* Animate the object. Bug or feature that anim_speed 303 /* Animate the object. Bug or feature that anim_speed
371 * is based on ticks, and not the creatures speed? 304 * is based on ticks, and not the creatures speed?
372 */ 305 */
373 if (op->anim_speed && op->last_anim >= op->anim_speed) 306 if (op->anim_speed && op->last_anim >= op->anim_speed)
374 { 307 {
375 if ((op->type == PLAYER))
376 animate_object (op, op->facing);
377 else
378 animate_object (op, op->direction); 308 animate_object (op, op->contr ? op->facing : op->direction);
379
380 op->last_anim = 1; 309 op->last_anim = 1;
381 } 310 }
382 else 311 else
383 op->last_anim++; 312 ++op->last_anim;
384 313
385 if (op->speed_left > 0) 314 if (expect_false (op->speed_left > 0.f))
386 {
387#if 0
388 /* I've seen occasional crashes in move_symptom() with it
389 * crashing because op is removed - add some debugging to
390 * track if it is removed at this point.
391 * This unfortunately is a bit too verbose it seems - not sure
392 * why - I think what happens is a map is freed or something and
393 * some objects get 'lost' - removed never to be reclaimed.
394 * removed objects generally shouldn't exist.
395 */
396 if (QUERY_FLAG (op, FLAG_REMOVED))
397 { 315 {
398 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
399 }
400#endif
401 --op->speed_left; 316 --op->speed_left;
402 process_object (op); 317 process_object (op);
403
404 if (op->destroyed ())
405 continue;
406 } 318 }
407 319
408 if (settings.casting_time == TRUE && op->casting_time > 0) 320 if (expect_true (!op->contr))
409 op->casting_time--; 321 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
410
411 if (op->speed_left <= 0)
412 op->speed_left += FABS (op->speed);
413 } 322 }
414 323
415 process_players2 (); 324 process_players2 ();
416} 325}
417 326
… …
431 340
432// send all clients some informational text 341// send all clients some informational text
433static void 342static void
434cleanup_inform (const char *cause, bool make_core) 343cleanup_inform (const char *cause, bool make_core)
435{ 344{
436 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 345 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
437 346
438 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 347 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
439 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 348 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
440 349
441 if (make_core) 350 if (make_core)
442 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 351 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
443 else 352 else
444 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players have been saved.\n"); 353 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
445 354
446 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 355 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
447 356
448 flush_sockets (); 357 client::flush_sockets ();
449} 358}
450 359
451/* clean up everything before exiting */ 360/* clean up everything before exiting */
452void 361void
453cleanup (const char *cause, bool make_core) 362cleanup (const char *cause, bool make_core)
… …
473 LOG (llevDebug, "running cleanup handlers.\n"); 382 LOG (llevDebug, "running cleanup handlers.\n");
474 INVOKE_GLOBAL (CLEANUP); 383 INVOKE_GLOBAL (CLEANUP);
475 384
476 LOG (llevDebug, "cleanup done.\n"); 385 LOG (llevDebug, "cleanup done.\n");
477 386
387 log_cleanup ();
388
478 if (make_core) 389 if (make_core)
479 {
480 cleanup_inform (cause, make_core); 390 cleanup_inform (cause, make_core);
481 _exit (1);
482 }
483 else 391 else
484 _exit (0);
485}
486
487int
488forbid_play (void)
489{
490#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
491 char buf[MAX_BUF], day[MAX_BUF];
492 FILE *fp;
493 time_t clock;
494 struct tm *tm;
495 int i, start, stop, forbit = 0, comp;
496
497 clock = time (NULL);
498 tm = (struct tm *) localtime (&clock);
499
500 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
501 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
502 return 0;
503
504 while (fgets (buf, MAX_BUF, fp))
505 {
506 if (buf[0] == '#')
507 continue;
508
509 if (!strncmp (buf, "msg", 3))
510 {
511 if (forbit)
512 while (fgets (buf, MAX_BUF, fp)) /* print message */
513 fputs (buf, logfile);
514 break;
515 }
516 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
517 {
518 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
519 continue;
520 }
521
522 for (i = 0; i < 7; i++)
523 {
524 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
525 forbit = 1;
526 }
527 } 392 {
393 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
394 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
395 client::flush_sockets ();
396 }
528 397
529 close_and_delete (fp, comp); 398 cfperl_cleanup (make_core);
530 399 _exit (make_core);
531 return forbit;
532#else
533 return 0;
534#endif
535} 400}
536 401
537/* 402/*
538 * do_specials() is a collection of functions to call from time to time. 403 * do_specials() is a collection of functions to call from time to time.
539 * Modified 2000-1-14 MSW to use the global pticks count to determine how 404 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
545 * done on the same tick, but that will happen very infrequently 410 * done on the same tick, but that will happen very infrequently
546 * 411 *
547 * I also think this code makes it easier to see how often we really are 412 * I also think this code makes it easier to see how often we really are
548 * doing the various things. 413 * doing the various things.
549 */ 414 */
550
551extern unsigned long todtick;
552
553void 415void
554do_specials (void) 416do_specials (void)
555{ 417{
556 if (!(pticks % PTICKS_PER_CLOCK))
557 tick_the_clock ();
558
559 if (!(pticks % 7))
560 shstr::gc (); 418 shstr::gc ();
419 archetype::gc ();
561 420
421 if (expect_false (!(pticks % TICKS_PER_HOUR)))
422 maptile::adjust_daylight ();
423
562 if (!(pticks % 2503)) 424 if (expect_false (!(pticks % 2503)))
563 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 425 fix_weight (); /* Hack to fix weightproblems caused by bugs */
564 426
565 if (!(pticks % 5003)) 427 if (expect_false (!(pticks % 5003)))
566 write_book_archive (); 428 write_book_archive ();
567 429
568 if (!(pticks % 5009)) 430 if (expect_false (!(pticks % 5009)))
569 clean_friendly_list (); 431 clean_friendly_list ();
570 432
571 if (!(pticks % 5011)) 433 if (expect_false (!(pticks % 5011)))
572 obsolete_parties (); 434 obsolete_parties ();
573 435
574 if (!(pticks % 12503)) 436 if (expect_false (!(pticks % 12503)))
575 fix_luck (); 437 fix_luck ();
576} 438}
577 439
578void 440void
579server_tick () 441server_tick ()
580{ 442{
581 // first do the user visible stuff 443 // first do the user visible stuff
582 doeric_server ();
583 INVOKE_GLOBAL (CLOCK); 444 INVOKE_GLOBAL (CLOCK);
584 process_events (); /* "do" something with objects with speed */ 445 process_events (); // "do" something with objects with speed
585 flush_sockets (); 446 client::clock (); // draw client maps etc.
586 447
587 // then do some bookkeeping, should not really be here 448 // then do some bookkeeping, should not really be here
588 do_specials (); /* Routines called from time to time. */ 449 do_specials (); /* Routines called from time to time. */
589 attachable::check_mortals (); 450 attachable::check_mortals ();
590 451
591 ++pticks; 452 ++pticks;
592} 453}
593 454
594#if 0
595// used fro benchmarking (x86/amd64-specific)
596typedef unsigned long tval;
597typedef unsigned long long stamp64;
598
599extern inline tval
600stamp (void)
601{
602 tval tsc;
603 asm volatile ("rdtsc":"=a" (tsc)::"edx");
604
605 return tsc;
606}
607
608extern inline tval
609measure (tval t)
610{
611 tval tsc;
612 asm volatile ("rdtsc":"=a" (tsc)::"edx");
613
614 if (tsc > t)
615 return tsc - t;
616 else
617 return t - tsc;
618}
619
620int
621main (int argc, char **argv)
622{
623 rand_gen rg(0);
624 tval fastest = 0x7fffffff;
625 for (int loop = 10000; loop--; )
626 {
627 tval s = stamp ();
628 volatile int i = rg.get_int(25);
629 fastest = min (fastest, measure (s));
630 }
631
632 //printf ("fastest %d\n", fastest);
633 for (int i = 0; i < 1024*1024*3; ++i)
634 {
635 char c = rg.get_int (256);
636 write (2, &c, 1);
637 }
638}
639
640#else
641
642// normal main 455// normal main
643int 456int
644main (int argc, char **argv) 457main (int argc, char **argv)
645{ 458{
646 settings.argc = argc; 459 settings.argc = argc;
647 settings.argv = argv; 460 settings.argv = argv;
461
462 rndm.seed (time (0));
463 g_thread_init (0); // for the slice allocator only
648 464
649 init (argc, argv); 465 init (argc, argv);
650
651 initPlugins ();
652 466
653 for (;;) 467 for (;;)
654 cfperl_main (); 468 cfperl_main ();
655} 469}
656#endif
657 470

Diff Legend

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