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.73 by root, Tue Jan 2 11:08:36 2007 UTC vs.
Revision 1.111 by root, Sun Jun 24 04:09:29 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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 it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <tod.h> 27#include <tod.h>
27 28
28#ifdef HAVE_DES_H
29# include <des.h>
30#else
31# ifdef HAVE_CRYPT_H
32# include <crypt.h>
33# endif
34#endif
35
36#include <sproto.h> 29#include <sproto.h>
37#include <time.h> 30#include <time.h>
38 31
39#include <../random_maps/random_map.h> 32#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 33#include <../random_maps/rproto.h>
… …
45}; 38};
46 39
47void 40void
48version (object *op) 41version (object *op)
49{ 42{
50 if (op)
51 clear_win_info (op);
52
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 43 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
54 44
55 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 45 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
56 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 46 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); 48 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "");
50 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
59 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>"); 51 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
60 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>"); 52 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>"); 53 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>"); 54 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
… …
94 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>"); 86 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
95 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>"); 87 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
96 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>"); 88 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
97 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n"); 90 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
99 91 new_draw_info (NDI_UNIQUE, 0, op, "");
100 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
101 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
102 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 94 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
103 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
104 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
105 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 99 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
107} 100}
108 101
109/* This is a basic little function to put the player back to his 102/* This is a basic little function to put the player back to his
110 * savebed. We do some error checking - its possible that the 103 * savebed. We do some error checking - its possible that the
… …
147 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 140 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
148 return; 141 return;
149 } 142 }
150 } 143 }
151 144
152 if (map && map != newmap) 145 if (contr && map != newmap && map)
153 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 146 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
154 return; 147 return;
155 148
156 /* If it is a player login, he has yet to be inserted anyplace. 149 // remove, so stupid ob_locked does not trigger a failure
157 * otherwise, we need to deal with removing the player here.
158 */
159 remove (); 150 remove ();
160 151
161 /* try to find a spot for the player */ 152 /* try to find a spot for the player */
162 if (ob_blocked (this, newmap, x, y)) 153 if (ob_blocked (this, newmap, x, y))
163 { /* First choice blocked */ 154 { /* First choice blocked */
… …
185 else 176 else
186 /* not much we can do in this case. */ 177 /* not much we can do in this case. */
187 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); 178 LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y);
188 } 179 }
189 180
190 if (map != newmap && contr) 181 if (contr && map != newmap)
191 { 182 {
192 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 183 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
193 return; 184 return;
194 185
195 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 186 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
… …
200 this->y = y; 191 this->y = y;
201 map = newmap; 192 map = newmap;
202 193
203 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 194 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
204 195
205 enemy = NULL; 196 enemy = 0;
206 197
207 if (contr) 198 if (contr)
208 { 199 {
209 contr->maplevel = newmap->path; 200 contr->maplevel = newmap->path;
210 contr->count = 0; 201 contr->count = 0;
211 } 202 }
212 203
213 /* Update any golems */ 204 /* Update any golems */
214 if (type == PLAYER && contr->ranges[range_golem]) 205 if (type == PLAYER)
215 { 206 if (object *golem = contr->golem)
216 int i = find_free_spot (contr->ranges[range_golem], newmap,
217 x, y, 1, SIZEOFFREE);
218
219 contr->ranges[range_golem]->remove ();
220
221 if (i == -1)
222 { 207 {
223 remove_friendly_object (contr->ranges[range_golem]); 208 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
224 contr->ranges[range_golem]->destroy (); 209
225 contr->ranges[range_golem] = 0; 210 if (i < 0)
226 } 211 golem->destroy ();
227 else 212 else
228 {
229 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
230 { 213 {
231 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 214 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
232 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 215 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
233 tmp->map = newmap;
234 } 216 }
235
236 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
237 contr->ranges[range_golem]->direction =
238 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
239 } 217 }
240 }
241
242 direction = 0;
243 218
244 /* since the players map is already loaded, we don't need to worry 219 /* since the players map is already loaded, we don't need to worry
245 * about pending objects. 220 * about pending objects.
246 */ 221 */
247 remove_all_pets (newmap); 222 remove_all_pets (newmap);
… …
255 * is needed after the players have been updated. 230 * is needed after the players have been updated.
256 */ 231 */
257static void 232static void
258process_players1 () 233process_players1 ()
259{ 234{
260 int flag;
261
262 /* Basically, we keep looping until all the players have done their actions. */ 235 /* Basically, we keep looping until all the players have done their actions. */
263 for (flag = 1; flag != 0;) 236 for (int flag = 1; flag != 0;)
264 { 237 {
265 flag = 0; 238 flag = 0;
266 for_all_players (pl) 239 for_all_players (pl)
267 { 240 {
268 pl->refcnt_chk (); 241 pl->refcnt_chk ();
269 242
270 if (!pl->ob || !pl->ns || !pl->ob->active ()) 243 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
271 continue; 244 continue;
272 245
273 if (pl->ob->speed_left > 0)
274 if (handle_newcs_player (pl->ob)) 246 if (handle_newcs_player (pl->ob))
275 flag = 1; 247 flag = 1;
276
277 /* If the player is not actively playing, don't make a
278 * backup save - nothing to save anyway. Plus, the
279 * map may not longer be valid. This can happen when the
280 * player quits - they exist for purposes of tracking on the map,
281 * but don't actually reside on any actual map.
282 */
283 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
284 continue;
285
286#ifdef AUTOSAVE
287 /* check for ST_PLAYING state so that we don't try to save off when
288 * the player is logging in.
289 */
290 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
291 {
292 pl->ob->contr->save ();
293 pl->last_save_tick = pticks;
294 } 248 }
295#endif 249 }
296 } /* end of for loop for all the players */
297 } /* for flag */
298 250
299 for_all_players (pl) 251 for_all_players (pl)
300 { 252 {
253 object *ob = pl->ob;
254
301 if (!pl->ob || !pl->ns || !pl->ob->active ()) 255 if (expect_false (!ob || !pl->ns || !ob->active))
302 continue; 256 continue;
303 257
304 if (settings.casting_time)
305 {
306 if (pl->ob->casting_time > 0)
307 {
308 pl->ob->casting_time--;
309 pl->ob->start_holding = 1;
310 }
311
312 /* set spell_state so we can update the range in stats field */
313 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
314 pl->ob->start_holding = 0;
315 }
316
317 do_some_living (pl->ob); 258 do_some_living (ob);
318 } 259 }
319} 260}
320 261
321static void 262static void
322process_players2 () 263process_players2 ()
323{ 264{
324 /* Then check if any players should use weapon-speed instead of speed */ 265 /* Then check if any players should use weapon-speed instead of speed */
325 for_all_players (pl) 266 for_all_players (pl)
326 { 267 {
327 /* The code that did weapon_sp handling here was out of place - 268 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
328 * this isn't called until after the player has finished there 269 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
329 * actions, and is thus out of place. All we do here is bounds
330 * checking.
331 */
332 if (pl->has_hit)
333 {
334 if (pl->ob->speed_left > pl->weapon_sp)
335 pl->ob->speed_left = pl->weapon_sp;
336
337 /* This needs to be here - if the player is running, we need to
338 * clear this each tick, but new commands are not being received
339 * so execute_newserver_command() is never called
340 */
341 pl->has_hit = 0;
342 }
343 else if (pl->ob->speed_left > pl->ob->speed)
344 pl->ob->speed_left = pl->ob->speed;
345 } 270 }
346} 271}
347 272
348void 273void
349process_events () 274process_events ()
350{ 275{
351 object *op;
352
353 static object_ptr marker_;
354
355 if (!marker_)
356 marker_ = object::create ();
357
358 object *marker = marker_;
359
360 process_players1 (); 276 process_players1 ();
361 277
362 marker->active_next = active_objects; 278 for_all_actives (op)
363
364 if (marker->active_next)
365 marker->active_next->active_prev = marker;
366
367 marker->active_prev = 0;
368 active_objects = marker;
369
370 while (marker->active_next)
371 { 279 {
372 op = marker->active_next;
373
374 /* Move marker forward - swap op and marker */
375 op->active_prev = marker->active_prev;
376
377 if (op->active_prev)
378 op->active_prev->active_next = op;
379 else
380 active_objects = op;
381
382 marker->active_next = op->active_next;
383
384 if (marker->active_next)
385 marker->active_next->active_prev = marker;
386
387 marker->active_prev = op;
388 op->active_next = marker;
389
390 /* Now process op */ 280 /* Now process op */
391 if (QUERY_FLAG (op, FLAG_FREED)) 281 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
392 { 282 {
393 LOG (llevError, "BUG: process_events(): Free object on list\n"); 283 LOG (llevError, "BUG: process_events(): Free object on list\n");
394 op->set_speed (0); 284 op->set_speed (0);
395 continue; 285 continue;
396 } 286 }
397 287
398 /* I've seen occasional crashes due to this - the object is removed,
399 * and thus the map it points to (last map it was on) may be bogus
400 * The real bug is to try to find out the cause of this - someone
401 * is probably calling remove_ob without either an insert_ob or
402 * free_object afterwards, leaving an object dangling. But I'd
403 * rather log this and continue on instead of crashing.
404 * Don't remove players - when a player quits, the object is in
405 * sort of a limbo, of removed, but something we want to keep
406 * around.
407 */
408 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
409 {
410 LOG (llevError, "BUG: process_events(): Removed object on list\n");
411 char *dump = dump_object (op);
412 LOG (llevError, dump);
413 free (dump);
414 op->destroy ();
415 continue;
416 }
417
418 if (!op->has_active_speed ()) 288 if (expect_false (!op->has_active_speed ()))
419 { 289 {
420 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 290 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
421 "but is on active list\n", op->debug_desc (), op->speed); 291 "but is on active list\n", op->debug_desc (), op->speed);
422 op->set_speed (0); 292 op->set_speed (0);
423 continue; 293 continue;
424 } 294 }
425 295
426 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 296 if (expect_false (op->flag [FLAG_REMOVED]))
427 { 297 {
428 LOG (llevError, "BUG: process_events(): Object without map or " 298 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
429 "inventory is on active list: %s (%d)\n", &op->name, op->count); 299 op->debug_desc ());
430 op->set_speed (0); 300 op->set_speed (0);
431 continue; 301 continue;
432 } 302 }
433 303
434 /* Animate the object. Bug or feature that anim_speed 304 /* Animate the object. Bug or feature that anim_speed
435 * is based on ticks, and not the creatures speed? 305 * is based on ticks, and not the creatures speed?
436 */ 306 */
437 if (op->anim_speed && op->last_anim >= op->anim_speed) 307 if (op->anim_speed && op->last_anim >= op->anim_speed)
438 { 308 {
439 if ((op->type == PLAYER))
440 animate_object (op, op->facing);
441 else
442 animate_object (op, op->direction); 309 animate_object (op, op->contr ? op->facing : op->direction);
443
444 op->last_anim = 1; 310 op->last_anim = 1;
445 } 311 }
446 else 312 else
447 op->last_anim++; 313 ++op->last_anim;
448 314
449 if (op->speed_left > 0) 315 if (op->speed_left > 0.f)
450 {
451#if 0
452 /* I've seen occasional crashes in move_symptom() with it
453 * crashing because op is removed - add some debugging to
454 * track if it is removed at this point.
455 * This unfortunately is a bit too verbose it seems - not sure
456 * why - I think what happens is a map is freed or something and
457 * some objects get 'lost' - removed never to be reclaimed.
458 * removed objects generally shouldn't exist.
459 */
460 if (QUERY_FLAG (op, FLAG_REMOVED))
461 { 316 {
462 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
463 }
464#endif
465 --op->speed_left; 317 --op->speed_left;
466 process_object (op); 318 process_object (op);
467 319
468 if (op->destroyed ()) 320 if (op->destroyed ())
469 continue; 321 continue;
470 } 322 }
471 323
472 if (settings.casting_time == TRUE && op->casting_time > 0) 324 if (!op->contr)
473 op->casting_time--; 325 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
474
475 if (op->speed_left <= 0)
476 op->speed_left += FABS (op->speed);
477 } 326 }
478
479 /* Remove marker object from active list */
480 if (marker->active_prev != NULL)
481 marker->active_prev->active_next = NULL;
482 else
483 active_objects = NULL;
484 327
485 process_players2 (); 328 process_players2 ();
486} 329}
487 330
488/* clean up everything before exiting */ 331/* clean up everything before exiting */
489void 332void
490emergency_save () 333emergency_save ()
491{ 334{
492 LOG (llevDebug, "emergency save begin.\n"); 335 LOG (llevDebug, "emergency save begin.\n");
493 336
494 LOG (llevDebug, "saving players.\n");
495 for_all_players (pl)
496 pl->save (1);
497
498// for_all_players (pl)
499// if (pl->ob)
500// pl->ob->remove ();
501
502 LOG (llevDebug, "saving maps.\n");
503 maptile::emergency_save (); 337 cfperl_emergency_save ();
504 338
505 LOG (llevDebug, "saving book archive.\n"); 339 LOG (llevDebug, "saving book archive.\n");
506 write_book_archive (); 340 write_book_archive ();
507 341
508 LOG (llevDebug, "emergency save done.\n"); 342 LOG (llevDebug, "emergency save done.\n");
509} 343}
510 344
345// send all clients some informational text
346static void
347cleanup_inform (const char *cause, bool make_core)
348{
349 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
350
351 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
352 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
353
354 if (make_core)
355 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
356 else
357 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
358
359 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
360
361 flush_sockets ();
362}
363
511/* clean up everything before exiting */ 364/* clean up everything before exiting */
512void 365void
513cleanup (bool make_core) 366cleanup (const char *cause, bool make_core)
514{ 367{
368 if (make_core)
369 fork_abort (cause);
370
371 LOG (llevError, "cleanup cause: %s\n", cause);
372
373 if (!make_core)
374 cleanup_inform (cause, make_core);
375
515 LOG (llevDebug, "cleanup begin.\n"); 376 LOG (llevDebug, "cleanup begin.\n");
516 377
517 if (init_done && !in_cleanup) 378 if (init_done && !in_cleanup)
518 { 379 {
519 in_cleanup = true; 380 in_cleanup = true;
… …
526 INVOKE_GLOBAL (CLEANUP); 387 INVOKE_GLOBAL (CLEANUP);
527 388
528 LOG (llevDebug, "cleanup done.\n"); 389 LOG (llevDebug, "cleanup done.\n");
529 390
530 if (make_core) 391 if (make_core)
531 abort (); 392 {
393 cleanup_inform (cause, make_core);
394 cfperl_cleanup (make_core);
395 _exit (1);
396 }
532 else 397 else
398 {
399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
400 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
401 flush_sockets ();
402 cfperl_cleanup (make_core);
533 _exit (0); 403 _exit (0);
404 }
534} 405}
535 406
536int 407int
537forbid_play (void) 408forbid_play (void)
538{ 409{
… …
594 * done on the same tick, but that will happen very infrequently 465 * done on the same tick, but that will happen very infrequently
595 * 466 *
596 * I also think this code makes it easier to see how often we really are 467 * I also think this code makes it easier to see how often we really are
597 * doing the various things. 468 * doing the various things.
598 */ 469 */
599
600extern unsigned long todtick;
601
602void 470void
603do_specials (void) 471do_specials (void)
604{ 472{
605 if (!(pticks % PTICKS_PER_CLOCK)) 473 if (expect_false (!(pticks % TICKS_PER_HOUR)))
606 tick_the_clock (); 474 adjust_daylight ();
607 475
608 if (!(pticks % 7)) 476 if (expect_false (!(pticks % 7)))
609 shstr::gc (); 477 shstr::gc ();
610 478
611 if (!(pticks % 2503)) 479 if (expect_false (!(pticks % 2503)))
612 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 480 fix_weight (); /* Hack to fix weightproblems caused by bugs */
613 481
614 if (!(pticks % 5003)) 482 if (expect_false (!(pticks % 5003)))
615 write_book_archive (); 483 write_book_archive ();
616 484
617 if (!(pticks % 5009)) 485 if (expect_false (!(pticks % 5009)))
618 clean_friendly_list (); 486 clean_friendly_list ();
619 487
620 if (!(pticks % 5011)) 488 if (expect_false (!(pticks % 5011)))
621 obsolete_parties (); 489 obsolete_parties ();
622 490
623 if (!(pticks % 12503)) 491 if (expect_false (!(pticks % 12503)))
624 fix_luck (); 492 fix_luck ();
625} 493}
626 494
627void 495void
628server_tick () 496server_tick ()
… …
638 attachable::check_mortals (); 506 attachable::check_mortals ();
639 507
640 ++pticks; 508 ++pticks;
641} 509}
642 510
511#if 0
512// used fro benchmarking (x86/amd64-specific)
513typedef unsigned long tval;
514typedef unsigned long long stamp64;
515
516extern inline tval
517stamp (void)
518{
519 tval tsc;
520 asm volatile ("rdtsc":"=a" (tsc)::"edx");
521
522 return tsc;
523}
524
525extern inline tval
526measure (tval t)
527{
528 tval tsc;
529 asm volatile ("rdtsc":"=a" (tsc)::"edx");
530
531 if (tsc > t)
532 return tsc - t;
533 else
534 return t - tsc;
535}
536
643int 537int
644main (int argc, char **argv) 538main (int argc, char **argv)
645{ 539{
540 rand_gen rg(0);
541 tval fastest = 0x7fffffff;
542 for (int loop = 10000; loop--; )
543 {
544 tval s = stamp ();
545 volatile int i = rg.get_int(25);
546 fastest = min (fastest, measure (s));
547 }
548
549 //printf ("fastest %d\n", fastest);
550 for (int i = 0; i < 1024*1024*3; ++i)
551 {
552 char c = rg.get_int (256);
553 write (2, &c, 1);
554 }
555}
556
557#else
558
559// normal main
560int
561main (int argc, char **argv)
562{
646 settings.argc = argc; 563 settings.argc = argc;
647 settings.argv = argv; 564 settings.argv = argv;
648 565
649 init (argc, argv); 566 init (argc, argv);
650 567
651 initPlugins (); 568 initPlugins ();
652 569
653 for (;;) 570 for (;;)
654 cfperl_main (); 571 cfperl_main ();
655
656 cleanup (true);
657} 572}
573#endif
658 574

Diff Legend

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