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.117 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.170 by root, Sat Apr 23 06:35:55 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
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#include <sproto.h> 29#include <sproto.h>
29#include <time.h> 30#include <time.h>
30 31
31#include <../random_maps/random_map.h> 32#include <glib.h>
32#include <../random_maps/rproto.h> 33
34#include <rmg.h>
35#include <rproto.h>
33#include "path.h" 36#include "path.h"
34
35static char days[7][4] = {
36 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
37};
38 37
39void 38void
40version (object *op) 39version (object *op)
41{ 40{
42 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);
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} 42}
100 43
101/* 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
102 * savebed. We do some error checking - its possible that the 45 * savebed.
103 * savebed map may no longer exist, so we make sure the player
104 * goes someplace.
105 */ 46 */
106void 47void
107enter_player_savebed (object *op) 48enter_player_savebed (object *op)
108{ 49{
109 object *tmp = object::create (); 50 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} 51}
116 52
117/* 53/*
118 * 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
119 * 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
120 * 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
121 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
122 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
123 */ 59 */
124void 60bool
125object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
126{ 62{
127 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 63 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
128 return; 64 return false;
129 65
130 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
131 { 67 {
132 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);
133 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
135 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
136 { 72 {
137 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",
138 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
139 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
140 return; 76 return false;
141 } 77 }
142 } 78 }
143 79
144 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
145 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
146 return; 82 return false;
147 83
148 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
149 remove (); 85 remove ();
150 86
151 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
152 if (blocked (newmap, x, y)) 88 if (blocked (newmap, x, y))
153 { /* First choice blocked */ 89 { /* First choice blocked */
… …
158 * 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
159 * 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.
160 */ 96 */
161 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);
162 98
163 if (i == -1) 99 if (i < 0)
164 { 100 {
165 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
166 if (i == -1) 102 if (i < 0)
167 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
168 } 104 }
169 105
170 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))
171 { 113 {
172 x += freearr_x[i]; 114 newmap = m;
173 y += freearr_y[i]; 115 x = nx;
116 y = ny;
117 }
174 } 118 }
175 else 119 else
176 /* not much we can do in this case. */ 120 /* 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); 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);
178 } 122 }
179 123
180 if (contr && map != newmap) 124 if (contr && map != newmap)
181 { 125 {
182 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)))
183 return; 127 return false;
184 128
185 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)))
186 return; 130 return false;
187 } 131 }
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 132
195 enemy = 0; 133 enemy = 0;
196 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 {
197 if (contr) 140 if (contr)
198 { 141 {
199 contr->maplevel = newmap->path; 142 contr->maplevel = newmap->path;
200 contr->count = 0; 143 contr->count = 0;
201 }
202 144
203 /* Update any golems */ 145 /* Update any golems */
204 if (type == PLAYER)
205 if (object *golem = contr->golem) 146 if (object *golem = contr->golem)
206 { 147 {
207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 148 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
208 149
209 if (i < 0) 150 if (i < 0)
210 golem->destroy (); 151 golem->drop_and_destroy ();
211 else 152 else
212 { 153 {
213 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 154 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
214 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 155 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
156 }
215 } 157 }
216 } 158 }
217 159
218 /* 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
219 * about pending objects. 161 * about pending objects.
220 */ 162 */
221 remove_all_pets (newmap); 163 move_all_pets ();
164
165 return true;
166 }
167
168 return false;
222} 169}
223 170
224/* process_players1 and process_players2 do all the player related stuff. 171/* 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 172 * 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 173 * extent for debugging as well as to get a better idea of the time used
… …
249 196
250 for_all_players (pl) 197 for_all_players (pl)
251 { 198 {
252 object *ob = pl->ob; 199 object *ob = pl->ob;
253 200
201 // process_objects destroys the speed_left value
202 pl->speed_left_save = ob->speed_left;
203
254 if (expect_false (!ob || !pl->ns || !ob->active)) 204 if (expect_false (!ob || !pl->ns || !ob->active))
255 continue; 205 continue;
256 206
257 do_some_living (ob); 207 do_some_living (ob);
258 } 208 }
… …
262process_players2 () 212process_players2 ()
263{ 213{
264 /* 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 */
265 for_all_players (pl) 215 for_all_players (pl)
266 { 216 {
217 // restore speed_left value saved by process_players1
218 pl->ob->speed_left = pl->speed_left_save;
219
267 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);
268 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);
269 } 222 }
270} 223}
271 224
272void 225static void
273process_events () 226process_events ()
274{ 227{
275 process_players1 (); 228 process_players1 ();
276 229
277 for_all_actives (op) 230 for_all_actives (op)
278 { 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
279 /* Now process op */ 246 /* Now process op */
280 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 247 if (expect_false (op->flag [FLAG_FREED]))
281 { 248 {
282 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 ());
283 op->set_speed (0); 250 op->set_speed (0);
284 continue; 251 continue;
285 } 252 }
286 253
287 if (expect_false (!op->has_active_speed ())) 254 if (expect_false (!op->has_active_speed ()))
… …
309 op->last_anim = 1; 276 op->last_anim = 1;
310 } 277 }
311 else 278 else
312 ++op->last_anim; 279 ++op->last_anim;
313 280
314 if (op->speed_left > 0.f) 281 if (expect_false (op->speed_left > 0.f))
315 { 282 {
316 --op->speed_left; 283 --op->speed_left;
317 process_object (op); 284 process_object (op);
318
319 if (op->destroyed ())
320 continue;
321 } 285 }
322 286
323 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.
324 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);
325 } 291 }
326 292
327 process_players2 (); 293 process_players2 ();
328} 294}
329 295
330/* clean up everything before exiting */ 296/* clean up everything before exiting */
331void 297void
332emergency_save () 298emergency_save ()
333{ 299{
334 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 ();
335 304
336 cfperl_emergency_save (); 305 cfperl_emergency_save ();
337 306
338 LOG (llevDebug, "saving book archive.\n");
339 write_book_archive ();
340
341 LOG (llevDebug, "emergency save done.\n"); 307 LOG (llevInfo, "emergency_save: leave\n");
342} 308}
343 309
344// send all clients some informational text 310// send all clients some informational text
345static void 311static void
346cleanup_inform (const char *cause, bool make_core) 312cleanup_inform (const char *cause, bool make_core)
… …
365cleanup (const char *cause, bool make_core) 331cleanup (const char *cause, bool make_core)
366{ 332{
367 if (make_core) 333 if (make_core)
368 fork_abort (cause); 334 fork_abort (cause);
369 335
370 LOG (llevError, "cleanup cause: %s\n", cause); 336 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
371 337
372 if (!make_core) 338 if (!make_core)
373 cleanup_inform (cause, make_core); 339 cleanup_inform (cause, make_core);
374 340
375 LOG (llevDebug, "cleanup begin.\n"); 341 LOG (llevDebug, "cleanup begin.\n");
… …
385 LOG (llevDebug, "running cleanup handlers.\n"); 351 LOG (llevDebug, "running cleanup handlers.\n");
386 INVOKE_GLOBAL (CLEANUP); 352 INVOKE_GLOBAL (CLEANUP);
387 353
388 LOG (llevDebug, "cleanup done.\n"); 354 LOG (llevDebug, "cleanup done.\n");
389 355
356 log_cleanup ();
357
390 if (make_core) 358 if (make_core)
391 {
392 cleanup_inform (cause, make_core); 359 cleanup_inform (cause, make_core);
393 cfperl_cleanup (make_core);
394 _exit (1);
395 }
396 else 360 else
397 { 361 {
398 new_draw_info_format (NDI_REPLY | 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.");
399 new_draw_info_format (NDI_REPLY | 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);
400 client::flush_sockets (); 364 client::flush_sockets ();
365 }
366
401 cfperl_cleanup (make_core); 367 cfperl_cleanup (make_core);
402 _exit (0); 368 _exit (make_core);
403 }
404} 369}
405 370
406/* 371/*
407 * 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.
408 * 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
… …
414 * done on the same tick, but that will happen very infrequently 379 * done on the same tick, but that will happen very infrequently
415 * 380 *
416 * 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
417 * doing the various things. 382 * doing the various things.
418 */ 383 */
419void 384static void
420do_specials (void) 385do_specials ()
421{ 386{
387 shstr::gc ();
388 archetype::gc ();
389
422 if (expect_false (!(pticks % TICKS_PER_HOUR))) 390 if (expect_false (!(pticks % TICKS_PER_HOUR)))
423 adjust_daylight (); 391 maptile::adjust_daylight ();
424
425 if (expect_false (!(pticks % 7)))
426 shstr::gc ();
427 392
428 if (expect_false (!(pticks % 2503))) 393 if (expect_false (!(pticks % 2503)))
429 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 394 fix_weight (); /* Hack to fix weightproblems caused by bugs */
430 395
431 if (expect_false (!(pticks % 5003))) 396 if (expect_false (!(pticks % 5003)))
… …
452 // then do some bookkeeping, should not really be here 417 // then do some bookkeeping, should not really be here
453 do_specials (); /* Routines called from time to time. */ 418 do_specials (); /* Routines called from time to time. */
454 attachable::check_mortals (); 419 attachable::check_mortals ();
455 420
456 ++pticks; 421 ++pticks;
457}
458 422
459#if 0 423 if (object::object_count >= RESTART_COUNT)
460// used fro benchmarking (x86/amd64-specific) 424 cleanup ("running out of protocol ID values - need full restart");
461typedef unsigned long tval;
462typedef unsigned long long stamp64;
463
464extern inline tval
465stamp (void)
466{
467 tval tsc;
468 asm volatile ("rdtsc":"=a" (tsc)::"edx");
469
470 return tsc;
471} 425}
472
473extern inline tval
474measure (tval t)
475{
476 tval tsc;
477 asm volatile ("rdtsc":"=a" (tsc)::"edx");
478
479 if (tsc > t)
480 return tsc - t;
481 else
482 return t - tsc;
483}
484
485int
486main (int argc, char **argv)
487{
488 rand_gen rg(0);
489 tval fastest = 0x7fffffff;
490 for (int loop = 10000; loop--; )
491 {
492 tval s = stamp ();
493 volatile int i = rg.get_int(25);
494 fastest = min (fastest, measure (s));
495 }
496
497 //printf ("fastest %d\n", fastest);
498 for (int i = 0; i < 1024*1024*3; ++i)
499 {
500 char c = rg.get_int (256);
501 write (2, &c, 1);
502 }
503}
504
505#else
506 426
507// normal main 427// normal main
508int 428int
509main (int argc, char **argv) 429main (int argc, char **argv)
510{ 430{
511 settings.argc = argc; 431 settings.argc = argc;
512 settings.argv = argv; 432 settings.argv = argv;
513 433
434 rndm.seed (time (0));
435 g_thread_init (0); // for the slice allocator only
436
437 // temporary(?) testing hack
438 if (argc >= 2 && !strcmp (argv [1], "--noise"))
439 {
440 void noise_test ();
441 noise_test ();
442 exit (0);
443 }
444
445#if 0
446 // code sometiems used for timing benchmarks
447 random_number_generator<freeciv_random_generator> rng;
448 rng.seed(0);
449 for (int i = 0; i < 10; ++i)
450 printf ("%08x\n", rng.get_u32());
451 for (int i = 0; i < 1000000; ++i)
452 volatile int r = rng.get_u32 ();
453 cstamp s = stamp ();
454 for (int i = 0; i < 1000000; ++i)
455 volatile int r = rng.next ();
456 printf ("c %d\n", (int)measure (s));
457 exit (0);
458#endif
459
514 init (argc, argv); 460 init (argc, argv);
515
516 initPlugins ();
517 461
518 for (;;) 462 for (;;)
519 cfperl_main (); 463 cfperl_main ();
520} 464}
521#endif
522 465
523#if 0
524int xyzzy ()
525{
526 return rndm(8);
527}
528
529void xyzzy (object_ptr &a, object_ptr &o)
530{
531 asm volatile ("int3");
532 a = o;
533 asm volatile ("int3");
534}
535#endif
536

Diff Legend

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