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.111 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.169 by root, Sat Apr 23 04:56:56 2011 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <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 <../random_maps/random_map.h> 32#include <glib.h>
33#include <../random_maps/rproto.h> 33
34#include <rmg.h>
35#include <rproto.h>
34#include "path.h" 36#include "path.h"
35
36static char days[7][4] = {
37 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
38};
39 37
40void 38void
41version (object *op) 39version (object *op)
42{ 40{
43 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
44
45 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
46 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
47 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
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:");
51 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
52 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
53 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
54 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
55 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
56 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
57 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
59 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
60 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
88 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
90 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
91 new_draw_info (NDI_UNIQUE, 0, op, "");
92 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
93 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
94 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
95 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
96 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
97 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "");
99 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
100} 42}
101 43
102/* This is a basic little function to put the player back to his 44/* This is a basic little function to put the player back to his
103 * savebed. We do some error checking - its possible that the 45 * savebed.
104 * savebed map may no longer exist, so we make sure the player
105 * goes someplace.
106 */ 46 */
107void 47void
108enter_player_savebed (object *op) 48enter_player_savebed (object *op)
109{ 49{
110 object *tmp = object::create (); 50 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
111 EXIT_PATH (tmp) = op->contr->savebed_map;
112 EXIT_X (tmp) = op->contr->bed_x;
113 EXIT_Y (tmp) = op->contr->bed_y;
114 op->enter_exit (tmp);
115 tmp->destroy ();
116} 51}
117 52
118/* 53/*
119 * enter_map(): Moves the player and pets from current map (if any) to 54 * enter_map(): Moves the player and pets from current map (if any) to
120 * new map. map, x, y must be set. map is the map we are moving the 55 * new map. map, x, y must be set. map is the map we are moving the
121 * player to - it could be the map he just came from if the load failed for 56 * player to - it could be the map he just came from if the load failed for
122 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
123 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
124 */ 59 */
125void 60bool
126object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
127{ 62{
128 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 63 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
129 return; 64 return false;
130 65
131 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
132 { 67 {
133 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 68 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
134 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
136 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
137 { 72 {
138 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 73 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
139 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
140 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
141 return; 76 return false;
142 } 77 }
143 } 78 }
144 79
145 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
146 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
147 return; 82 return false;
148 83
149 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
150 remove (); 85 remove ();
151 86
152 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
153 if (ob_blocked (this, newmap, x, y)) 88 if (blocked (newmap, x, y))
154 { /* First choice blocked */ 89 { /* First choice blocked */
155 /* We try to find a spot for the player, starting closest in. 90 /* We try to find a spot for the player, starting closest in.
156 * We could use find_first_free_spot, but that doesn't randomize it at all, 91 * We could use find_first_free_spot, but that doesn't randomize it at all,
157 * So for example, if the north space is free, you would always end up there even 92 * So for example, if the north space is free, you would always end up there even
158 * if other spaces around are available. 93 * if other spaces around are available.
159 * Note that for the second and third calls, we could start at a position other 94 * Note that for the second and third calls, we could start at a position other
160 * than one, but then we could end up on the other side of walls and so forth. 95 * than one, but then we could end up on the other side of walls and so forth.
161 */ 96 */
162 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 97 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
163 98
164 if (i == -1) 99 if (i < 0)
165 { 100 {
166 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
167 if (i == -1) 102 if (i < 0)
168 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
169 } 104 }
170 105
171 if (i != -1) 106 if (i >= 0)
107 {
108 maptile *m = newmap;
109 sint16 nx = x + freearr_x[i];
110 sint16 ny = y + freearr_y[i];
111
112 if (xy_normalise (m, nx, ny))
172 { 113 {
173 x += freearr_x[i]; 114 newmap = m;
174 y += freearr_y[i]; 115 x = nx;
116 y = ny;
117 }
175 } 118 }
176 else 119 else
177 /* not much we can do in this case. */ 120 /* not much we can do in this case. */
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); 121 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);
179 } 122 }
180 123
181 if (contr && map != newmap) 124 if (contr && map != newmap)
182 { 125 {
183 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 126 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
184 return; 127 return false;
185 128
186 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 129 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
187 return; 130 return false;
188 } 131 }
189
190 this->x = x;
191 this->y = y;
192 map = newmap;
193
194 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
195 132
196 enemy = 0; 133 enemy = 0;
197 134
135 //newmap->insert (this, x, y);
136 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
137
138 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
139 {
198 if (contr) 140 if (contr)
199 { 141 {
200 contr->maplevel = newmap->path; 142 contr->maplevel = newmap->path;
201 contr->count = 0; 143 contr->count = 0;
202 }
203 144
204 /* Update any golems */ 145 /* Update any golems */
205 if (type == PLAYER)
206 if (object *golem = contr->golem) 146 if (object *golem = contr->golem)
207 { 147 {
208 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 148 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
209 149
210 if (i < 0) 150 if (i < 0)
211 golem->destroy (); 151 golem->drop_and_destroy ();
212 else 152 else
213 { 153 {
214 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 154 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
215 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 155 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
156 }
216 } 157 }
217 } 158 }
218 159
219 /* since the players map is already loaded, we don't need to worry 160 /* since the players map is already loaded, we don't need to worry
220 * about pending objects. 161 * about pending objects.
221 */ 162 */
222 remove_all_pets (newmap); 163 move_all_pets ();
164
165 return true;
166 }
167
168 return false;
223} 169}
224 170
225/* process_players1 and process_players2 do all the player related stuff. 171/* process_players1 and process_players2 do all the player related stuff.
226 * I moved it out of process events and process_map. This was to some 172 * I moved it out of process events and process_map. This was to some
227 * extent for debugging as well as to get a better idea of the time used 173 * extent for debugging as well as to get a better idea of the time used
… …
250 196
251 for_all_players (pl) 197 for_all_players (pl)
252 { 198 {
253 object *ob = pl->ob; 199 object *ob = pl->ob;
254 200
201 // process_objects destroys the speed_left value
202 pl->speed_left_save = ob->speed_left;
203
255 if (expect_false (!ob || !pl->ns || !ob->active)) 204 if (expect_false (!ob || !pl->ns || !ob->active))
256 continue; 205 continue;
257 206
258 do_some_living (ob); 207 do_some_living (ob);
259 } 208 }
… …
263process_players2 () 212process_players2 ()
264{ 213{
265 /* Then check if any players should use weapon-speed instead of speed */ 214 /* Then check if any players should use weapon-speed instead of speed */
266 for_all_players (pl) 215 for_all_players (pl)
267 { 216 {
217 // restore speed_left value saved by process_players1
218 pl->ob->speed_left = pl->speed_left_save;
219
268 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); 220 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
269 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 221 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
270 } 222 }
271} 223}
272 224
273void 225static void
274process_events () 226process_events ()
275{ 227{
276 process_players1 (); 228 process_players1 ();
277 229
278 for_all_actives (op) 230 for_all_actives (op)
279 { 231 {
232 // try to prefetch some stuff we expect to need
233 // obviously, it should be grouped into the same cacheline.
234 // preliminary results indicate that this gives halves the speed
235 // used for the inner loop
236 if (_i < actives.size ()) // HACK, rely on _i :/
237 {
238 object *next = actives [_i + 1];
239
240 prefetch (&next->flag , 0, 1);
241 prefetch (&next->speed , 0, 1);
242 prefetch (&next->anim_speed, 0, 1);
243 prefetch (&next->contr , 0, 1);
244 }
245
280 /* Now process op */ 246 /* Now process op */
281 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 247 if (expect_false (op->flag [FLAG_FREED]))
282 { 248 {
283 LOG (llevError, "BUG: process_events(): Free object on list\n"); 249 LOG (llevError, "BUG: process_events(): Free object on list (%s)\n", op->debug_desc ());
284 op->set_speed (0); 250 op->set_speed (0);
285 continue; 251 continue;
286 } 252 }
287 253
288 if (expect_false (!op->has_active_speed ())) 254 if (expect_false (!op->has_active_speed ()))
… …
310 op->last_anim = 1; 276 op->last_anim = 1;
311 } 277 }
312 else 278 else
313 ++op->last_anim; 279 ++op->last_anim;
314 280
315 if (op->speed_left > 0.f) 281 if (expect_false (op->speed_left > 0.f))
316 { 282 {
317 --op->speed_left; 283 --op->speed_left;
318 process_object (op); 284 process_object (op);
319
320 if (op->destroyed ())
321 continue;
322 } 285 }
323 286
324 if (!op->contr) 287 // this will destroy the speed_left value for players, but
288 // process_players1 and ..2 save/restore the real value,
289 // so we can avoid a costly test here.
325 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 290 op->speed_left = min (op->speed, op->speed_left + op->speed);
326 } 291 }
327 292
328 process_players2 (); 293 process_players2 ();
329} 294}
330 295
331/* clean up everything before exiting */ 296/* clean up everything before exiting */
332void 297void
333emergency_save () 298emergency_save ()
334{ 299{
335 LOG (llevDebug, "emergency save begin.\n"); 300 LOG (llevInfo, "emergency_save: enter\n");
301
302 LOG (llevInfo, "emergency_save: saving book archive\n");
303 write_book_archive ();
336 304
337 cfperl_emergency_save (); 305 cfperl_emergency_save ();
338 306
339 LOG (llevDebug, "saving book archive.\n");
340 write_book_archive ();
341
342 LOG (llevDebug, "emergency save done.\n"); 307 LOG (llevInfo, "emergency_save: leave\n");
343} 308}
344 309
345// send all clients some informational text 310// send all clients some informational text
346static void 311static void
347cleanup_inform (const char *cause, bool make_core) 312cleanup_inform (const char *cause, bool make_core)
348{ 313{
349 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 314 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
350 315
351 new_draw_info_format (flags, 0, 0, "The server will now shutdown."); 316 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); 317 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
353 318
354 if (make_core) 319 if (make_core)
… …
356 else 321 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."); 322 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 323
359 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE); 324 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
360 325
361 flush_sockets (); 326 client::flush_sockets ();
362} 327}
363 328
364/* clean up everything before exiting */ 329/* clean up everything before exiting */
365void 330void
366cleanup (const char *cause, bool make_core) 331cleanup (const char *cause, bool make_core)
367{ 332{
368 if (make_core) 333 if (make_core)
369 fork_abort (cause); 334 fork_abort (cause);
370 335
371 LOG (llevError, "cleanup cause: %s\n", cause); 336 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
372 337
373 if (!make_core) 338 if (!make_core)
374 cleanup_inform (cause, make_core); 339 cleanup_inform (cause, make_core);
375 340
376 LOG (llevDebug, "cleanup begin.\n"); 341 LOG (llevDebug, "cleanup begin.\n");
… …
386 LOG (llevDebug, "running cleanup handlers.\n"); 351 LOG (llevDebug, "running cleanup handlers.\n");
387 INVOKE_GLOBAL (CLEANUP); 352 INVOKE_GLOBAL (CLEANUP);
388 353
389 LOG (llevDebug, "cleanup done.\n"); 354 LOG (llevDebug, "cleanup done.\n");
390 355
356 log_cleanup ();
357
391 if (make_core) 358 if (make_core)
392 {
393 cleanup_inform (cause, make_core); 359 cleanup_inform (cause, make_core);
394 cfperl_cleanup (make_core);
395 _exit (1);
396 }
397 else 360 else
398 { 361 {
399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting."); 362 new_draw_info_format (NDI_REPLY | 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); 363 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
401 flush_sockets (); 364 client::flush_sockets ();
365 }
366
402 cfperl_cleanup (make_core); 367 cfperl_cleanup (make_core);
403 _exit (0); 368 _exit (make_core);
404 }
405}
406
407int
408forbid_play (void)
409{
410#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
411 char buf[MAX_BUF], day[MAX_BUF];
412 FILE *fp;
413 time_t clock;
414 struct tm *tm;
415 int i, start, stop, forbit = 0, comp;
416
417 clock = time (NULL);
418 tm = (struct tm *) localtime (&clock);
419
420 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
421 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
422 return 0;
423
424 while (fgets (buf, MAX_BUF, fp))
425 {
426 if (buf[0] == '#')
427 continue;
428
429 if (!strncmp (buf, "msg", 3))
430 {
431 if (forbit)
432 while (fgets (buf, MAX_BUF, fp)) /* print message */
433 fputs (buf, logfile);
434 break;
435 }
436 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
437 {
438 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
439 continue;
440 }
441
442 for (i = 0; i < 7; i++)
443 {
444 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
445 forbit = 1;
446 }
447 }
448
449 close_and_delete (fp, comp);
450
451 return forbit;
452#else
453 return 0;
454#endif
455} 369}
456 370
457/* 371/*
458 * do_specials() is a collection of functions to call from time to time. 372 * do_specials() is a collection of functions to call from time to time.
459 * Modified 2000-1-14 MSW to use the global pticks count to determine how 373 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
465 * done on the same tick, but that will happen very infrequently 379 * done on the same tick, but that will happen very infrequently
466 * 380 *
467 * I also think this code makes it easier to see how often we really are 381 * I also think this code makes it easier to see how often we really are
468 * doing the various things. 382 * doing the various things.
469 */ 383 */
470void 384static void
471do_specials (void) 385do_specials ()
472{ 386{
387 shstr::gc ();
388 archetype::gc ();
389
473 if (expect_false (!(pticks % TICKS_PER_HOUR))) 390 if (expect_false (!(pticks % TICKS_PER_HOUR)))
474 adjust_daylight (); 391 maptile::adjust_daylight ();
475
476 if (expect_false (!(pticks % 7)))
477 shstr::gc ();
478 392
479 if (expect_false (!(pticks % 2503))) 393 if (expect_false (!(pticks % 2503)))
480 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 394 fix_weight (); /* Hack to fix weightproblems caused by bugs */
481 395
482 if (expect_false (!(pticks % 5003))) 396 if (expect_false (!(pticks % 5003)))
… …
494 408
495void 409void
496server_tick () 410server_tick ()
497{ 411{
498 // first do the user visible stuff 412 // first do the user visible stuff
499 doeric_server ();
500 INVOKE_GLOBAL (CLOCK); 413 INVOKE_GLOBAL (CLOCK);
501 process_events (); /* "do" something with objects with speed */ 414 process_events (); // "do" something with objects with speed
502 flush_sockets (); 415 client::clock (); // draw client maps etc.
503 416
504 // then do some bookkeeping, should not really be here 417 // then do some bookkeeping, should not really be here
505 do_specials (); /* Routines called from time to time. */ 418 do_specials (); /* Routines called from time to time. */
506 attachable::check_mortals (); 419 attachable::check_mortals ();
507 420
508 ++pticks; 421 ++pticks;
509}
510 422
511#if 0 423 if (object::object_count >= RESTART_COUNT)
512// used fro benchmarking (x86/amd64-specific) 424 cleanup ("running out of protocol ID values - need full restart");
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} 425}
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
537int
538main (int argc, char **argv)
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 426
559// normal main 427// normal main
560int 428int
561main (int argc, char **argv) 429main (int argc, char **argv)
562{ 430{
563 settings.argc = argc; 431 settings.argc = argc;
564 settings.argv = argv; 432 settings.argv = argv;
565 433
434 rndm.seed (time (0));
435 g_thread_init (0); // for the slice allocator only
436
437#if 0
438 extern void hack(); hack ();//D
439#endif
440
441#if 0
442 // code sometiems used for timing benchmarks
443 random_number_generator<freeciv_random_generator> rng;
444 rng.seed(0);
445 for (int i = 0; i < 10; ++i)
446 printf ("%08x\n", rng.get_u32());
447 for (int i = 0; i < 1000000; ++i)
448 volatile int r = rng.get_u32 ();
449 cstamp s = stamp ();
450 for (int i = 0; i < 1000000; ++i)
451 volatile int r = rng.next ();
452 printf ("c %d\n", (int)measure (s));
453 exit (0);
454#endif
455
566 init (argc, argv); 456 init (argc, argv);
567
568 initPlugins ();
569 457
570 for (;;) 458 for (;;)
571 cfperl_main (); 459 cfperl_main ();
572} 460}
573#endif
574 461

Diff Legend

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