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.133 by root, Mon Sep 29 10:31:32 2008 UTC vs.
Revision 1.180 by root, Sat Nov 17 23:40:04 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / 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 * Deliantra 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 <support@deliantra.net> 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>
… …
28#include <sproto.h> 30#include <sproto.h>
29#include <time.h> 31#include <time.h>
30 32
31#include <glib.h> 33#include <glib.h>
32 34
33#include <../random_maps/random_map.h> 35#include <rmg.h>
34#include <../random_maps/rproto.h> 36#include <rproto.h>
35#include "path.h" 37#include "path.h"
36
37static char days[7][4] = {
38 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
39};
40 38
41void 39void
42version (object *op) 40version (object *op)
43{ 41{
44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
45
46#if 0
47 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
48 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
51 new_draw_info (NDI_UNIQUE, 0, op, "");
52 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
53 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
54 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
55 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
56 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
59 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
60 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
88 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
90 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
91 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
92 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
93 new_draw_info (NDI_UNIQUE, 0, op, "");
94 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
95 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
96 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
97 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
103} 43}
104 44
105/* 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
106 * savebed. We do some error checking - its possible that the 46 * savebed.
107 * savebed map may no longer exist, so we make sure the player
108 * goes someplace.
109 */ 47 */
110void 48void
111enter_player_savebed (object *op) 49enter_player_savebed (object *op)
112{ 50{
113 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y); 51 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
… …
118 * 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
119 * 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
120 * whatever reason. If default map coordinates are to be used, then 58 * whatever reason. If default map coordinates are to be used, then
121 * the function that calls this should figure them out. 59 * the function that calls this should figure them out.
122 */ 60 */
123void 61bool
124object::enter_map (maptile *newmap, int x, int y) 62object::enter_map (maptile *newmap, int x, int y)
125{ 63{
126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) 64 if (destroyed () || !newmap || !newmap->linkable ())
127 return; 65 return false;
128 66
129 if (out_of_map (newmap, x, y)) 67 if (out_of_map (newmap, x, y))
130 { 68 {
131 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);
132 x = newmap->enter_x; 70 x = newmap->enter_x;
… …
134 if (out_of_map (newmap, x, y)) 72 if (out_of_map (newmap, x, y))
135 { 73 {
136 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",
137 &newmap->path, x, y, newmap->width, newmap->height); 75 &newmap->path, x, y, newmap->width, newmap->height);
138 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 76 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
139 return; 77 return false;
140 } 78 }
141 } 79 }
142 80
143 if (contr && map != newmap && map) 81 if (contr && map != newmap && map)
144 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 82 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
145 return; 83 return false;
146 84
147 // remove, so stupid ob_locked does not trigger a failure 85 // remove, so stupid blocked does not trigger a failure
148 remove (); 86 remove ();
149 87
150 /* try to find a spot for the player */ 88 /* try to find a spot for the player */
151 if (blocked (newmap, x, y)) 89 if (blocked (newmap, x, y))
152 { /* First choice blocked */ 90 { /* First choice blocked */
… …
157 * 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
158 * 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.
159 */ 97 */
160 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);
161 99
162 if (i == -1) 100 if (i < 0)
163 { 101 {
164 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 102 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
165 if (i == -1) 103 if (i < 0)
166 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 104 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
167 } 105 }
168 106
169 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))
170 { 114 {
171 x += freearr_x[i]; 115 newmap = m;
172 y += freearr_y[i]; 116 x = nx;
117 y = ny;
118 }
173 } 119 }
174 else 120 else
175 /* not much we can do in this case. */ 121 /* not much we can do in this case. */
176 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);
177 } 123 }
178 124
179 if (contr && map != newmap) 125 if (contr && map != newmap)
180 { 126 {
181 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)))
182 return; 128 return false;
183 129
184 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)))
185 return; 131 return false;
186 } 132 }
187
188 this->x = x;
189 this->y = y;
190 map = newmap;
191
192 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
193 133
194 enemy = 0; 134 enemy = 0;
195 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 {
196 if (contr) 143 if (contr)
197 { 144 {
198 contr->maplevel = newmap->path; 145 contr->maplevel = newmap->path;
199 contr->count = 0; 146 contr->count = 0;
200 }
201 147
202 /* Update any golems */ 148 /* Update any golems */
203 if (type == PLAYER)
204 if (object *golem = contr->golem) 149 if (object *golem = contr->golem)
205 { 150 {
206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 151 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
207 152
208 if (i < 0) 153 if (i < 0)
209 golem->drop_and_destroy (); 154 golem->drop_and_destroy ();
210 else 155 else
211 { 156 {
212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 157 newmap->insert (golem, x + DIRX (i), y + DIRY (i));
213 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 158 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
159 }
214 } 160 }
215 } 161 }
216 162
217 /* 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
218 * about pending objects. 164 * about pending objects.
219 */ 165 */
220 remove_all_pets (newmap); 166 move_all_pets ();
167
168 return true;
169 }
170
171 return false;
221} 172}
222 173
223/* process_players1 and process_players2 do all the player related stuff. 174/* process_players1 and process_players2 do all the player related stuff.
224 * 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
225 * 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
… …
248 199
249 for_all_players (pl) 200 for_all_players (pl)
250 { 201 {
251 object *ob = pl->ob; 202 object *ob = pl->ob;
252 203
204 // process_objects destroys the speed_left value
205 pl->speed_left_save = ob->speed_left;
206
253 if (expect_false (!ob || !pl->ns || !ob->active)) 207 if (expect_false (!ob || !pl->ns || !ob->active))
254 continue; 208 continue;
255 209
256 do_some_living (ob); 210 do_some_living (ob);
257 } 211 }
… …
261process_players2 () 215process_players2 ()
262{ 216{
263 /* 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 */
264 for_all_players (pl) 218 for_all_players (pl)
265 { 219 {
220 // restore speed_left value saved by process_players1
221 pl->ob->speed_left = pl->speed_left_save;
222
266 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);
267 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);
268 } 225 }
269} 226}
270 227
271void 228static void
272process_events () 229process_events ()
273{ 230{
274 process_players1 (); 231 process_players1 ();
275 232
276 for_all_actives (op) 233 for_all_actives (op)
277 { 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
278 /* Now process op */ 249 /* Now process op */
279 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 250 if (expect_false (op->flag [FLAG_FREED]))
280 { 251 {
281 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 ());
282 op->set_speed (0); 253 op->set_speed (0);
283 continue; 254 continue;
284 } 255 }
285 256
286 if (expect_false (!op->has_active_speed ())) 257 if (expect_false (!op->has_active_speed ()))
… …
314 { 285 {
315 --op->speed_left; 286 --op->speed_left;
316 process_object (op); 287 process_object (op);
317 } 288 }
318 289
319 if (expect_true (!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.
320 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);
321 } 294 }
322 295
323 process_players2 (); 296 process_players2 ();
324} 297}
325 298
326/* clean up everything before exiting */ 299/* clean up everything before exiting */
327void 300void
328emergency_save () 301emergency_save ()
329{ 302{
330 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 ();
331 307
332 cfperl_emergency_save (); 308 cfperl_emergency_save ();
333 309
334 LOG (llevDebug, "saving book archive.\n");
335 write_book_archive ();
336
337 LOG (llevDebug, "emergency save done.\n"); 310 LOG (llevInfo, "emergency_save: leave\n");
338} 311}
339 312
340// send all clients some informational text 313// send all clients some informational text
341static void 314static void
342cleanup_inform (const char *cause, bool make_core) 315cleanup_inform (const char *cause, bool make_core)
… …
361cleanup (const char *cause, bool make_core) 334cleanup (const char *cause, bool make_core)
362{ 335{
363 if (make_core) 336 if (make_core)
364 fork_abort (cause); 337 fork_abort (cause);
365 338
366 LOG (llevError, "cleanup cause: %s\n", cause); 339 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
367 340
368 if (!make_core) 341 if (!make_core)
369 cleanup_inform (cause, make_core); 342 cleanup_inform (cause, make_core);
370 343
371 LOG (llevDebug, "cleanup begin.\n"); 344 LOG (llevDebug, "cleanup begin.\n");
… …
398 _exit (make_core); 371 _exit (make_core);
399} 372}
400 373
401/* 374/*
402 * 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.
403 * 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
404 * 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.
405 * 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
406 * 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
407 * 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
408 * 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
409 * done on the same tick, but that will happen very infrequently 382 * done on the same tick, but that will happen very infrequently
410 * 383 *
411 * 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
412 * doing the various things. 385 * doing the various things.
413 */ 386 */
414void 387static void
415do_specials (void) 388do_specials ()
416{ 389{
417 shstr::gc (); 390 shstr::gc ();
418 archetype::gc (); 391 archetype::gc ();
419 392
420 if (expect_false (!(pticks % TICKS_PER_HOUR))) 393 if (expect_false (!(server_tick % TICKS_PER_HOUR)))
421 adjust_daylight (); 394 maptile::adjust_daylight ();
422 395
423 if (expect_false (!(pticks % 2503))) 396 if (expect_false (!(server_tick % 2503)))
424 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 397 fix_weight (); /* Hack to fix weightproblems caused by bugs */
425 398
426 if (expect_false (!(pticks % 5003))) 399 if (expect_false (!(server_tick % 5003)))
427 write_book_archive (); 400 write_book_archive ();
428 401
429 if (expect_false (!(pticks % 5009))) 402 if (expect_false (!(server_tick % 5009)))
430 clean_friendly_list (); 403 clean_friendly_list ();
431 404
432 if (expect_false (!(pticks % 5011))) 405 if (expect_false (!(server_tick % 5011)))
433 obsolete_parties (); 406 obsolete_parties ();
434 407
435 if (expect_false (!(pticks % 12503))) 408 if (expect_false (!(server_tick % 12503)))
436 fix_luck (); 409 fix_luck ();
437} 410}
438 411
439void 412void
440server_tick () 413one_tick ()
441{ 414{
442 // first do the user visible stuff 415 // first do the user visible stuff
443 INVOKE_GLOBAL (CLOCK); 416 INVOKE_GLOBAL (CLOCK);
444 process_events (); // "do" something with objects with speed 417 process_events (); // "do" something with objects with speed
445 client::clock (); // draw client maps etc. 418 client::clock (); // draw client maps etc.
446 419
447 // then do some bookkeeping, should not really be here 420 // then do some bookkeeping, should not really be here
448 do_specials (); /* Routines called from time to time. */ 421 do_specials (); /* Routines called from time to time. */
449 attachable::check_mortals (); 422 attachable::check_mortals ();
450 423
451 ++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");
452} 427}
453
454#if 0
455// used fro benchmarking (x86/amd64-specific)
456typedef unsigned long tval;
457typedef unsigned long long stamp64;
458
459extern inline tval
460stamp (void)
461{
462 tval tsc;
463 asm volatile ("rdtsc":"=a" (tsc)::"edx");
464
465 return tsc;
466}
467
468extern inline tval
469measure (tval t)
470{
471 tval tsc;
472 asm volatile ("rdtsc":"=a" (tsc)::"edx");
473
474 if (tsc > t)
475 return tsc - t;
476 else
477 return t - tsc;
478}
479
480int
481main (int argc, char **argv)
482{
483 rand_gen rg(0);
484 tval fastest = 0x7fffffff;
485 for (int loop = 10000; loop--; )
486 {
487 tval s = stamp ();
488 volatile int i = rg.get_int(25);
489 fastest = min (fastest, measure (s));
490 }
491
492 //printf ("fastest %d\n", fastest);
493 for (int i = 0; i < 1024*1024*3; ++i)
494 {
495 char c = rg.get_int (256);
496 write (2, &c, 1);
497 }
498}
499
500#else
501
502#if 0 // just goofing around, look elsewhere
503
504#include <malloc.h>
505#include <execinfo.h>
506
507static void tr_on ();
508static void tr_off ();
509
510static SMUTEX(tr_mutex);
511
512#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
513#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
514
515static void *
516tr_malloc (size_t size, const void *caller)
517{
518 ltr_off ();
519
520 void *bt [8];
521 backtrace (bt, 8);
522
523 void *ptr = malloc (size);
524
525 ltr_on ();
526 return (char *)ptr;
527}
528
529static void
530tr_free (void *ptr, const void *caller)
531{
532 ltr_off ();
533
534 free (ptr);
535
536 ltr_on ();
537}
538
539void static *
540tr_realloc (void *ptr, size_t size, const void *caller)
541{
542 ltr_off ();
543
544 void *nptr = realloc (ptr, size);
545
546 ltr_on ();
547 return nptr;
548}
549
550static void *
551tr_memalign (size_t size, size_t alignment, const void *caller)
552{
553 ltr_off ();
554
555 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
556
557 ltr_on ();
558 return ptr;
559}
560
561static void
562tr_on ()
563{
564 __malloc_hook = tr_malloc;
565 __realloc_hook = tr_realloc;
566 __free_hook = tr_free;
567 __memalign_hook = tr_memalign;
568}
569
570static void
571tr_off ()
572{
573 __malloc_hook = 0;
574 __realloc_hook = 0;
575 __free_hook = 0;
576 __memalign_hook = 0;
577}
578
579void (*__malloc_initialize_hook)(void) = tr_on;
580
581#endif
582 428
583// normal main 429// normal main
584int 430int
585main (int argc, char **argv) 431main (int argc, char **argv)
586{ 432{
587 settings.argc = argc; 433 settings.argc = argc;
588 settings.argv = argv; 434 settings.argv = argv;
589 435
590 g_thread_init (0); // for the slice allocator only 436 rndm.seed (time (0));
591 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
592 init (argc, argv); 461 init (argc, argv);
593 462
594 for (;;) 463 for (;;)
595 cfperl_main (); 464 cfperl_main ();
596} 465}
597#endif
598 466
599#if 0
600int xyzzy ()
601{
602 return rndm(8);
603}
604
605void xyzzy (object_ptr &a, object_ptr &o)
606{
607 asm volatile ("int3");
608 a = o;
609 asm volatile ("int3");
610}
611#endif
612

Diff Legend

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