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

Diff Legend

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