ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.109 by root, Sun Dec 31 22:23:12 2006 UTC vs.
Revision 1.157 by root, Wed Jan 10 01:16:54 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
57 61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 75mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 76mkdir $RANDOM_MAPS;
73 77
74# a special map that is always available 78# a special map that is always available
75our $LINK_MAP; 79our $LINK_MAP;
80our $EMERGENCY_POSITION;
76 81
77############################################################################# 82#############################################################################
78 83
79=head2 GLOBAL VARIABLES 84=head2 GLOBAL VARIABLES
80 85
104 109
105=item %cf::CFG 110=item %cf::CFG
106 111
107Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 113from wherever your confdir points to.
114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
109 121
110=back 122=back
111 123
112=cut 124=cut
113 125
117 utf8::encode $msg; 129 utf8::encode $msg;
118 130
119 $msg .= "\n" 131 $msg .= "\n"
120 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
121 133
122 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
123 }; 135 };
124} 136}
125 137
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
153 165
154=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
155 167
156=over 4 168=over 4
157 169
170=item dumpval $ref
171
158=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
159 192
160use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
161 194
162=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
163 196
178 211
179sub to_json($) { 212sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
182} 215}
216
217=item cf::lock_wait $string
218
219Wait until the given lock is available. See cf::lock_acquire.
220
221=item my $lock = cf::lock_acquire $string
222
223Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically
226returned.
227
228Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load).
230
231=cut
232
233our %LOCK;
234
235sub lock_wait($) {
236 my ($key) = @_;
237
238 # wait for lock, if any
239 while ($LOCK{$key}) {
240 push @{ $LOCK{$key} }, $Coro::current;
241 Coro::schedule;
242 }
243}
244
245sub lock_acquire($) {
246 my ($key) = @_;
247
248 # wait, to be sure we are not locked
249 lock_wait $key;
250
251 $LOCK{$key} = [];
252
253 Coro::guard {
254 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} };
256 }
257}
258
259sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active;
261
262 my $guard = Coro::guard { $TICK_WATCHER->start };
263 $TICK_WATCHER->stop;
264 $guard
265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
183 276
184=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
185 278
186The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
187always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
195=cut 288=cut
196 289
197sub sync_job(&) { 290sub sync_job(&) {
198 my ($job) = @_; 291 my ($job) = @_;
199 292
200 my $busy = 1;
201 my @res;
202
203 # TODO: use suspend/resume instead
204 local $FREEZE = 1;
205
206 my $coro = Coro::async {
207 @res = eval { $job->() };
208 warn $@ if $@;
209 undef $busy;
210 };
211
212 if ($Coro::current == $Coro::main) { 293 if ($Coro::current == $Coro::main) {
294 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/
296
297 # TODO: use suspend/resume instead
298 # (but this is cancel-safe)
299 my $freeze_guard = freeze_mainloop;
300
301 my $busy = 1;
302 my @res;
303
304 (async {
305 @res = eval { $job->() };
306 warn $@ if $@;
307 undef $busy;
213 $coro->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
309
214 while ($busy) { 310 while ($busy) {
215 Coro::cede_notself; 311 Coro::cede or Event::one_event;
216 Event::one_event unless Coro::nready;
217 } 312 }
313
314 wantarray ? @res : $res[0]
218 } else { 315 } else {
219 $coro->join; 316 # we are in another coroutine, how wonderful, everything just works
317
318 $job->()
220 } 319 }
221
222 wantarray ? @res : $res[0]
223} 320}
224 321
225=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
226 323
227Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
228when the extension calling this is being unloaded. 325extension calling this is being unloaded.
229 326
230=cut 327=cut
231 328
232sub coro(&) { 329sub async_ext(&) {
233 my $cb = shift; 330 my $cb = shift;
234 331
235 my $coro; $coro = async { 332 my $coro = &Coro::async ($cb);
236 eval {
237 $cb->();
238 };
239 warn $@ if $@;
240 };
241 333
242 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
243 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
244 }); 336 });
245 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
251 my $runtime = cf::localdir . "/runtime"; 343 my $runtime = cf::localdir . "/runtime";
252 344
253 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 345 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
254 or return; 346 or return;
255 347
256 my $value = $cf::RUNTIME; 348 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock
257 (aio_write $fh, 0, (length $value), $value, 0) <= 0 349 (aio_write $fh, 0, (length $value), $value, 0) <= 0
258 and return; 350 and return;
259 351
260 aio_fsync $fh 352 aio_fsync $fh
261 and return; 353 and return;
275 367
276############################################################################# 368#############################################################################
277 369
278package cf::path; 370package cf::path;
279 371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
374
280sub new { 375sub new {
281 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
282 377
378 $path = $path->as_string if ref $path;
379
283 my $self = bless { }, $class; 380 my $self = bless { }, $class;
284 381
382 # {... are special paths that are not touched
383 # ?xxx/... are special absolute paths
384 # ?random/... random maps
385 # /! non-realised random map exit
386 # /... normal maps
387 # ~/... per-player maps without a specific player (DO NOT USE)
388 # ~user/... per-player map of a specific user
389
390 if ($path =~ /^{/) {
391 # fine as it is
285 if ($path =~ s{^\?random/}{}) { 392 } elsif ($path =~ s{^\?random/}{}) {
286 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
287 $self->{random} = cf::from_json $data; 394 $self->{random} = cf::from_json $data;
288 } else { 395 } else {
289 if ($path =~ s{^~([^/]+)?}{}) { 396 if ($path =~ s{^~([^/]+)?}{}) {
290 $self->{user_rel} = 1; 397 $self->{user_rel} = 1;
335# } 442# }
336} 443}
337 444
338# escape the /'s in the path 445# escape the /'s in the path
339sub _escaped_path { 446sub _escaped_path {
340 # ∕ is U+2215
341 (my $path = $_[0]{path}) =~ s/\///g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
342 $path 448 $path
343} 449}
344 450
345# the original (read-only) location 451# the original (read-only) location
346sub load_path { 452sub load_path {
795 or return; 901 or return;
796 902
797 unless (aio_stat "$filename.pst") { 903 unless (aio_stat "$filename.pst") {
798 (aio_load "$filename.pst", $av) >= 0 904 (aio_load "$filename.pst", $av) >= 0
799 or return; 905 or return;
800 $av = eval { (Storable::thaw <$av>)->{objs} }; 906 $av = eval { (Storable::thaw $av)->{objs} };
801 } 907 }
802 908
909 warn sprintf "loading %s (%d)\n",
910 $filename, length $data, scalar @{$av || []};#d#
803 return ($data, $av); 911 return ($data, $av);
804} 912}
805 913
806############################################################################# 914#############################################################################
807# command handling &c 915# command handling &c
971}; 1079};
972 1080
973cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
974 1082
975############################################################################# 1083#############################################################################
976# load/save perl data associated with player->ob objects
977 1084
978sub all_objects(@) { 1085=head2 CORE EXTENSIONS
979 @_, map all_objects ($_->inv), @_
980}
981 1086
982# TODO: compatibility cruft, remove when no longer needed 1087Functions and methods that extend core crossfire objects.
983cf::player->attach ( 1088
984 on_load => sub { 1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1095=head3 cf::player
1096
1097=over 4
1098
1099=item cf::player::find $login
1100
1101Returns the given player object, loading it if necessary (might block).
1102
1103=cut
1104
1105sub playerdir($) {
1106 cf::localdir
1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1252}
1253
1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1255
1256Sends an ext reply to the player.
1257
1258=cut
1259
1260sub ext_reply($$$%) {
1261 my ($self, $id, %msg) = @_;
1262
1263 $msg{msgid} = $id;
1264
1265 $self->send ("ext " . cf::to_json \%msg);
1266}
1267
1268package cf;
1269
1270=back
1271
1272
1273=head3 cf::map
1274
1275=over 4
1276
1277=cut
1278
1279package cf::map;
1280
1281use Fcntl;
1282use Coro::AIO;
1283
1284our $MAX_RESET = 3600;
1285our $DEFAULT_RESET = 3000;
1286
1287sub generate_random_map {
1288 my ($path, $rmp) = @_;
1289
1290 # mit "rum" bekleckern, nicht
1291 cf::map::_create_random_map
1292 $path,
1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1296 $rmp->{exit_on_final_map},
1297 $rmp->{xsize}, $rmp->{ysize},
1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1303 (cf::region::find $rmp->{region})
1304}
1305
1306# and all this just because we cannot iterate over
1307# all maps in C++...
1308sub change_all_map_light {
1309 my ($change) = @_;
1310
1311 $_->change_map_light ($change)
1312 for grep $_->outdoor, values %cf::MAP;
1313}
1314
1315sub try_load_header($) {
985 my ($pl, $path) = @_; 1316 my ($path) = @_;
986 1317
987 for my $o (all_objects $pl->ob) { 1318 utf8::encode $path;
988 if (my $value = $o->get_ob_key_value ("_perl_data")) { 1319 aio_open $path, O_RDONLY, 0
989 $o->set_ob_key_value ("_perl_data"); 1320 or return;
990 1321
991 %$o = %{ Storable::thaw pack "H*", $value }; 1322 my $map = cf::map::new
1323 or return;
1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1328 $map->load_header ($path)
1329 or return;
1330
1331 $map->{load_path} = $path;
1332
1333 $map
1334}
1335
1336sub find;
1337sub find {
1338 my ($path, $origin) = @_;
1339
1340 #warn "find<$path,$origin>\n";#d#
1341
1342 $path = new cf::path $path, $origin && $origin->path;
1343 my $key = $path->as_string;
1344
1345 cf::lock_wait "map_find:$key";
1346
1347 $cf::MAP{$key} || do {
1348 my $guard = cf::lock_acquire "map_find:$key";
1349
1350 # do it the slow way
1351 my $map = try_load_header $path->save_path;
1352
1353 Coro::cede;
1354
1355 if ($map) {
1356 $map->last_access ((delete $map->{last_access})
1357 || $cf::RUNTIME); #d#
1358 # safety
1359 $map->{instantiate_time} = $cf::RUNTIME
1360 if $map->{instantiate_time} > $cf::RUNTIME;
1361 } else {
1362 if (my $rmp = $path->random_map_params) {
1363 $map = generate_random_map $key, $rmp;
1364 } else {
1365 $map = try_load_header $path->load_path;
992 } 1366 }
1367
1368 $map or return;
1369
1370 $map->{load_original} = 1;
1371 $map->{instantiate_time} = $cf::RUNTIME;
1372 $map->last_access ($cf::RUNTIME);
1373 $map->instantiate;
1374
1375 # per-player maps become, after loading, normal maps
1376 $map->per_player (0) if $path->{user_rel};
993 } 1377 }
1378
1379 $map->path ($key);
1380 $map->{path} = $path;
1381 $map->{last_save} = $cf::RUNTIME;
1382
1383 Coro::cede;
1384
1385 if ($map->should_reset) {
1386 $map->reset;
1387 undef $guard;
1388 $map = find $path
1389 or return;
1390 }
1391
1392 $cf::MAP{$key} = $map
994 }, 1393 }
995); 1394}
996 1395
997############################################################################# 1396sub load {
1397 my ($self) = @_;
998 1398
999=head2 CORE EXTENSIONS 1399 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1000 1401
1001Functions and methods that extend core crossfire objects. 1402 return if $self->in_memory != cf::MAP_SWAPPED;
1002 1403
1003=head3 cf::player 1404 $self->in_memory (cf::MAP_LOADING);
1405
1406 $self->alloc;
1407 $self->load_objects ($self->{load_path}, 1)
1408 or return;
1409
1410 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1411 if delete $self->{load_original};
1412
1413 if (my $uniq = $path->uniq_path) {
1414 utf8::encode $uniq;
1415 if (aio_open $uniq, O_RDONLY, 0) {
1416 $self->clear_unique_items;
1417 $self->load_objects ($uniq, 0);
1418 }
1419 }
1420
1421 Coro::cede;
1422
1423 # now do the right thing for maps
1424 $self->link_multipart_objects;
1425
1426 if ($self->{path}->is_style_map) {
1427 $self->{deny_save} = 1;
1428 $self->{deny_reset} = 1;
1429 } else {
1430 $self->fix_auto_apply;
1431 $self->decay_objects;
1432 $self->update_buttons;
1433 $self->set_darkness_map;
1434 $self->difficulty ($self->estimate_difficulty)
1435 unless $self->difficulty;
1436 $self->activate;
1437 }
1438
1439 Coro::cede;
1440
1441 $self->in_memory (cf::MAP_IN_MEMORY);
1442}
1443
1444# find and load all maps in the 3x3 area around a map
1445sub load_diag {
1446 my ($map) = @_;
1447
1448 my @diag; # diagonal neighbours
1449
1450 for (0 .. 3) {
1451 my $neigh = $map->tile_path ($_)
1452 or next;
1453 $neigh = find $neigh, $map
1454 or next;
1455 $neigh->load;
1456
1457 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1458 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1459 }
1460
1461 for (@diag) {
1462 my $neigh = find @$_
1463 or next;
1464 $neigh->load;
1465 }
1466}
1467
1468sub find_sync {
1469 my ($path, $origin) = @_;
1470
1471 cf::sync_job { find $path, $origin }
1472}
1473
1474sub do_load_sync {
1475 my ($map) = @_;
1476
1477 cf::sync_job { $map->load };
1478}
1479
1480our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async {
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1490 $map->load;
1491 }
1492 Coro::schedule;
1493 }
1494};
1495
1496sub find_async {
1497 my ($path, $origin) = @_;
1498
1499 $path = new cf::path $path, $origin && $origin->path;
1500 my $key = $path->as_string;
1501
1502 if (my $map = $cf::MAP{$key}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 }
1505
1506 $MAP_PREFETCH{$key} = $path;
1507 $MAP_PREFETCHER->ready;
1508
1509 ()
1510}
1511
1512sub save {
1513 my ($self) = @_;
1514
1515 my $lock = cf::lock_acquire "map_data:" . $self->path;
1516
1517 $self->{last_save} = $cf::RUNTIME;
1518
1519 return unless $self->dirty;
1520
1521 my $save = $self->{path}->save_path; utf8::encode $save;
1522 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1523
1524 $self->{load_path} = $save;
1525
1526 return if $self->{deny_save};
1527
1528 local $self->{last_access} = $self->last_access;#d#
1529
1530 cf::async {
1531 $_->contr->save for $self->players;
1532 };
1533
1534 if ($uniq) {
1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1536 $self->save_objects ($uniq, cf::IO_UNIQUES);
1537 } else {
1538 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1539 }
1540}
1541
1542sub swap_out {
1543 my ($self) = @_;
1544
1545 # save first because save cedes
1546 $self->save;
1547
1548 my $lock = cf::lock_acquire "map_data:" . $self->path;
1549
1550 return if $self->players;
1551 return if $self->in_memory != cf::MAP_IN_MEMORY;
1552 return if $self->{deny_save};
1553
1554 $self->clear;
1555 $self->in_memory (cf::MAP_SWAPPED);
1556}
1557
1558sub reset_at {
1559 my ($self) = @_;
1560
1561 # TODO: safety, remove and allow resettable per-player maps
1562 return 1e99 if $self->{path}{user_rel};
1563 return 1e99 if $self->{deny_reset};
1564
1565 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1566 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1567
1568 $time + $to
1569}
1570
1571sub should_reset {
1572 my ($self) = @_;
1573
1574 $self->reset_at <= $cf::RUNTIME
1575}
1576
1577sub unlink_save {
1578 my ($self) = @_;
1579
1580 utf8::encode (my $save = $self->{path}->save_path);
1581 aioreq_pri 3; IO::AIO::aio_unlink $save;
1582 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1583}
1584
1585sub rename {
1586 my ($self, $new_path) = @_;
1587
1588 $self->unlink_save;
1589
1590 delete $cf::MAP{$self->path};
1591 $self->{path} = new cf::path $new_path;
1592 $self->path ($self->{path}->as_string);
1593 $cf::MAP{$self->path} = $self;
1594
1595 $self->save;
1596}
1597
1598sub reset {
1599 my ($self) = @_;
1600
1601 my $lock = cf::lock_acquire "map_data:" . $self->path;
1602
1603 return if $self->players;
1604 return if $self->{path}{user_rel};#d#
1605
1606 warn "resetting map ", $self->path;#d#
1607
1608 delete $cf::MAP{$self->path};
1609
1610 $_->clear_links_to ($self) for values %cf::MAP;
1611
1612 $self->unlink_save;
1613 $self->destroy;
1614}
1615
1616my $nuke_counter = "aaaa";
1617
1618sub nuke {
1619 my ($self) = @_;
1620
1621 $self->{deny_save} = 1;
1622 $self->reset_timeout (1);
1623 $self->rename ("{nuke}/" . ($nuke_counter++));
1624 $self->reset; # polite request, might not happen
1625}
1626
1627sub customise_for {
1628 my ($map, $ob) = @_;
1629
1630 if ($map->per_player) {
1631 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1632 }
1633
1634 $map
1635}
1636
1637package cf;
1638
1639=back
1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1004 1646
1005=over 4 1647=over 4
1006 1648
1007=item cf::player::exists $login 1649=item $ob->inv_recursive
1008 1650
1009Returns true when the given account exists. 1651Returns the inventory of the object _and_ their inventories, recursively.
1010 1652
1011=cut 1653=cut
1012 1654
1013sub cf::player::exists($) { 1655sub inv_recursive_;
1014 cf::player::find $_[0] 1656sub inv_recursive_ {
1015 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1657 map { $_, inv_recursive_ $_->inv } @_
1016} 1658}
1017 1659
1018=item $player->ext_reply ($msgid, $msgtype, %msg) 1660sub inv_recursive {
1019 1661 inv_recursive_ inv $_[0]
1020Sends an ext reply to the player.
1021
1022=cut
1023
1024sub cf::player::ext_reply($$$%) {
1025 my ($self, $id, %msg) = @_;
1026
1027 $msg{msgid} = $id;
1028
1029 $self->send ("ext " . to_json \%msg);
1030} 1662}
1663
1664package cf;
1031 1665
1032=back 1666=back
1033 1667
1034=head3 cf::object::player 1668=head3 cf::object::player
1035 1669
1073 (ref $cf::CFG{"may_$access"} 1707 (ref $cf::CFG{"may_$access"}
1074 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1708 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1075 : $cf::CFG{"may_$access"}) 1709 : $cf::CFG{"may_$access"})
1076} 1710}
1077 1711
1712=item $player_object->enter_link
1713
1714Freezes the player and moves him/her to a special map (C<{link}>).
1715
1716The player should be reaosnably safe there for short amounts of time. You
1717I<MUST> call C<leave_link> as soon as possible, though.
1718
1719=item $player_object->leave_link ($map, $x, $y)
1720
1721Moves the player out of the specila link map onto the given map. If the
1722map is not valid (or omitted), the player will be moved back to the
1723location he/she was before the call to C<enter_link>, or, if that fails,
1724to the emergency map position.
1725
1726Might block.
1727
1728=cut
1729
1730sub cf::object::player::enter_link {
1731 my ($self) = @_;
1732
1733 $self->deactivate_recursive;
1734
1735 return if $self->map == $LINK_MAP;
1736
1737 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1738 if $self->map;
1739
1740 $self->enter_map ($LINK_MAP, 20, 20);
1741}
1742
1743sub cf::object::player::leave_link {
1744 my ($self, $map, $x, $y) = @_;
1745
1746 my $link_pos = delete $self->{_link_pos};
1747
1748 unless ($map) {
1749 # restore original map position
1750 ($map, $x, $y) = @{ $link_pos || [] };
1751 $map = cf::map::find $map;
1752
1753 unless ($map) {
1754 ($map, $x, $y) = @$EMERGENCY_POSITION;
1755 $map = cf::map::find $map
1756 or die "FATAL: cannot load emergency map\n";
1757 }
1758 }
1759
1760 ($x, $y) = (-1, -1)
1761 unless (defined $x) && (defined $y);
1762
1763 # use -1 or undef as default coordinates, not 0, 0
1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1765 if $x <=0 && $y <= 0;
1766
1767 $map->load;
1768 $map->load_diag;
1769
1770 return unless $self->contr->active;
1771 $self->activate_recursive;
1772 $self->enter_map ($map, $x, $y);
1773}
1774
1775cf::player->attach (
1776 on_logout => sub {
1777 my ($pl) = @_;
1778
1779 # abort map switching before logout
1780 if ($pl->ob->{_link_pos}) {
1781 cf::sync_job {
1782 $pl->ob->leave_link
1783 };
1784 }
1785 },
1786 on_login => sub {
1787 my ($pl) = @_;
1788
1789 # try to abort aborted map switching on player login :)
1790 # should happen only on crashes
1791 if ($pl->ob->{_link_pos}) {
1792 $pl->ob->enter_link;
1793 (async {
1794 # we need this sleep as the login has a concurrent enter_exit running
1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED);
1800 Coro::Timer::sleep 1;
1801 $pl->ob->leave_link;
1802 })->prio (2);
1803 }
1804 },
1805);
1806
1807=item $player_object->goto ($path, $x, $y)
1808
1809=cut
1810
1811sub cf::object::player::goto {
1812 my ($self, $path, $x, $y) = @_;
1813
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1817 $self->enter_link;
1818
1819 (async {
1820 my $map = cf::map::find $path->as_string;
1821 $map = $map->customise_for ($self) if $map;
1822
1823# warn "entering ", $map->path, " at ($x, $y)\n"
1824# if $map;
1825
1826 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1827
1828 $self->leave_link ($map, $x, $y);
1829 })->prio (1);
1830}
1831
1832=item $player_object->enter_exit ($exit_object)
1833
1834=cut
1835
1836sub parse_random_map_params {
1837 my ($spec) = @_;
1838
1839 my $rmp = { # defaults
1840 xsize => 10,
1841 ysize => 10,
1842 };
1843
1844 for (split /\n/, $spec) {
1845 my ($k, $v) = split /\s+/, $_, 2;
1846
1847 $rmp->{lc $k} = $v if (length $k) && (length $v);
1848 }
1849
1850 $rmp
1851}
1852
1853sub prepare_random_map {
1854 my ($exit) = @_;
1855
1856 # all this does is basically replace the /! path by
1857 # a new random map path (?random/...) with a seed
1858 # that depends on the exit object
1859
1860 my $rmp = parse_random_map_params $exit->msg;
1861
1862 if ($exit->map) {
1863 $rmp->{region} = $exit->map->region_name;
1864 $rmp->{origin_map} = $exit->map->path;
1865 $rmp->{origin_x} = $exit->x;
1866 $rmp->{origin_y} = $exit->y;
1867 }
1868
1869 $rmp->{random_seed} ||= $exit->random_seed;
1870
1871 my $data = cf::to_json $rmp;
1872 my $md5 = Digest::MD5::md5_hex $data;
1873
1874 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {
1875 aio_write $fh, 0, (length $data), $data, 0;
1876
1877 $exit->slaying ("?random/$md5");
1878 $exit->msg (undef);
1879 }
1880}
1881
1882sub cf::object::player::enter_exit {
1883 my ($self, $exit) = @_;
1884
1885 return unless $self->type == cf::PLAYER;
1886
1887 $self->enter_link;
1888
1889 (async {
1890 $self->deactivate_recursive; # just to be sure
1891 unless (eval {
1892 prepare_random_map $exit
1893 if $exit->slaying eq "/!";
1894
1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1897
1898 1;
1899 }) {
1900 $self->message ("Something went wrong deep within the crossfire server. "
1901 . "I'll try to bring you back to the map you were before. "
1902 . "Please report this to the dungeon master",
1903 cf::NDI_UNIQUE | cf::NDI_RED);
1904
1905 warn "ERROR in enter_exit: $@";
1906 $self->leave_link;
1907 }
1908 })->prio (1);
1909}
1910
1078=head3 cf::client 1911=head3 cf::client
1079 1912
1080=over 4 1913=over 4
1081 1914
1082=item $client->send_drawinfo ($text, $flags) 1915=item $client->send_drawinfo ($text, $flags)
1125 on_reply => sub { 1958 on_reply => sub {
1126 my ($ns, $msg) = @_; 1959 my ($ns, $msg) = @_;
1127 1960
1128 # this weird shuffling is so that direct followup queries 1961 # this weird shuffling is so that direct followup queries
1129 # get handled first 1962 # get handled first
1130 my $queue = delete $ns->{query_queue}; 1963 my $queue = delete $ns->{query_queue}
1964 or return; # be conservative, not sure how that can happen, but we saw a crash here
1131 1965
1132 (shift @$queue)->[1]->($msg); 1966 (shift @$queue)->[1]->($msg);
1133 1967
1134 push @{ $ns->{query_queue} }, @$queue; 1968 push @{ $ns->{query_queue} }, @$queue;
1135 1969
1141 } 1975 }
1142 } 1976 }
1143 }, 1977 },
1144); 1978);
1145 1979
1146=item $client->coro (\&cb) 1980=item $client->async (\&cb)
1147 1981
1148Create a new coroutine, running the specified callback. The coroutine will 1982Create a new coroutine, running the specified callback. The coroutine will
1149be automatically cancelled when the client gets destroyed (e.g. on logout, 1983be automatically cancelled when the client gets destroyed (e.g. on logout,
1150or loss of connection). 1984or loss of connection).
1151 1985
1152=cut 1986=cut
1153 1987
1154sub cf::client::coro { 1988sub cf::client::async {
1155 my ($self, $cb) = @_; 1989 my ($self, $cb) = @_;
1156 1990
1157 my $coro; $coro = async { 1991 my $coro = &Coro::async ($cb);
1158 eval {
1159 $cb->();
1160 };
1161 warn $@ if $@;
1162 };
1163 1992
1164 $coro->on_destroy (sub { 1993 $coro->on_destroy (sub {
1165 delete $self->{_coro}{$coro+0}; 1994 delete $self->{_coro}{$coro+0};
1166 }); 1995 });
1167 1996
1339 2168
1340{ 2169{
1341 my $path = cf::localdir . "/database.pst"; 2170 my $path = cf::localdir . "/database.pst";
1342 2171
1343 sub db_load() { 2172 sub db_load() {
1344 warn "loading database $path\n";#d# remove later
1345 $DB = stat $path ? Storable::retrieve $path : { }; 2173 $DB = stat $path ? Storable::retrieve $path : { };
1346 } 2174 }
1347 2175
1348 my $pid; 2176 my $pid;
1349 2177
1350 sub db_save() { 2178 sub db_save() {
1351 warn "saving database $path\n";#d# remove later
1352 waitpid $pid, 0 if $pid; 2179 waitpid $pid, 0 if $pid;
1353 if (0 == ($pid = fork)) { 2180 if (0 == ($pid = fork)) {
1354 $DB->{_meta}{version} = 1; 2181 $DB->{_meta}{version} = 1;
1355 Storable::nstore $DB, "$path~"; 2182 Storable::nstore $DB, "$path~";
1356 rename "$path~", $path; 2183 rename "$path~", $path;
1404 open my $fh, "<:utf8", cf::confdir . "/config" 2231 open my $fh, "<:utf8", cf::confdir . "/config"
1405 or return; 2232 or return;
1406 2233
1407 local $/; 2234 local $/;
1408 *CFG = YAML::Syck::Load <$fh>; 2235 *CFG = YAML::Syck::Load <$fh>;
2236
2237 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2238
2239 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2240 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2241
2242 if (exists $CFG{mlockall}) {
2243 eval {
2244 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2245 and die "WARNING: m(un)lockall failed: $!\n";
2246 };
2247 warn $@ if $@;
2248 }
1409} 2249}
1410 2250
1411sub main { 2251sub main {
1412 # we must not ever block the main coroutine 2252 # we must not ever block the main coroutine
1413 local $Coro::idle = sub { 2253 local $Coro::idle = sub {
1414 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2254 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1415 (Coro::unblock_sub {
1416 Event::one_event; 2255 async { Event::one_event };
1417 })->();
1418 }; 2256 };
1419 2257
1420 cfg_load; 2258 cfg_load;
1421 db_load; 2259 db_load;
1422 load_extensions; 2260 load_extensions;
1423 Event::loop; 2261 Event::loop;
1424} 2262}
1425 2263
1426############################################################################# 2264#############################################################################
1427# initialisation 2265# initialisation and cleanup
1428 2266
2267# install some emergency cleanup handlers
2268BEGIN {
2269 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal (
2271 data => WF_AUTOCANCEL,
2272 signal => $signal,
2273 cb => sub {
2274 cf::cleanup "SIG$signal";
2275 },
2276 );
2277 }
2278}
2279
2280sub emergency_save() {
2281 my $freeze_guard = cf::freeze_mainloop;
2282
2283 warn "enter emergency perl save\n";
2284
2285 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously.
2289 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next;
2293 $pl->save;
2294 }
2295 warn "end emergency player save\n";
2296
2297 warn "begin emergency map save\n";
2298 for my $path (keys %cf::MAP) {
2299 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next;
2301 $map->save;
2302 }
2303 warn "end emergency map save\n";
2304 };
2305
2306 warn "leave emergency perl save\n";
2307}
2308
1429sub perl_reload() { 2309sub reload() {
1430 # can/must only be called in main 2310 # can/must only be called in main
1431 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
1432 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine\n";
1433 return; 2313 return;
1434 } 2314 }
1435 2315
1436 warn "reloading..."; 2316 warn "reloading...";
1437 2317
1438 local $FREEZE = 1; 2318 my $guard = freeze_mainloop;
1439 cf::emergency_save; 2319 cf::emergency_save;
1440 2320
1441 eval { 2321 eval {
1442 # if anything goes wrong in here, we should simply crash as we already saved 2322 # if anything goes wrong in here, we should simply crash as we already saved
1443 2323
1505 cf::load_extensions; 2385 cf::load_extensions;
1506 2386
1507 # reattach attachments to objects 2387 # reattach attachments to objects
1508 warn "reattach"; 2388 warn "reattach";
1509 _global_reattach; 2389 _global_reattach;
2390 reattach $_ for values %MAP;
1510 }; 2391 };
1511 2392
1512 if ($@) { 2393 if ($@) {
1513 warn $@; 2394 warn $@;
1514 warn "error while reloading, exiting."; 2395 warn "error while reloading, exiting.";
1527 $LINK_MAP->height (41); 2408 $LINK_MAP->height (41);
1528 $LINK_MAP->alloc; 2409 $LINK_MAP->alloc;
1529 $LINK_MAP->path ("{link}"); 2410 $LINK_MAP->path ("{link}");
1530 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1531 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2413
2414 # dirty hack because... archetypes are not yet loaded
2415 Event->timer (
2416 after => 10,
2417 cb => sub {
2418 $_[0]->w->cancel;
2419
2420 # provide some exits "home"
2421 my $exit = cf::object::new "exit";
2422
2423 $exit->slaying ($EMERGENCY_POSITION->[0]);
2424 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2425 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2426
2427 $LINK_MAP->insert ($exit->clone, 19, 19);
2428 $LINK_MAP->insert ($exit->clone, 19, 20);
2429 $LINK_MAP->insert ($exit->clone, 19, 21);
2430 $LINK_MAP->insert ($exit->clone, 20, 19);
2431 $LINK_MAP->insert ($exit->clone, 20, 21);
2432 $LINK_MAP->insert ($exit->clone, 21, 19);
2433 $LINK_MAP->insert ($exit->clone, 21, 20);
2434 $LINK_MAP->insert ($exit->clone, 21, 21);
2435
2436 $exit->destroy;
2437 });
2438
2439 $LINK_MAP->{deny_save} = 1;
2440 $LINK_MAP->{deny_reset} = 1;
2441
2442 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1532} 2443}
1533 2444
1534register "<global>", __PACKAGE__; 2445register "<global>", __PACKAGE__;
1535 2446
1536register_command "perl-reload" => sub { 2447register_command "reload" => sub {
1537 my ($who, $arg) = @_; 2448 my ($who, $arg) = @_;
1538 2449
1539 if ($who->flag (FLAG_WIZ)) { 2450 if ($who->flag (FLAG_WIZ)) {
1540 $who->message ("start of reload."); 2451 $who->message ("start of reload.");
1541 perl_reload; 2452 reload;
1542 $who->message ("end of reload."); 2453 $who->message ("end of reload.");
1543 } 2454 }
1544}; 2455};
1545 2456
1546unshift @INC, $LIBDIR; 2457unshift @INC, $LIBDIR;
1549 reentrant => 0, 2460 reentrant => 0,
1550 prio => 0, 2461 prio => 0,
1551 at => $NEXT_TICK || $TICK, 2462 at => $NEXT_TICK || $TICK,
1552 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
1553 cb => sub { 2464 cb => sub {
1554 unless ($FREEZE) {
1555 cf::server_tick; # one server iteration 2465 cf::server_tick; # one server iteration
1556 $RUNTIME += $TICK; 2466 $RUNTIME += $TICK;
1557 }
1558
1559 $NEXT_TICK += $TICK; 2467 $NEXT_TICK += $TICK;
2468
2469 $WAIT_FOR_TICK->broadcast;
2470 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
1560 2471
1561 # if we are delayed by four ticks or more, skip them all 2472 # if we are delayed by four ticks or more, skip them all
1562 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1563 2474
1564 $TICK_WATCHER->at ($NEXT_TICK); 2475 $TICK_WATCHER->at ($NEXT_TICK);
1586 or warn "ERROR: unable to write runtime file: $!"; 2497 or warn "ERROR: unable to write runtime file: $!";
1587 })->(); 2498 })->();
1588 }, 2499 },
1589); 2500);
1590 2501
2502END { cf::emergency_save }
2503
15911 25041
1592 2505

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines