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.108 by root, Sun Dec 31 21:02:05 2006 UTC vs.
Revision 1.155 by root, Tue Jan 9 21:32:42 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/}{}) {
393 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
286 $self->{random} = cf::from_json $path; 394 $self->{random} = cf::from_json $data;
287 } else { 395 } else {
288 if ($path =~ s{^~([^/]+)?}{}) { 396 if ($path =~ s{^~([^/]+)?}{}) {
289 $self->{user_rel} = 1; 397 $self->{user_rel} = 1;
290 398
291 if (defined $1) { 399 if (defined $1) {
324 432
325# the displayed name, this is a one way mapping 433# the displayed name, this is a one way mapping
326sub visible_name { 434sub visible_name {
327 my ($self) = @_; 435 my ($self) = @_;
328 436
329 $self->{random} ? "?random/$self->{random}{origin_map}+$self->{random}{origin_x}+$self->{random}{origin_y}/$self->{random}{dungeon_level}" 437# if (my $rmp = $self->{random}) {
330 : $self->as_string 438# # todo: be more intelligent about this
439# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
440# } else {
441 $self->as_string
442# }
331} 443}
332 444
333# escape the /'s in the path 445# escape the /'s in the path
334sub _escaped_path { 446sub _escaped_path {
335 # ∕ is U+2215
336 (my $path = $_[0]{path}) =~ s/\///g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
337 $path 448 $path
338} 449}
339 450
340# the original (read-only) location 451# the original (read-only) location
341sub load_path { 452sub load_path {
347# the temporary/swap location 458# the temporary/swap location
348sub save_path { 459sub save_path {
349 my ($self) = @_; 460 my ($self) = @_;
350 461
351 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 462 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
352 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, Digest::MD5::md5_hex $self->{path} 463 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
353 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 464 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
354} 465}
355 466
356# the unique path, might be eq to save_path 467# the unique path, might be eq to save_path
357sub uniq_path { 468sub uniq_path {
790 or return; 901 or return;
791 902
792 unless (aio_stat "$filename.pst") { 903 unless (aio_stat "$filename.pst") {
793 (aio_load "$filename.pst", $av) >= 0 904 (aio_load "$filename.pst", $av) >= 0
794 or return; 905 or return;
795 $av = eval { (Storable::thaw <$av>)->{objs} }; 906 $av = eval { (Storable::thaw $av)->{objs} };
796 } 907 }
797 908
909 warn sprintf "loading %s (%d)\n",
910 $filename, length $data, scalar @{$av || []};#d#
798 return ($data, $av); 911 return ($data, $av);
799} 912}
800 913
801############################################################################# 914#############################################################################
802# command handling &c 915# command handling &c
966}; 1079};
967 1080
968cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
969 1082
970############################################################################# 1083#############################################################################
971# load/save perl data associated with player->ob objects
972 1084
973sub all_objects(@) { 1085=head2 CORE EXTENSIONS
974 @_, map all_objects ($_->inv), @_
975}
976 1086
977# TODO: compatibility cruft, remove when no longer needed 1087Functions and methods that extend core crossfire objects.
978cf::player->attach ( 1088
979 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($) {
980 my ($pl, $path) = @_; 1316 my ($path) = @_;
981 1317
982 for my $o (all_objects $pl->ob) { 1318 utf8::encode $path;
983 if (my $value = $o->get_ob_key_value ("_perl_data")) { 1319 aio_open $path, O_RDONLY, 0
984 $o->set_ob_key_value ("_perl_data"); 1320 or return;
985 1321
986 %$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;
987 } 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};
988 } 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
989 }, 1393 }
990); 1394}
991 1395
992############################################################################# 1396sub load {
1397 my ($self) = @_;
993 1398
994=head2 CORE EXTENSIONS 1399 my $path = $self->{path};
1400 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
995 1401
996Functions and methods that extend core crossfire objects. 1402 return if $self->in_memory != cf::MAP_SWAPPED;
997 1403
998=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
1444sub find_sync {
1445 my ($path, $origin) = @_;
1446
1447 cf::sync_job { cf::map::find $path, $origin }
1448}
1449
1450sub do_load_sync {
1451 my ($map) = @_;
1452
1453 cf::sync_job { $map->load };
1454}
1455
1456sub save {
1457 my ($self) = @_;
1458
1459 my $lock = cf::lock_acquire "map_data:" . $self->path;
1460
1461 $self->{last_save} = $cf::RUNTIME;
1462
1463 return unless $self->dirty;
1464
1465 my $save = $self->{path}->save_path; utf8::encode $save;
1466 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1467
1468 $self->{load_path} = $save;
1469
1470 return if $self->{deny_save};
1471
1472 local $self->{last_access} = $self->last_access;#d#
1473
1474 cf::async {
1475 $_->contr->save for $self->players;
1476 };
1477
1478 if ($uniq) {
1479 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1480 $self->save_objects ($uniq, cf::IO_UNIQUES);
1481 } else {
1482 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1483 }
1484}
1485
1486sub swap_out {
1487 my ($self) = @_;
1488
1489 # save first because save cedes
1490 $self->save;
1491
1492 my $lock = cf::lock_acquire "map_data:" . $self->path;
1493
1494 return if $self->players;
1495 return if $self->in_memory != cf::MAP_IN_MEMORY;
1496 return if $self->{deny_save};
1497
1498 $self->clear;
1499 $self->in_memory (cf::MAP_SWAPPED);
1500}
1501
1502sub reset_at {
1503 my ($self) = @_;
1504
1505 # TODO: safety, remove and allow resettable per-player maps
1506 return 1e99 if $self->{path}{user_rel};
1507 return 1e99 if $self->{deny_reset};
1508
1509 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1510 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1511
1512 $time + $to
1513}
1514
1515sub should_reset {
1516 my ($self) = @_;
1517
1518 $self->reset_at <= $cf::RUNTIME
1519}
1520
1521sub unlink_save {
1522 my ($self) = @_;
1523
1524 utf8::encode (my $save = $self->{path}->save_path);
1525 aioreq_pri 3; IO::AIO::aio_unlink $save;
1526 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1527}
1528
1529sub rename {
1530 my ($self, $new_path) = @_;
1531
1532 $self->unlink_save;
1533
1534 delete $cf::MAP{$self->path};
1535 $self->{path} = new cf::path $new_path;
1536 $self->path ($self->{path}->as_string);
1537 $cf::MAP{$self->path} = $self;
1538
1539 $self->save;
1540}
1541
1542sub reset {
1543 my ($self) = @_;
1544
1545 my $lock = cf::lock_acquire "map_data:" . $self->path;
1546
1547 return if $self->players;
1548 return if $self->{path}{user_rel};#d#
1549
1550 warn "resetting map ", $self->path;#d#
1551
1552 delete $cf::MAP{$self->path};
1553
1554 $_->clear_links_to ($self) for values %cf::MAP;
1555
1556 $self->unlink_save;
1557 $self->destroy;
1558}
1559
1560my $nuke_counter = "aaaa";
1561
1562sub nuke {
1563 my ($self) = @_;
1564
1565 $self->{deny_save} = 1;
1566 $self->reset_timeout (1);
1567 $self->rename ("{nuke}/" . ($nuke_counter++));
1568 $self->reset; # polite request, might not happen
1569}
1570
1571sub customise_for {
1572 my ($map, $ob) = @_;
1573
1574 if ($map->per_player) {
1575 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1576 }
1577
1578 $map
1579}
1580
1581package cf;
1582
1583=back
1584
1585=head3 cf::object
1586
1587=cut
1588
1589package cf::object;
999 1590
1000=over 4 1591=over 4
1001 1592
1002=item cf::player::exists $login 1593=item $ob->inv_recursive
1003 1594
1004Returns true when the given account exists. 1595Returns the inventory of the object _and_ their inventories, recursively.
1005 1596
1006=cut 1597=cut
1007 1598
1008sub cf::player::exists($) { 1599sub inv_recursive_;
1009 cf::player::find $_[0] 1600sub inv_recursive_ {
1010 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1601 map { $_, inv_recursive_ $_->inv } @_
1011} 1602}
1012 1603
1013=item $player->ext_reply ($msgid, $msgtype, %msg) 1604sub inv_recursive {
1014 1605 inv_recursive_ inv $_[0]
1015Sends an ext reply to the player.
1016
1017=cut
1018
1019sub cf::player::ext_reply($$$%) {
1020 my ($self, $id, %msg) = @_;
1021
1022 $msg{msgid} = $id;
1023
1024 $self->send ("ext " . to_json \%msg);
1025} 1606}
1607
1608package cf;
1026 1609
1027=back 1610=back
1028 1611
1029=head3 cf::object::player 1612=head3 cf::object::player
1030 1613
1068 (ref $cf::CFG{"may_$access"} 1651 (ref $cf::CFG{"may_$access"}
1069 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 1652 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
1070 : $cf::CFG{"may_$access"}) 1653 : $cf::CFG{"may_$access"})
1071} 1654}
1072 1655
1656=item $player_object->enter_link
1657
1658Freezes the player and moves him/her to a special map (C<{link}>).
1659
1660The player should be reaosnably safe there for short amounts of time. You
1661I<MUST> call C<leave_link> as soon as possible, though.
1662
1663=item $player_object->leave_link ($map, $x, $y)
1664
1665Moves the player out of the specila link map onto the given map. If the
1666map is not valid (or omitted), the player will be moved back to the
1667location he/she was before the call to C<enter_link>, or, if that fails,
1668to the emergency map position.
1669
1670Might block.
1671
1672=cut
1673
1674sub cf::object::player::enter_link {
1675 my ($self) = @_;
1676
1677 $self->deactivate_recursive;
1678
1679 return if $self->map == $LINK_MAP;
1680
1681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1682 if $self->map;
1683
1684 $self->enter_map ($LINK_MAP, 20, 20);
1685}
1686
1687sub cf::object::player::leave_link {
1688 my ($self, $map, $x, $y) = @_;
1689
1690 my $link_pos = delete $self->{_link_pos};
1691
1692 unless ($map) {
1693 # restore original map position
1694 ($map, $x, $y) = @{ $link_pos || [] };
1695 $map = cf::map::find $map;
1696
1697 unless ($map) {
1698 ($map, $x, $y) = @$EMERGENCY_POSITION;
1699 $map = cf::map::find $map
1700 or die "FATAL: cannot load emergency map\n";
1701 }
1702 }
1703
1704 ($x, $y) = (-1, -1)
1705 unless (defined $x) && (defined $y);
1706
1707 # use -1 or undef as default coordinates, not 0, 0
1708 ($x, $y) = ($map->enter_x, $map->enter_y)
1709 if $x <=0 && $y <= 0;
1710
1711 $map->load;
1712
1713 return unless $self->contr->active;
1714 $self->activate_recursive;
1715 $self->enter_map ($map, $x, $y);
1716}
1717
1718cf::player->attach (
1719 on_logout => sub {
1720 my ($pl) = @_;
1721
1722 # abort map switching before logout
1723 if ($pl->ob->{_link_pos}) {
1724 cf::sync_job {
1725 $pl->ob->leave_link
1726 };
1727 }
1728 },
1729 on_login => sub {
1730 my ($pl) = @_;
1731
1732 # try to abort aborted map switching on player login :)
1733 # should happen only on crashes
1734 if ($pl->ob->{_link_pos}) {
1735 $pl->ob->enter_link;
1736 (async {
1737 # we need this sleep as the login has a concurrent enter_exit running
1738 # and this sleep increases chances of the player not ending up in scorn
1739 $pl->ob->reply (undef,
1740 "There was an internal problem at your last logout, "
1741 . "the server will try to bring you to your intended destination in a second.",
1742 cf::NDI_RED);
1743 Coro::Timer::sleep 1;
1744 $pl->ob->leave_link;
1745 })->prio (2);
1746 }
1747 },
1748);
1749
1750=item $player_object->goto ($path, $x, $y)
1751
1752=cut
1753
1754sub cf::object::player::goto {
1755 my ($self, $path, $x, $y) = @_;
1756
1757 $path = new cf::path $path;
1758 $path ne "/" or Carp::cluck ("oy");#d#
1759
1760 $self->enter_link;
1761
1762 (async {
1763 my $map = cf::map::find $path->as_string;
1764 $map = $map->customise_for ($self) if $map;
1765
1766# warn "entering ", $map->path, " at ($x, $y)\n"
1767# if $map;
1768
1769 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1770
1771 $self->leave_link ($map, $x, $y);
1772 })->prio (1);
1773}
1774
1775=item $player_object->enter_exit ($exit_object)
1776
1777=cut
1778
1779sub parse_random_map_params {
1780 my ($spec) = @_;
1781
1782 my $rmp = { # defaults
1783 xsize => 10,
1784 ysize => 10,
1785 };
1786
1787 for (split /\n/, $spec) {
1788 my ($k, $v) = split /\s+/, $_, 2;
1789
1790 $rmp->{lc $k} = $v if (length $k) && (length $v);
1791 }
1792
1793 $rmp
1794}
1795
1796sub prepare_random_map {
1797 my ($exit) = @_;
1798
1799 # all this does is basically replace the /! path by
1800 # a new random map path (?random/...) with a seed
1801 # that depends on the exit object
1802
1803 my $rmp = parse_random_map_params $exit->msg;
1804
1805 if ($exit->map) {
1806 $rmp->{region} = $exit->map->region_name;
1807 $rmp->{origin_map} = $exit->map->path;
1808 $rmp->{origin_x} = $exit->x;
1809 $rmp->{origin_y} = $exit->y;
1810 }
1811
1812 $rmp->{random_seed} ||= $exit->random_seed;
1813
1814 my $data = cf::to_json $rmp;
1815 my $md5 = Digest::MD5::md5_hex $data;
1816
1817 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) {
1818 aio_write $fh, 0, (length $data), $data, 0;
1819
1820 $exit->slaying ("?random/$md5");
1821 $exit->msg (undef);
1822 }
1823}
1824
1825sub cf::object::player::enter_exit {
1826 my ($self, $exit) = @_;
1827
1828 return unless $self->type == cf::PLAYER;
1829
1830 $self->enter_link;
1831
1832 (async {
1833 $self->deactivate_recursive; # just to be sure
1834 unless (eval {
1835 prepare_random_map $exit
1836 if $exit->slaying eq "/!";
1837
1838 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1839 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1840
1841 1;
1842 }) {
1843 $self->message ("Something went wrong deep within the crossfire server. "
1844 . "I'll try to bring you back to the map you were before. "
1845 . "Please report this to the dungeon master",
1846 cf::NDI_UNIQUE | cf::NDI_RED);
1847
1848 warn "ERROR in enter_exit: $@";
1849 $self->leave_link;
1850 }
1851 })->prio (1);
1852}
1853
1073=head3 cf::client 1854=head3 cf::client
1074 1855
1075=over 4 1856=over 4
1076 1857
1077=item $client->send_drawinfo ($text, $flags) 1858=item $client->send_drawinfo ($text, $flags)
1120 on_reply => sub { 1901 on_reply => sub {
1121 my ($ns, $msg) = @_; 1902 my ($ns, $msg) = @_;
1122 1903
1123 # this weird shuffling is so that direct followup queries 1904 # this weird shuffling is so that direct followup queries
1124 # get handled first 1905 # get handled first
1125 my $queue = delete $ns->{query_queue}; 1906 my $queue = delete $ns->{query_queue}
1907 or return; # be conservative, not sure how that can happen, but we saw a crash here
1126 1908
1127 (shift @$queue)->[1]->($msg); 1909 (shift @$queue)->[1]->($msg);
1128 1910
1129 push @{ $ns->{query_queue} }, @$queue; 1911 push @{ $ns->{query_queue} }, @$queue;
1130 1912
1136 } 1918 }
1137 } 1919 }
1138 }, 1920 },
1139); 1921);
1140 1922
1141=item $client->coro (\&cb) 1923=item $client->async (\&cb)
1142 1924
1143Create a new coroutine, running the specified callback. The coroutine will 1925Create a new coroutine, running the specified callback. The coroutine will
1144be automatically cancelled when the client gets destroyed (e.g. on logout, 1926be automatically cancelled when the client gets destroyed (e.g. on logout,
1145or loss of connection). 1927or loss of connection).
1146 1928
1147=cut 1929=cut
1148 1930
1149sub cf::client::coro { 1931sub cf::client::async {
1150 my ($self, $cb) = @_; 1932 my ($self, $cb) = @_;
1151 1933
1152 my $coro; $coro = async { 1934 my $coro = &Coro::async ($cb);
1153 eval {
1154 $cb->();
1155 };
1156 warn $@ if $@;
1157 };
1158 1935
1159 $coro->on_destroy (sub { 1936 $coro->on_destroy (sub {
1160 delete $self->{_coro}{$coro+0}; 1937 delete $self->{_coro}{$coro+0};
1161 }); 1938 });
1162 1939
1334 2111
1335{ 2112{
1336 my $path = cf::localdir . "/database.pst"; 2113 my $path = cf::localdir . "/database.pst";
1337 2114
1338 sub db_load() { 2115 sub db_load() {
1339 warn "loading database $path\n";#d# remove later
1340 $DB = stat $path ? Storable::retrieve $path : { }; 2116 $DB = stat $path ? Storable::retrieve $path : { };
1341 } 2117 }
1342 2118
1343 my $pid; 2119 my $pid;
1344 2120
1345 sub db_save() { 2121 sub db_save() {
1346 warn "saving database $path\n";#d# remove later
1347 waitpid $pid, 0 if $pid; 2122 waitpid $pid, 0 if $pid;
1348 if (0 == ($pid = fork)) { 2123 if (0 == ($pid = fork)) {
1349 $DB->{_meta}{version} = 1; 2124 $DB->{_meta}{version} = 1;
1350 Storable::nstore $DB, "$path~"; 2125 Storable::nstore $DB, "$path~";
1351 rename "$path~", $path; 2126 rename "$path~", $path;
1399 open my $fh, "<:utf8", cf::confdir . "/config" 2174 open my $fh, "<:utf8", cf::confdir . "/config"
1400 or return; 2175 or return;
1401 2176
1402 local $/; 2177 local $/;
1403 *CFG = YAML::Syck::Load <$fh>; 2178 *CFG = YAML::Syck::Load <$fh>;
2179
2180 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2181
2182 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2183 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2184
2185 if (exists $CFG{mlockall}) {
2186 eval {
2187 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2188 and die "WARNING: m(un)lockall failed: $!\n";
2189 };
2190 warn $@ if $@;
2191 }
1404} 2192}
1405 2193
1406sub main { 2194sub main {
1407 # we must not ever block the main coroutine 2195 # we must not ever block the main coroutine
1408 local $Coro::idle = sub { 2196 local $Coro::idle = sub {
1409 Carp::cluck "FATAL: Coro::idle was called, major BUG\n";#d# 2197 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1410 (Coro::unblock_sub {
1411 Event::one_event; 2198 async { Event::one_event };
1412 })->();
1413 }; 2199 };
1414 2200
1415 cfg_load; 2201 cfg_load;
1416 db_load; 2202 db_load;
1417 load_extensions; 2203 load_extensions;
1418 Event::loop; 2204 Event::loop;
1419} 2205}
1420 2206
1421############################################################################# 2207#############################################################################
1422# initialisation 2208# initialisation and cleanup
1423 2209
2210# install some emergency cleanup handlers
2211BEGIN {
2212 for my $signal (qw(INT HUP TERM)) {
2213 Event->signal (
2214 data => WF_AUTOCANCEL,
2215 signal => $signal,
2216 cb => sub {
2217 cf::cleanup "SIG$signal";
2218 },
2219 );
2220 }
2221}
2222
2223sub emergency_save {
2224 my $freeze_guard = cf::freeze_mainloop;
2225
2226 warn "enter emergency perl save\n";
2227
2228 cf::sync_job {
2229 # use a peculiar iteration method to avoid tripping on perl
2230 # refcount bugs in for. also avoids problems with players
2231 # and maps saved/Destroyed asynchronously.
2232 warn "begin emergency player save\n";
2233 for my $login (keys %cf::PLAYER) {
2234 my $pl = $cf::PLAYER{$login} or next;
2235 $pl->valid or next;
2236 $pl->save;
2237 }
2238 warn "end emergency player save\n";
2239
2240 warn "begin emergency map save\n";
2241 for my $path (keys %cf::MAP) {
2242 my $map = $cf::MAP{$path} or next;
2243 $map->valid or next;
2244 $map->save;
2245 }
2246 warn "end emergency map save\n";
2247 };
2248
2249 warn "leave emergency perl save\n";
2250}
2251
1424sub perl_reload() { 2252sub reload() {
1425 # can/must only be called in main 2253 # can/must only be called in main
1426 if ($Coro::current != $Coro::main) { 2254 if ($Coro::current != $Coro::main) {
1427 warn "can only reload from main coroutine\n"; 2255 warn "can only reload from main coroutine\n";
1428 return; 2256 return;
1429 } 2257 }
1430 2258
1431 warn "reloading..."; 2259 warn "reloading...";
1432 2260
1433 local $FREEZE = 1; 2261 my $guard = freeze_mainloop;
1434 cf::emergency_save; 2262 cf::emergency_save;
1435 2263
1436 eval { 2264 eval {
1437 # if anything goes wrong in here, we should simply crash as we already saved 2265 # if anything goes wrong in here, we should simply crash as we already saved
1438 2266
1500 cf::load_extensions; 2328 cf::load_extensions;
1501 2329
1502 # reattach attachments to objects 2330 # reattach attachments to objects
1503 warn "reattach"; 2331 warn "reattach";
1504 _global_reattach; 2332 _global_reattach;
2333 reattach $_ for values %MAP;
1505 }; 2334 };
1506 2335
1507 if ($@) { 2336 if ($@) {
1508 warn $@; 2337 warn $@;
1509 warn "error while reloading, exiting."; 2338 warn "error while reloading, exiting.";
1522 $LINK_MAP->height (41); 2351 $LINK_MAP->height (41);
1523 $LINK_MAP->alloc; 2352 $LINK_MAP->alloc;
1524 $LINK_MAP->path ("{link}"); 2353 $LINK_MAP->path ("{link}");
1525 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2354 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
1526 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2355 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2356
2357 # dirty hack because... archetypes are not yet loaded
2358 Event->timer (
2359 after => 10,
2360 cb => sub {
2361 $_[0]->w->cancel;
2362
2363 # provide some exits "home"
2364 my $exit = cf::object::new "exit";
2365
2366 $exit->slaying ($EMERGENCY_POSITION->[0]);
2367 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2368 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2369
2370 $LINK_MAP->insert ($exit->clone, 19, 19);
2371 $LINK_MAP->insert ($exit->clone, 19, 20);
2372 $LINK_MAP->insert ($exit->clone, 19, 21);
2373 $LINK_MAP->insert ($exit->clone, 20, 19);
2374 $LINK_MAP->insert ($exit->clone, 20, 21);
2375 $LINK_MAP->insert ($exit->clone, 21, 19);
2376 $LINK_MAP->insert ($exit->clone, 21, 20);
2377 $LINK_MAP->insert ($exit->clone, 21, 21);
2378
2379 $exit->destroy;
2380 });
2381
2382 $LINK_MAP->{deny_save} = 1;
2383 $LINK_MAP->{deny_reset} = 1;
2384
2385 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
1527} 2386}
1528 2387
1529register "<global>", __PACKAGE__; 2388register "<global>", __PACKAGE__;
1530 2389
1531register_command "perl-reload" => sub { 2390register_command "reload" => sub {
1532 my ($who, $arg) = @_; 2391 my ($who, $arg) = @_;
1533 2392
1534 if ($who->flag (FLAG_WIZ)) { 2393 if ($who->flag (FLAG_WIZ)) {
1535 $who->message ("start of reload."); 2394 $who->message ("start of reload.");
1536 perl_reload; 2395 reload;
1537 $who->message ("end of reload."); 2396 $who->message ("end of reload.");
1538 } 2397 }
1539}; 2398};
1540 2399
1541unshift @INC, $LIBDIR; 2400unshift @INC, $LIBDIR;
1544 reentrant => 0, 2403 reentrant => 0,
1545 prio => 0, 2404 prio => 0,
1546 at => $NEXT_TICK || $TICK, 2405 at => $NEXT_TICK || $TICK,
1547 data => WF_AUTOCANCEL, 2406 data => WF_AUTOCANCEL,
1548 cb => sub { 2407 cb => sub {
1549 unless ($FREEZE) {
1550 cf::server_tick; # one server iteration 2408 cf::server_tick; # one server iteration
1551 $RUNTIME += $TICK; 2409 $RUNTIME += $TICK;
1552 }
1553
1554 $NEXT_TICK += $TICK; 2410 $NEXT_TICK += $TICK;
2411
2412 $WAIT_FOR_TICK->broadcast;
2413 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
1555 2414
1556 # if we are delayed by four ticks or more, skip them all 2415 # if we are delayed by four ticks or more, skip them all
1557 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2416 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
1558 2417
1559 $TICK_WATCHER->at ($NEXT_TICK); 2418 $TICK_WATCHER->at ($NEXT_TICK);
1581 or warn "ERROR: unable to write runtime file: $!"; 2440 or warn "ERROR: unable to write runtime file: $!";
1582 })->(); 2441 })->();
1583 }, 2442 },
1584); 2443);
1585 2444
2445END { cf::emergency_save }
2446
15861 24471
1587 2448

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines