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.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
… …
152 143
153 if (contr && map != newmap && map) 144 if (contr && map != newmap && map)
154 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 145 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
155 return; 146 return;
156 147
157 /* If it is a player login, he has yet to be inserted anyplace. 148 // remove, so stupid ob_locked does not trigger a failure
158 * otherwise, we need to deal with removing the player here.
159 */
160 remove (); 149 remove ();
161 150
162 /* try to find a spot for the player */ 151 /* try to find a spot for the player */
163 if (ob_blocked (this, newmap, x, y)) 152 if (ob_blocked (this, newmap, x, y))
164 { /* First choice blocked */ 153 { /* First choice blocked */
… …
201 this->y = y; 190 this->y = y;
202 map = newmap; 191 map = newmap;
203 192
204 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 193 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
205 194
206 enemy = NULL; 195 enemy = 0;
207 196
208 if (contr) 197 if (contr)
209 { 198 {
210 contr->maplevel = newmap->path; 199 contr->maplevel = newmap->path;
211 contr->count = 0; 200 contr->count = 0;
212 } 201 }
213 202
214 /* Update any golems */ 203 /* Update any golems */
215 if (type == PLAYER && contr->ranges[range_golem]) 204 if (type == PLAYER)
216 { 205 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 { 206 {
224 remove_friendly_object (contr->ranges[range_golem]); 207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
225 contr->ranges[range_golem]->destroy (); 208
226 contr->ranges[range_golem] = 0; 209 if (i < 0)
227 } 210 golem->destroy ();
228 else 211 else
229 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
231 { 212 {
232 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]);
233 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);
234 tmp->map = newmap;
235 } 215 }
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 } 216 }
241 }
242 217
243 /* 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
244 * about pending objects. 219 * about pending objects.
245 */ 220 */
246 remove_all_pets (newmap); 221 remove_all_pets (newmap);
… …
254 * is needed after the players have been updated. 229 * is needed after the players have been updated.
255 */ 230 */
256static void 231static void
257process_players1 () 232process_players1 ()
258{ 233{
259 int flag;
260
261 /* 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. */
262 for (flag = 1; flag != 0;) 235 for (int flag = 1; flag != 0;)
263 { 236 {
264 flag = 0; 237 flag = 0;
265 for_all_players (pl) 238 for_all_players (pl)
266 { 239 {
267 pl->refcnt_chk (); 240 pl->refcnt_chk ();
268 241
269 if (!pl->ob || !pl->ns || !pl->ob->active ()) 242 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
270 continue; 243 continue;
271 244
272 if (pl->ob->speed_left > 0)
273 if (handle_newcs_player (pl->ob)) 245 if (handle_newcs_player (pl->ob))
274 flag = 1; 246 flag = 1;
275
276 /* If the player is not actively playing, don't make a
277 * backup save - nothing to save anyway. Plus, the
278 * map may not longer be valid. This can happen when the
279 * player quits - they exist for purposes of tracking on the map,
280 * but don't actually reside on any actual map.
281 */
282 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
283 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 } 247 }
294#endif 248 }
295 } /* end of for loop for all the players */
296 } /* for flag */
297 249
298 for_all_players (pl) 250 for_all_players (pl)
299 { 251 {
252 object *ob = pl->ob;
253
300 if (!pl->ob || !pl->ns || !pl->ob->active ()) 254 if (expect_false (!ob || !pl->ns || !ob->active))
301 continue; 255 continue;
302 256
303 if (settings.casting_time)
304 {
305 if (pl->ob->casting_time > 0)
306 {
307 pl->ob->casting_time--;
308 pl->ob->start_holding = 1;
309 }
310
311 /* set spell_state so we can update the range in stats field */
312 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
313 pl->ob->start_holding = 0;
314 }
315
316 do_some_living (pl->ob); 257 do_some_living (ob);
317 } 258 }
318} 259}
319 260
320static void 261static void
321process_players2 () 262process_players2 ()
322{ 263{
323 /* 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 */
324 for_all_players (pl) 265 for_all_players (pl)
325 { 266 {
326 /* 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);
327 * 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);
328 * actions, and is thus out of place. All we do here is bounds
329 * checking.
330 */
331 if (pl->has_hit)
332 {
333 if (pl->ob->speed_left > pl->weapon_sp)
334 pl->ob->speed_left = pl->weapon_sp;
335
336 /* This needs to be here - if the player is running, we need to
337 * clear this each tick, but new commands are not being received
338 * so execute_newserver_command() is never called
339 */
340 pl->has_hit = 0;
341 }
342 else if (pl->ob->speed_left > pl->ob->speed)
343 pl->ob->speed_left = pl->ob->speed;
344 } 269 }
345} 270}
346 271
347void 272void
348process_events () 273process_events ()
349{ 274{
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 (); 275 process_players1 ();
360 276
361 marker->active_next = active_objects; 277 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 { 278 {
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 */ 279 /* Now process op */
390 if (QUERY_FLAG (op, FLAG_FREED)) 280 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
391 { 281 {
392 LOG (llevError, "BUG: process_events(): Free object on list\n"); 282 LOG (llevError, "BUG: process_events(): Free object on list\n");
393 op->set_speed (0); 283 op->set_speed (0);
394 continue; 284 continue;
395 } 285 }
396 286
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;
415 }
416
417 if (!op->has_active_speed ()) 287 if (expect_false (!op->has_active_speed ()))
418 { 288 {
419 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 289 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
420 "but is on active list\n", op->debug_desc (), op->speed); 290 "but is on active list\n", op->debug_desc (), op->speed);
421 op->set_speed (0); 291 op->set_speed (0);
422 continue; 292 continue;
423 } 293 }
424 294
425 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 295 if (expect_false (op->flag [FLAG_REMOVED]))
426 { 296 {
427 LOG (llevError, "BUG: process_events(): Object without map or " 297 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); 298 op->debug_desc ());
429 op->set_speed (0); 299 op->set_speed (0);
430 continue; 300 continue;
431 } 301 }
432 302
433 /* Animate the object. Bug or feature that anim_speed 303 /* Animate the object. Bug or feature that anim_speed
434 * is based on ticks, and not the creatures speed? 304 * is based on ticks, and not the creatures speed?
435 */ 305 */
436 if (op->anim_speed && op->last_anim >= op->anim_speed) 306 if (op->anim_speed && op->last_anim >= op->anim_speed)
437 { 307 {
438 if ((op->type == PLAYER))
439 animate_object (op, op->facing);
440 else
441 animate_object (op, op->direction); 308 animate_object (op, op->contr ? op->facing : op->direction);
442
443 op->last_anim = 1; 309 op->last_anim = 1;
444 } 310 }
445 else 311 else
446 op->last_anim++; 312 ++op->last_anim;
447 313
448 if (op->speed_left > 0) 314 if (op->speed_left > 0.f)
449 {
450#if 0
451 /* I've seen occasional crashes in move_symptom() with it
452 * crashing because op is removed - add some debugging to
453 * track if it is removed at this point.
454 * This unfortunately is a bit too verbose it seems - not sure
455 * why - I think what happens is a map is freed or something and
456 * some objects get 'lost' - removed never to be reclaimed.
457 * removed objects generally shouldn't exist.
458 */
459 if (QUERY_FLAG (op, FLAG_REMOVED))
460 { 315 {
461 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
462 }
463#endif
464 --op->speed_left; 316 --op->speed_left;
465 process_object (op); 317 process_object (op);
466 318
467 if (op->destroyed ()) 319 if (op->destroyed ())
468 continue; 320 continue;
469 } 321 }
470 322
471 if (settings.casting_time == TRUE && op->casting_time > 0) 323 if (!op->contr)
472 op->casting_time--; 324 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
473
474 if (op->speed_left <= 0)
475 op->speed_left += FABS (op->speed);
476 } 325 }
477
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 326
484 process_players2 (); 327 process_players2 ();
485} 328}
486 329
487/* clean up everything before exiting */ 330/* clean up everything before exiting */
488void 331void
489emergency_save () 332emergency_save ()
490{ 333{
491 LOG (llevDebug, "emergency save begin.\n"); 334 LOG (llevDebug, "emergency save begin.\n");
492 335
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 (); 336 cfperl_emergency_save ();
507 337
508 LOG (llevDebug, "saving book archive.\n"); 338 LOG (llevDebug, "saving book archive.\n");
509 write_book_archive (); 339 write_book_archive ();
510 340
511 LOG (llevDebug, "emergency save done.\n"); 341 LOG (llevDebug, "emergency save done.\n");
… …
513 343
514// send all clients some informational text 344// send all clients some informational text
515static void 345static void
516cleanup_inform (const char *cause, bool make_core) 346cleanup_inform (const char *cause, bool make_core)
517{ 347{
348 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
349
518 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.");
519 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);
520 352
521 if (make_core) 353 if (make_core)
522 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.");
523 else 355 else
524 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.");
525 357
526 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);
527 359
528 flush_sockets (); 360 client::flush_sockets ();
529} 361}
530 362
531/* clean up everything before exiting */ 363/* clean up everything before exiting */
532void 364void
533cleanup (const char *cause, bool make_core) 365cleanup (const char *cause, bool make_core)
534{ 366{
367 if (make_core)
368 fork_abort (cause);
369
535 LOG (llevError, "cleanup cause: %s\n", cause); 370 LOG (llevError, "cleanup cause: %s\n", cause);
536 371
537 if (!make_core) 372 if (!make_core)
538 cleanup_inform (cause, make_core); 373 cleanup_inform (cause, make_core);
539 374
… …
553 LOG (llevDebug, "cleanup done.\n"); 388 LOG (llevDebug, "cleanup done.\n");
554 389
555 if (make_core) 390 if (make_core)
556 { 391 {
557 cleanup_inform (cause, make_core); 392 cleanup_inform (cause, make_core);
558 abort (); 393 cfperl_cleanup (make_core);
394 _exit (1);
559 } 395 }
560 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);
561 _exit (0); 402 _exit (0);
403 }
562} 404}
563 405
564int 406int
565forbid_play (void) 407forbid_play (void)
566{ 408{
… …
622 * done on the same tick, but that will happen very infrequently 464 * done on the same tick, but that will happen very infrequently
623 * 465 *
624 * 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
625 * doing the various things. 467 * doing the various things.
626 */ 468 */
627
628extern unsigned long todtick;
629
630void 469void
631do_specials (void) 470do_specials (void)
632{ 471{
633 if (!(pticks % PTICKS_PER_CLOCK)) 472 if (expect_false (!(pticks % TICKS_PER_HOUR)))
634 tick_the_clock (); 473 adjust_daylight ();
635 474
636 if (!(pticks % 7)) 475 if (expect_false (!(pticks % 7)))
637 shstr::gc (); 476 shstr::gc ();
638 477
639 if (!(pticks % 2503)) 478 if (expect_false (!(pticks % 2503)))
640 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 479 fix_weight (); /* Hack to fix weightproblems caused by bugs */
641 480
642 if (!(pticks % 5003)) 481 if (expect_false (!(pticks % 5003)))
643 write_book_archive (); 482 write_book_archive ();
644 483
645 if (!(pticks % 5009)) 484 if (expect_false (!(pticks % 5009)))
646 clean_friendly_list (); 485 clean_friendly_list ();
647 486
648 if (!(pticks % 5011)) 487 if (expect_false (!(pticks % 5011)))
649 obsolete_parties (); 488 obsolete_parties ();
650 489
651 if (!(pticks % 12503)) 490 if (expect_false (!(pticks % 12503)))
652 fix_luck (); 491 fix_luck ();
653} 492}
654 493
655void 494void
656server_tick () 495server_tick ()
657{ 496{
658 // first do the user visible stuff 497 // first do the user visible stuff
659 doeric_server ();
660 INVOKE_GLOBAL (CLOCK); 498 INVOKE_GLOBAL (CLOCK);
661 process_events (); /* "do" something with objects with speed */ 499 process_events (); // "do" something with objects with speed
662 flush_sockets (); 500 client::clock (); // draw client maps etc.
663 501
664 // then do some bookkeeping, should not really be here 502 // then do some bookkeeping, should not really be here
665 do_specials (); /* Routines called from time to time. */ 503 do_specials (); /* Routines called from time to time. */
666 attachable::check_mortals (); 504 attachable::check_mortals ();
667 505
668 ++pticks; 506 ++pticks;
669} 507}
670 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
671int 535int
672main (int argc, char **argv) 536main (int argc, char **argv)
673{ 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{
674 settings.argc = argc; 561 settings.argc = argc;
675 settings.argv = argv; 562 settings.argv = argv;
676 563
677 init (argc, argv); 564 init (argc, argv);
678 565
679 initPlugins (); 566 initPlugins ();
680 567
681 for (;;) 568 for (;;)
682 cfperl_main (); 569 cfperl_main ();
683} 570}
571#endif
684 572

Diff Legend

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