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.124 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 2010 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 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 * Deliantra 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 <support@deliantra.net> 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>
… …
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
32#include <glib.h>
33
31#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
32#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
33#include "path.h" 36#include "path.h"
34 37
35static char days[7][4] = {
36 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
37};
38
39void 38void
40version (object *op) 39version (object *op)
41{ 40{
42 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
43
44#if 0
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#endif
101} 42}
102 43
103/* 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
104 * savebed. We do some error checking - its possible that the 45 * savebed.
105 * savebed map may no longer exist, so we make sure the player
106 * goes someplace.
107 */ 46 */
108void 47void
109enter_player_savebed (object *op) 48enter_player_savebed (object *op)
110{ 49{
111 object *tmp = object::create (); 50 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
112 EXIT_PATH (tmp) = op->contr->savebed_map;
113 EXIT_X (tmp) = op->contr->bed_x;
114 EXIT_Y (tmp) = op->contr->bed_y;
115 op->enter_exit (tmp);
116 tmp->destroy ();
117} 51}
118 52
119/* 53/*
120 * 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
121 * 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
122 * 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
123 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
124 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
125 */ 59 */
126void 60bool
127object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
128{ 62{
129 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE) 63 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
130 return; 64 return false;
131 65
132 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
133 { 67 {
134 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);
135 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
137 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
138 { 72 {
139 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",
140 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
141 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
142 return; 76 return false;
143 } 77 }
144 } 78 }
145 79
146 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
147 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
148 return; 82 return false;
149 83
150 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
151 remove (); 85 remove ();
152 86
153 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
154 if (blocked (newmap, x, y)) 88 if (blocked (newmap, x, y))
155 { /* First choice blocked */ 89 { /* First choice blocked */
… …
160 * 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
161 * 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.
162 */ 96 */
163 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);
164 98
165 if (i == -1) 99 if (i < 0)
166 { 100 {
167 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
168 if (i == -1) 102 if (i < 0)
169 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
170 } 104 }
171 105
172 if (i != -1) 106 if (i >= 0)
173 { 107 {
174 x += freearr_x[i]; 108 x += freearr_x[i];
175 y += freearr_y[i]; 109 y += freearr_y[i];
176 } 110 }
177 else 111 else
… …
180 } 114 }
181 115
182 if (contr && map != newmap) 116 if (contr && map != newmap)
183 { 117 {
184 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 118 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
185 return; 119 return false;
186 120
187 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 121 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
188 return; 122 return false;
189 } 123 }
190
191 this->x = x;
192 this->y = y;
193 map = newmap;
194
195 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
196 124
197 enemy = 0; 125 enemy = 0;
198 126
127 //newmap->insert (this, x, y);
128 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
129
130 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
131 {
199 if (contr) 132 if (contr)
200 { 133 {
201 contr->maplevel = newmap->path; 134 contr->maplevel = newmap->path;
202 contr->count = 0; 135 contr->count = 0;
203 }
204 136
205 /* Update any golems */ 137 /* Update any golems */
206 if (type == PLAYER)
207 if (object *golem = contr->golem) 138 if (object *golem = contr->golem)
208 { 139 {
209 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 140 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
210 141
211 if (i < 0) 142 if (i < 0)
212 golem->destroy (); 143 golem->drop_and_destroy ();
213 else 144 else
214 { 145 {
215 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 146 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
216 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 147 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
148 }
217 } 149 }
218 } 150 }
219 151
220 /* since the players map is already loaded, we don't need to worry 152 /* since the players map is already loaded, we don't need to worry
221 * about pending objects. 153 * about pending objects.
222 */ 154 */
223 remove_all_pets (newmap); 155 move_all_pets ();
156
157 return true;
158 }
159
160 return false;
224} 161}
225 162
226/* process_players1 and process_players2 do all the player related stuff. 163/* process_players1 and process_players2 do all the player related stuff.
227 * I moved it out of process events and process_map. This was to some 164 * I moved it out of process events and process_map. This was to some
228 * extent for debugging as well as to get a better idea of the time used 165 * extent for debugging as well as to get a better idea of the time used
… …
251 188
252 for_all_players (pl) 189 for_all_players (pl)
253 { 190 {
254 object *ob = pl->ob; 191 object *ob = pl->ob;
255 192
193 // process_objects destroys the speed_left value
194 pl->speed_left_save = ob->speed_left;
195
256 if (expect_false (!ob || !pl->ns || !ob->active)) 196 if (expect_false (!ob || !pl->ns || !ob->active))
257 continue; 197 continue;
258 198
259 do_some_living (ob); 199 do_some_living (ob);
260 } 200 }
… …
264process_players2 () 204process_players2 ()
265{ 205{
266 /* Then check if any players should use weapon-speed instead of speed */ 206 /* Then check if any players should use weapon-speed instead of speed */
267 for_all_players (pl) 207 for_all_players (pl)
268 { 208 {
209 // restore speed_left value saved by process_players1
210 pl->ob->speed_left = pl->speed_left_save;
211
269 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); 212 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
270 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 213 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
271 } 214 }
272} 215}
273 216
274void 217static void
275process_events () 218process_events ()
276{ 219{
277 process_players1 (); 220 process_players1 ();
278 221
279 for_all_actives (op) 222 for_all_actives (op)
280 { 223 {
224 // try to prefetch some stuff we expect to need
225 // obviously, it should be grouped into the same cacheline.
226 // preliminary results indicate that this gives halves the speed
227 // used for the inner loop
228 if (_i < actives.size ()) // HACK, rely on _i :/
229 {
230 object *next = actives [_i + 1];
231
232 prefetch (&next->flag , 0, 1);
233 prefetch (&next->speed , 0, 1);
234 prefetch (&next->anim_speed, 0, 1);
235 prefetch (&next->contr , 0, 1);
236 }
237
281 /* Now process op */ 238 /* Now process op */
282 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 239 if (expect_false (op->flag [FLAG_FREED]))
283 { 240 {
284 LOG (llevError, "BUG: process_events(): Free object on list\n"); 241 LOG (llevError, "BUG: process_events(): Free object on list\n");
285 op->set_speed (0); 242 op->set_speed (0);
286 continue; 243 continue;
287 } 244 }
… …
311 op->last_anim = 1; 268 op->last_anim = 1;
312 } 269 }
313 else 270 else
314 ++op->last_anim; 271 ++op->last_anim;
315 272
316 if (op->speed_left > 0.f) 273 if (expect_false (op->speed_left > 0.f))
317 { 274 {
318 --op->speed_left; 275 --op->speed_left;
319 process_object (op); 276 process_object (op);
320
321 if (op->destroyed ())
322 continue;
323 } 277 }
324 278
325 if (!op->contr) 279 // this will destroy the speed_left value for players, but
280 // process_players1 and ..2 save/restore the real value,
281 // so we can avoid a costly test here.
326 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 282 op->speed_left = min (op->speed, op->speed_left + op->speed);
327 } 283 }
328 284
329 process_players2 (); 285 process_players2 ();
330} 286}
331 287
332/* clean up everything before exiting */ 288/* clean up everything before exiting */
333void 289void
334emergency_save () 290emergency_save ()
335{ 291{
336 LOG (llevDebug, "emergency save begin.\n"); 292 LOG (llevInfo, "emergency_save: enter\n");
293
294 LOG (llevInfo, "emergency_save: saving book archive\n");
295 write_book_archive ();
337 296
338 cfperl_emergency_save (); 297 cfperl_emergency_save ();
339 298
340 LOG (llevDebug, "saving book archive.\n");
341 write_book_archive ();
342
343 LOG (llevDebug, "emergency save done.\n"); 299 LOG (llevInfo, "emergency_save: leave\n");
344} 300}
345 301
346// send all clients some informational text 302// send all clients some informational text
347static void 303static void
348cleanup_inform (const char *cause, bool make_core) 304cleanup_inform (const char *cause, bool make_core)
… …
367cleanup (const char *cause, bool make_core) 323cleanup (const char *cause, bool make_core)
368{ 324{
369 if (make_core) 325 if (make_core)
370 fork_abort (cause); 326 fork_abort (cause);
371 327
372 LOG (llevError, "cleanup cause: %s\n", cause); 328 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
373 329
374 if (!make_core) 330 if (!make_core)
375 cleanup_inform (cause, make_core); 331 cleanup_inform (cause, make_core);
376 332
377 LOG (llevDebug, "cleanup begin.\n"); 333 LOG (llevDebug, "cleanup begin.\n");
… …
390 LOG (llevDebug, "cleanup done.\n"); 346 LOG (llevDebug, "cleanup done.\n");
391 347
392 log_cleanup (); 348 log_cleanup ();
393 349
394 if (make_core) 350 if (make_core)
395 {
396 cleanup_inform (cause, make_core); 351 cleanup_inform (cause, make_core);
397 cfperl_cleanup (make_core);
398 _exit (1);
399 }
400 else 352 else
401 { 353 {
402 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting."); 354 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
403 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE); 355 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
404 client::flush_sockets (); 356 client::flush_sockets ();
357 }
358
405 cfperl_cleanup (make_core); 359 cfperl_cleanup (make_core);
406 _exit (0); 360 _exit (make_core);
407 }
408} 361}
409 362
410/* 363/*
411 * do_specials() is a collection of functions to call from time to time. 364 * do_specials() is a collection of functions to call from time to time.
412 * Modified 2000-1-14 MSW to use the global pticks count to determine how 365 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
418 * done on the same tick, but that will happen very infrequently 371 * done on the same tick, but that will happen very infrequently
419 * 372 *
420 * I also think this code makes it easier to see how often we really are 373 * I also think this code makes it easier to see how often we really are
421 * doing the various things. 374 * doing the various things.
422 */ 375 */
423void 376static void
424do_specials (void) 377do_specials ()
425{ 378{
426 shstr::gc (); 379 shstr::gc ();
380 archetype::gc ();
427 381
428 if (expect_false (!(pticks % TICKS_PER_HOUR))) 382 if (expect_false (!(pticks % TICKS_PER_HOUR)))
429 adjust_daylight (); 383 maptile::adjust_daylight ();
430 384
431 if (expect_false (!(pticks % 2503))) 385 if (expect_false (!(pticks % 2503)))
432 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 386 fix_weight (); /* Hack to fix weightproblems caused by bugs */
433 387
434 if (expect_false (!(pticks % 5003))) 388 if (expect_false (!(pticks % 5003)))
… …
455 // then do some bookkeeping, should not really be here 409 // then do some bookkeeping, should not really be here
456 do_specials (); /* Routines called from time to time. */ 410 do_specials (); /* Routines called from time to time. */
457 attachable::check_mortals (); 411 attachable::check_mortals ();
458 412
459 ++pticks; 413 ++pticks;
460}
461 414
462#if 0 415 if (object::object_count >= RESTART_COUNT)
463// used fro benchmarking (x86/amd64-specific) 416 cleanup ("running out of protocol ID values - need full restart");
464typedef unsigned long tval;
465typedef unsigned long long stamp64;
466
467extern inline tval
468stamp (void)
469{
470 tval tsc;
471 asm volatile ("rdtsc":"=a" (tsc)::"edx");
472
473 return tsc;
474} 417}
475
476extern inline tval
477measure (tval t)
478{
479 tval tsc;
480 asm volatile ("rdtsc":"=a" (tsc)::"edx");
481
482 if (tsc > t)
483 return tsc - t;
484 else
485 return t - tsc;
486}
487
488int
489main (int argc, char **argv)
490{
491 rand_gen rg(0);
492 tval fastest = 0x7fffffff;
493 for (int loop = 10000; loop--; )
494 {
495 tval s = stamp ();
496 volatile int i = rg.get_int(25);
497 fastest = min (fastest, measure (s));
498 }
499
500 //printf ("fastest %d\n", fastest);
501 for (int i = 0; i < 1024*1024*3; ++i)
502 {
503 char c = rg.get_int (256);
504 write (2, &c, 1);
505 }
506}
507
508#else
509 418
510// normal main 419// normal main
511int 420int
512main (int argc, char **argv) 421main (int argc, char **argv)
513{ 422{
514 settings.argc = argc; 423 settings.argc = argc;
515 settings.argv = argv; 424 settings.argv = argv;
425
426 rndm.seed (time (0));
427 g_thread_init (0); // for the slice allocator only
516 428
517 init (argc, argv); 429 init (argc, argv);
518 430
519 for (;;) 431 for (;;)
520 cfperl_main (); 432 cfperl_main ();
521} 433}
522#endif
523 434
524#if 0
525int xyzzy ()
526{
527 return rndm(8);
528}
529
530void xyzzy (object_ptr &a, object_ptr &o)
531{
532 asm volatile ("int3");
533 a = o;
534 asm volatile ("int3");
535}
536#endif
537

Diff Legend

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