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.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.161 by root, Thu Jan 11 00:16:58 2007 UTC

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 (Coro::PRIO_MAX); # 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 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our %CFG; 52our %CFG;
48 53
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
57our %PLAYER; # all users
52our %MAP; # all maps 58our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 64
57binmode STDOUT; 65binmode STDOUT;
58binmode STDERR; 66binmode STDERR;
59 67
60# read virtual server time, if available 68# read virtual server time, if available
105=item %cf::CFG 113=item %cf::CFG
106 114
107Configuration for the server, loaded from C</etc/crossfire/config>, or 115Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 116from wherever your confdir points to.
109 117
118=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
119
120These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
121or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
122processing has been done. Call C<< ->wait >> on them to maximise the
123window of cpu time available, or simply to synchronise to the server tick.
124
110=back 125=back
111 126
112=cut 127=cut
113 128
114BEGIN { 129BEGIN {
117 utf8::encode $msg; 132 utf8::encode $msg;
118 133
119 $msg .= "\n" 134 $msg .= "\n"
120 unless $msg =~ /\n$/; 135 unless $msg =~ /\n$/;
121 136
122 LOG llevError, "cfperl: $msg"; 137 LOG llevError, $msg;
123 }; 138 };
124} 139}
125 140
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 141@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 142@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 160
146$Event::DIED = sub { 161$Event::DIED = sub {
147 warn "error in event callback: @_"; 162 warn "error in event callback: @_";
148}; 163};
149 164
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 165=head2 UTILITY FUNCTIONS
155 166
156=over 4 167=over 4
157 168
169=item dumpval $ref
170
158=cut 171=cut
172
173sub dumpval {
174 eval {
175 local $SIG{__DIE__};
176 my $d;
177 if (1) {
178 $d = new Data::Dumper([$_[0]], ["*var"]);
179 $d->Terse(1);
180 $d->Indent(2);
181 $d->Quotekeys(0);
182 $d->Useqq(1);
183 #$d->Bless(...);
184 $d->Seen($_[1]) if @_ > 1;
185 $d = $d->Dump();
186 }
187 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
188 $d
189 } || "[unable to dump $_[0]: '$@']";
190}
159 191
160use JSON::Syck (); # TODO# replace by JSON::PC once working 192use JSON::Syck (); # TODO# replace by JSON::PC once working
161 193
162=item $ref = cf::from_json $json 194=item $ref = cf::from_json $json
163 195
228 260
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 261 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 262 $TICK_WATCHER->stop;
231 $guard 263 $guard
232} 264}
265
266=item cf::async { BLOCK }
267
268Currently the same as Coro::async_pool, meaning you cannot use
269C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
270thing you are allowed to do is call C<prio> on it.
271
272=cut
273
274BEGIN { *async = \&Coro::async_pool }
233 275
234=item cf::sync_job { BLOCK } 276=item cf::sync_job { BLOCK }
235 277
236The design of crossfire+ requires that the main coro ($Coro::main) is 278The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 279always able to handle events or runnable, as crossfire+ is only partly
256 my $freeze_guard = freeze_mainloop; 298 my $freeze_guard = freeze_mainloop;
257 299
258 my $busy = 1; 300 my $busy = 1;
259 my @res; 301 my @res;
260 302
261 (Coro::async_pool { 303 (async {
262 @res = eval { $job->() }; 304 @res = eval { $job->() };
263 warn $@ if $@; 305 warn $@ if $@;
264 undef $busy; 306 undef $busy;
265 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
266 308
267 while ($busy) { 309 while ($busy) {
268 unless (Coro::cede) { 310 Coro::cede or Event::one_event;
269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
272 } 311 }
273 312
274 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
275 } else { 314 } else {
276 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
277 316
278 $job->() 317 $job->()
279 } 318 }
280} 319}
281 320
282=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
283 322
284Creates (and readies) and returns a new coro. This coro is automcatially 323Like async, but this coro is automatically being canceled when the
285being canceled when the extension calling this is being unloaded. 324extension calling this is being unloaded.
286 325
287=cut 326=cut
288 327
289sub coro(&) { 328sub async_ext(&) {
290 my $cb = shift; 329 my $cb = shift;
291 330
292 my $coro = &Coro::async_pool ($cb); 331 my $coro = &Coro::async ($cb);
293 332
294 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
295 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
296 }); 335 });
297 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
327 366
328############################################################################# 367#############################################################################
329 368
330package cf::path; 369package cf::path;
331 370
371use overload
372 '""' => \&as_string;
373
374# used to convert map paths into valid unix filenames by repalcing / by ∕
375our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
376
377sub register {
378 my ($pkg, $prefix) = @_;
379
380 $EXT_MAP{$prefix} = $pkg;
381}
382
332sub new { 383sub new {
333 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
334 385
335 $path = $path->as_string if ref $path; 386 return $path if ref $path;
336 387
337 my $self = bless { }, $class; 388 my $self = {};
338 389
339 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
340 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
341 # ?random/... random maps 392 # ?random/... random maps
342 # /! non-realised random map exit 393 # /! non-realised random map exit
343 # /... normal maps 394 # /... normal maps
344 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
345 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
346 397
398 $path =~ s/$PATH_SEP/\//go;
399
347 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
348 # fine as it is 401 # fine as it is
349 } elsif ($path =~ s{^\?random/}{}) {
350 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
351 $self->{random} = cf::from_json $data;
352 } else { 402 } else {
353 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
354 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
355 406
356 if (defined $1) { 407 if (defined $1) {
357 $self->{user} = $1; 408 $self->{user} = $1;
358 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
359 $self->{user} = $1; 410 $self->{user} = $1;
360 } else { 411 } else {
361 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
362 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
363 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
364 # already absolute 422 # already absolute
365 } else { 423 } else {
424 # relative
366 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
367 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
368 } 427 }
369 428
370 for ($path) { 429 for ($path) {
373 } 432 }
374 } 433 }
375 434
376 $self->{path} = $path; 435 $self->{path} = $path;
377 436
437 if ("HASH" eq ref $self) {
438 bless $self, $class;
439 } else {
440 $self->init;
441 }
442
443 for my $ext (values %EXT_MAP) {
444 if (my $subst = $ext->substitute ($self)) {
445 return $subst;
446 }
447 }
448
378 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
379} 458}
380 459
381# the name / primary key / in-game path 460# the name / primary key / in-game path
382sub as_string { 461sub as_string {
383 my ($self) = @_; 462 my ($self) = @_;
384 463
385 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
386 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
387 : $self->{path} 466 : $self->{path}
388} 467}
389 468
390# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
391sub visible_name { 470sub visible_name {
392 my ($self) = @_; 471 &as_string
393
394# if (my $rmp = $self->{random}) {
395# # todo: be more intelligent about this
396# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
397# } else {
398 $self->as_string
399# }
400} 472}
401 473
402# escape the /'s in the path 474# escape the /'s in the path
403sub _escaped_path { 475sub _escaped_path {
404 # ∕ is U+2215
405 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
406 $path 477 $path
407} 478}
408 479
409# the original (read-only) location 480# the original (read-only) location
410sub load_path { 481sub load_path {
420 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
421 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} 492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
422 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
423} 494}
424 495
425# the unique path, might be eq to save_path 496# the unique path, undef == no special unique path
426sub uniq_path { 497sub uniq_path {
427 my ($self) = @_; 498 my ($self) = @_;
428 499
429 $self->{user_rel} || $self->{random}
430 ? undef
431 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
432}
433
434# return random map parameters, or undef
435sub random_map_params {
436 my ($self) = @_;
437
438 $self->{random}
439} 501}
440 502
441# this is somewhat ugly, but style maps do need special treatment 503# this is somewhat ugly, but style maps do need special treatment
442sub is_style_map { 504sub is_style_map {
443 $_[0]{path} =~ m{^/styles/} 505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
444} 518}
445 519
446package cf; 520package cf;
447 521
448############################################################################# 522#############################################################################
898=cut 972=cut
899 973
900sub register_extcmd { 974sub register_extcmd {
901 my ($name, $cb) = @_; 975 my ($name, $cb) = @_;
902 976
903 my $caller = caller;
904 #warn "registering extcmd '$name' to '$caller'";
905
906 $EXTCMD{$name} = [$cb, $caller]; 977 $EXTCMD{$name} = $cb;
907} 978}
908 979
909cf::player->attach ( 980cf::player->attach (
910 on_command => sub { 981 on_command => sub {
911 my ($pl, $name, $params) = @_; 982 my ($pl, $name, $params) = @_;
924 995
925 my $msg = eval { from_json $buf }; 996 my $msg = eval { from_json $buf };
926 997
927 if (ref $msg) { 998 if (ref $msg) {
928 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 999 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
929 if (my %reply = $cb->[0]->($pl, $msg)) { 1000 if (my %reply = $cb->($pl, $msg)) {
930 $pl->ext_reply ($msg->{msgid}, %reply); 1001 $pl->ext_reply ($msg->{msgid}, %reply);
931 } 1002 }
932 } 1003 }
933 } else { 1004 } else {
934 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1005 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
936 1007
937 cf::override; 1008 cf::override;
938 }, 1009 },
939); 1010);
940 1011
941sub register {
942 my ($base, $pkg) = @_;
943
944 #TODO
945}
946
947sub load_extension { 1012sub load_extension {
948 my ($path) = @_; 1013 my ($path) = @_;
949 1014
950 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1015 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
951 my $base = $1; 1016 my $base = $1;
952 my $pkg = $1; 1017 my $pkg = $1;
953 $pkg =~ s/[^[:word:]]/_/g; 1018 $pkg =~ s/[^[:word:]]/_/g;
954 $pkg = "ext::$pkg"; 1019 $pkg = "ext::$pkg";
955 1020
956 warn "loading '$path' into '$pkg'\n"; 1021 warn "... loading '$path' into '$pkg'\n";
957 1022
958 open my $fh, "<:utf8", $path 1023 open my $fh, "<:utf8", $path
959 or die "$path: $!"; 1024 or die "$path: $!";
960 1025
961 my $source = 1026 my $source =
966 1031
967 eval $source 1032 eval $source
968 or die $@ ? "$path: $@\n" 1033 or die $@ ? "$path: $@\n"
969 : "extension disabled.\n"; 1034 : "extension disabled.\n";
970 1035
971 push @exts, $pkg; 1036 push @EXTS, $pkg;
972 $ext_pkg{$base} = $pkg;
973
974# no strict 'refs';
975# @{"$pkg\::ISA"} = ext::;
976
977 register $base, $pkg;
978}
979
980sub unload_extension {
981 my ($pkg) = @_;
982
983 warn "removing extension $pkg\n";
984
985 # remove hooks
986 #TODO
987# for my $idx (0 .. $#PLUGIN_EVENT) {
988# delete $hook[$idx]{$pkg};
989# }
990
991 # remove commands
992 for my $name (keys %COMMAND) {
993 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
994
995 if (@cb) {
996 $COMMAND{$name} = \@cb;
997 } else {
998 delete $COMMAND{$name};
999 }
1000 }
1001
1002 # remove extcmds
1003 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1004 delete $EXTCMD{$name};
1005 }
1006
1007 if (my $cb = $pkg->can ("unload")) {
1008 eval {
1009 $cb->($pkg);
1010 1
1011 } or warn "$pkg unloaded, but with errors: $@";
1012 }
1013
1014 Symbol::delete_package $pkg;
1015} 1037}
1016 1038
1017sub load_extensions { 1039sub load_extensions {
1018 for my $ext (<$LIBDIR/*.ext>) { 1040 for my $ext (<$LIBDIR/*.ext>) {
1019 next unless -r $ext; 1041 next unless -r $ext;
1037}; 1059};
1038 1060
1039cf::map->attach (prio => -10000, package => cf::mapsupport::); 1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1040 1062
1041############################################################################# 1063#############################################################################
1042# load/save perl data associated with player->ob objects
1043
1044sub all_objects(@) {
1045 @_, map all_objects ($_->inv), @_
1046}
1047
1048# TODO: compatibility cruft, remove when no longer needed
1049cf::player->attach (
1050 on_load => sub {
1051 my ($pl, $path) = @_;
1052
1053 for my $o (all_objects $pl->ob) {
1054 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1055 $o->set_ob_key_value ("_perl_data");
1056
1057 %$o = %{ Storable::thaw pack "H*", $value };
1058 }
1059 }
1060 },
1061);
1062
1063#############################################################################
1064 1064
1065=head2 CORE EXTENSIONS 1065=head2 CORE EXTENSIONS
1066 1066
1067Functions and methods that extend core crossfire objects. 1067Functions and methods that extend core crossfire objects.
1068 1068
1069=cut
1070
1071package cf::player;
1072
1073use Coro::AIO;
1074
1069=head3 cf::player 1075=head3 cf::player
1070 1076
1071=over 4 1077=over 4
1072 1078
1073=item cf::player::exists $login 1079=item cf::player::find $login
1074 1080
1075Returns true when the given account exists. 1081Returns the given player object, loading it if necessary (might block).
1076 1082
1077=cut 1083=cut
1078 1084
1079sub cf::player::exists($) { 1085sub playerdir($) {
1080 cf::player::find $_[0] 1086 cf::localdir
1081 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1087 . "/"
1088 . cf::playerdir
1089 . "/"
1090 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1091}
1092
1093sub path($) {
1094 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1095
1096 (playerdir $login) . "/$login.pl"
1097}
1098
1099sub find_active($) {
1100 $cf::PLAYER{$_[0]}
1101 and $cf::PLAYER{$_[0]}->active
1102 and $cf::PLAYER{$_[0]}
1103}
1104
1105sub exists($) {
1106 my ($login) = @_;
1107
1108 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login }
1110}
1111
1112sub find($) {
1113 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0];
1115
1116 my $guard = cf::lock_acquire "user_find:$login";
1117
1118 $cf::PLAYER{$_[0]} || do {
1119 my $pl = load_pl path $login
1120 or return;
1121 $cf::PLAYER{$login} = $pl
1122 }
1123 }
1124}
1125
1126sub save($) {
1127 my ($pl) = @_;
1128
1129 return if $pl->{deny_save};
1130
1131 my $path = path $pl;
1132 my $guard = cf::lock_acquire "user_save:$path";
1133
1134 return if $pl->{deny_save};
1135
1136 aio_mkdir playerdir $pl, 0770;
1137 $pl->{last_save} = $cf::RUNTIME;
1138
1139 $pl->save_pl ($path);
1140 Coro::cede;
1141}
1142
1143sub new($) {
1144 my ($login) = @_;
1145
1146 my $self = create;
1147
1148 $self->ob->name ($login);
1149 $self->{deny_save} = 1;
1150
1151 $cf::PLAYER{$login} = $self;
1152
1153 $self
1154}
1155
1156=item $pl->quit_character
1157
1158Nukes the player without looking back. If logged in, the connection will
1159be destroyed. May block for a long time.
1160
1161=cut
1162
1163sub quit_character {
1164 my ($pl) = @_;
1165
1166 $pl->{deny_save} = 1;
1167 $pl->password ("*"); # this should lock out the player until we nuked the dir
1168
1169 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1170 $pl->deactivate;
1171 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1172 $pl->ns->destroy if $pl->ns;
1173
1174 my $path = playerdir $pl;
1175 my $temp = "$path~$cf::RUNTIME~deleting~";
1176 aio_rename $path, $temp;
1177 delete $cf::PLAYER{$pl->ob->name};
1178 $pl->destroy;
1179 IO::AIO::aio_rmtree $temp;
1180}
1181
1182=item cf::player::list_logins
1183
1184Returns am arrayref of all valid playernames in the system, can take a
1185while and may block, so not sync_job-capable, ever.
1186
1187=cut
1188
1189sub list_logins {
1190 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1191 or return [];
1192
1193 my @logins;
1194
1195 for my $login (@$dirs) {
1196 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1197 aio_read $fh, 0, 512, my $buf, 0 or next;
1198 $buf !~ /^password -------------$/m or next; # official not-valid tag
1199
1200 utf8::decode $login;
1201 push @logins, $login;
1202 }
1203
1204 \@logins
1205}
1206
1207=item $player->maps
1208
1209Returns an arrayref of cf::path's of all maps that are private for this
1210player. May block.
1211
1212=cut
1213
1214sub maps($) {
1215 my ($pl) = @_;
1216
1217 my $files = aio_readdir playerdir $pl
1218 or return;
1219
1220 my @paths;
1221
1222 for (@$files) {
1223 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o;
1226
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1228 }
1229
1230 \@paths
1082} 1231}
1083 1232
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1233=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1234
1086Sends an ext reply to the player. 1235Sends an ext reply to the player.
1087 1236
1088=cut 1237=cut
1089 1238
1090sub cf::player::ext_reply($$$%) { 1239sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1240 my ($self, $id, %msg) = @_;
1092 1241
1093 $msg{msgid} = $id; 1242 $msg{msgid} = $id;
1094 1243
1095 $self->send ("ext " . to_json \%msg); 1244 $self->send ("ext " . cf::to_json \%msg);
1096} 1245}
1246
1247package cf;
1097 1248
1098=back 1249=back
1099 1250
1100 1251
1101=head3 cf::map 1252=head3 cf::map
1138 1289
1139 $_->change_map_light ($change) 1290 $_->change_map_light ($change)
1140 for grep $_->outdoor, values %cf::MAP; 1291 for grep $_->outdoor, values %cf::MAP;
1141} 1292}
1142 1293
1143sub try_load_header($) { 1294sub load_map_header($) {
1144 my ($path) = @_; 1295 my ($path) = @_;
1145 1296
1146 utf8::encode $path; 1297 utf8::encode $path;
1147 aio_open $path, O_RDONLY, 0 1298 aio_open $path, O_RDONLY, 0
1148 or return; 1299 or return;
1149 1300
1150 my $map = cf::map::new 1301 my $map = cf::map::new
1151 or return; 1302 or return;
1152 1303
1153 # for better error messages only, will be overwritten 1304 # for better error messages only, will be overwritten later
1154 $map->path ($path); 1305 $map->path ($path);
1155 1306
1156 $map->load_header ($path) 1307 $map->load_header ($path)
1157 or return; 1308 or return;
1158 1309
1174 1325
1175 $cf::MAP{$key} || do { 1326 $cf::MAP{$key} || do {
1176 my $guard = cf::lock_acquire "map_find:$key"; 1327 my $guard = cf::lock_acquire "map_find:$key";
1177 1328
1178 # do it the slow way 1329 # do it the slow way
1179 my $map = try_load_header $path->save_path; 1330 my $map = $path->load_temp;
1180 1331
1181 Coro::cede; 1332 Coro::cede;
1182 1333
1183 if ($map) { 1334 if ($map) {
1184 $map->last_access ((delete $map->{last_access}) 1335 $map->last_access ((delete $map->{last_access})
1185 || $cf::RUNTIME); #d# 1336 || $cf::RUNTIME); #d#
1186 # safety 1337 # safety
1187 $map->{instantiate_time} = $cf::RUNTIME 1338 $map->{instantiate_time} = $cf::RUNTIME
1188 if $map->{instantiate_time} > $cf::RUNTIME; 1339 if $map->{instantiate_time} > $cf::RUNTIME;
1189 } else { 1340 } else {
1190 if (my $rmp = $path->random_map_params) { 1341 $map = $path->load_orig
1191 $map = generate_random_map $key, $rmp;
1192 } else {
1193 $map = try_load_header $path->load_path;
1194 }
1195
1196 $map or return; 1342 or return;
1197 1343
1198 $map->{load_original} = 1; 1344 $map->{load_original} = 1;
1199 $map->{instantiate_time} = $cf::RUNTIME; 1345 $map->{instantiate_time} = $cf::RUNTIME;
1200 $map->last_access ($cf::RUNTIME); 1346 $map->last_access ($cf::RUNTIME);
1201 $map->instantiate; 1347 $map->instantiate;
1267 Coro::cede; 1413 Coro::cede;
1268 1414
1269 $self->in_memory (cf::MAP_IN_MEMORY); 1415 $self->in_memory (cf::MAP_IN_MEMORY);
1270} 1416}
1271 1417
1418# find and load all maps in the 3x3 area around a map
1419sub load_diag {
1420 my ($map) = @_;
1421
1422 my @diag; # diagonal neighbours
1423
1424 for (0 .. 3) {
1425 my $neigh = $map->tile_path ($_)
1426 or next;
1427 $neigh = find $neigh, $map
1428 or next;
1429 $neigh->load;
1430
1431 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1432 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1433 }
1434
1435 for (@diag) {
1436 my $neigh = find @$_
1437 or next;
1438 $neigh->load;
1439 }
1440}
1441
1272sub find_sync { 1442sub find_sync {
1273 my ($path, $origin) = @_; 1443 my ($path, $origin) = @_;
1274 1444
1275 cf::sync_job { 1445 cf::sync_job { find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1446}
1280 1447
1281sub do_load_sync { 1448sub do_load_sync {
1282 my ($map) = @_; 1449 my ($map) = @_;
1283 1450
1284 cf::sync_job { $map->load }; 1451 cf::sync_job { $map->load };
1285} 1452}
1286 1453
1454our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async {
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469
1470sub find_async {
1471 my ($path, $origin) = @_;
1472
1473 $path = new cf::path $path, $origin && $origin->path;
1474 my $key = $path->as_string;
1475
1476 if (my $map = $cf::MAP{$key}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 }
1479
1480 $MAP_PREFETCH{$key} = $path;
1481 $MAP_PREFETCHER->ready;
1482
1483 ()
1484}
1485
1287sub save { 1486sub save {
1288 my ($self) = @_; 1487 my ($self) = @_;
1289 1488
1290 my $lock = cf::lock_acquire "map_data:" . $self->path; 1489 my $lock = cf::lock_acquire "map_data:" . $self->path;
1291 1490
1299 $self->{load_path} = $save; 1498 $self->{load_path} = $save;
1300 1499
1301 return if $self->{deny_save}; 1500 return if $self->{deny_save};
1302 1501
1303 local $self->{last_access} = $self->last_access;#d# 1502 local $self->{last_access} = $self->last_access;#d#
1503
1504 cf::async {
1505 $_->contr->save for $self->players;
1506 };
1304 1507
1305 if ($uniq) { 1508 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1510 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1511 } else {
1403 } 1606 }
1404 1607
1405 $map 1608 $map
1406} 1609}
1407 1610
1408sub emergency_save { 1611=item cf::map::unique_maps
1409 my $freeze_guard = cf::freeze_mainloop;
1410 1612
1411 warn "enter emergency map save\n"; 1613Returns an arrayref of cf::path's of all shared maps that have
1614instantiated unique items. May block.
1412 1615
1413 cf::sync_job { 1616=cut
1414 warn "begin emergency map save\n"; 1617
1415 $_->save for values %cf::MAP; 1618sub unique_maps() {
1619 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1620 or return;
1621
1622 my @paths;
1623
1624 for (@$files) {
1625 utf8::decode $_;
1626 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o;
1628
1629 push @paths, new cf::path $_;
1416 }; 1630 }
1417 1631
1418 warn "end emergency map save\n"; 1632 \@paths
1419} 1633}
1420 1634
1421package cf; 1635package cf;
1422 1636
1423=back 1637=back
1424 1638
1639=head3 cf::object
1640
1641=cut
1642
1643package cf::object;
1644
1645=over 4
1646
1647=item $ob->inv_recursive
1648
1649Returns the inventory of the object _and_ their inventories, recursively.
1650
1651=cut
1652
1653sub inv_recursive_;
1654sub inv_recursive_ {
1655 map { $_, inv_recursive_ $_->inv } @_
1656}
1657
1658sub inv_recursive {
1659 inv_recursive_ inv $_[0]
1660}
1661
1662package cf;
1663
1664=back
1425 1665
1426=head3 cf::object::player 1666=head3 cf::object::player
1427 1667
1428=over 4 1668=over 4
1429 1669
1521 # use -1 or undef as default coordinates, not 0, 0 1761 # use -1 or undef as default coordinates, not 0, 0
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1762 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1763 if $x <=0 && $y <= 0;
1524 1764
1525 $map->load; 1765 $map->load;
1766 $map->load_diag;
1526 1767
1768 return unless $self->contr->active;
1527 $self->activate_recursive; 1769 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1770 $self->enter_map ($map, $x, $y);
1529} 1771}
1530 1772
1531cf::player->attach ( 1773cf::player->attach (
1543 my ($pl) = @_; 1785 my ($pl) = @_;
1544 1786
1545 # try to abort aborted map switching on player login :) 1787 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1788 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1789 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1790 $pl->ob->enter_link;
1550 (Coro::async_pool { 1791 (async {
1551 # we need this sleep as the login has a concurrent enter_exit running 1792 # we need this sleep as the login has a concurrent enter_exit running
1552 # and this sleep increases chances of the player not ending up in scorn 1793 # and this sleep increases chances of the player not ending up in scorn
1794 $pl->ob->reply (undef,
1795 "There was an internal problem at your last logout, "
1796 . "the server will try to bring you to your intended destination in a second.",
1797 cf::NDI_RED);
1553 Coro::Timer::sleep 1; 1798 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1799 $pl->ob->leave_link;
1555 })->prio (2); 1800 })->prio (2);
1556 } 1801 }
1557 }, 1802 },
1562=cut 1807=cut
1563 1808
1564sub cf::object::player::goto { 1809sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1810 my ($self, $path, $x, $y) = @_;
1566 1811
1812 $path = new cf::path $path;
1813
1567 $self->enter_link; 1814 $self->enter_link;
1568 1815
1569 (Coro::async_pool { 1816 (async {
1570 $path = new cf::path $path;
1571
1572 my $map = cf::map::find $path->as_string; 1817 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1818 $map = $map->customise_for ($self) if $map;
1574 1819
1575# warn "entering ", $map->path, " at ($x, $y)\n" 1820# warn "entering ", $map->path, " at ($x, $y)\n"
1576# if $map; 1821# if $map;
1577 1822
1578 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1823 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1579 1824
1580 $self->leave_link ($map, $x, $y); 1825 $self->leave_link ($map, $x, $y);
1581 })->prio (1); 1826 })->prio (1);
1582} 1827}
1583 1828
1636 1881
1637 return unless $self->type == cf::PLAYER; 1882 return unless $self->type == cf::PLAYER;
1638 1883
1639 $self->enter_link; 1884 $self->enter_link;
1640 1885
1641 (Coro::async_pool { 1886 (async {
1642 $self->deactivate_recursive; # just to be sure 1887 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1888 unless (eval {
1644 prepare_random_map $exit 1889 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1890 if $exit->slaying eq "/!";
1646 1891
1649 1894
1650 1; 1895 1;
1651 }) { 1896 }) {
1652 $self->message ("Something went wrong deep within the crossfire server. " 1897 $self->message ("Something went wrong deep within the crossfire server. "
1653 . "I'll try to bring you back to the map you were before. " 1898 . "I'll try to bring you back to the map you were before. "
1654 . "Please report this to the dungeon master", 1899 . "Please report this to the dungeon master!",
1655 cf::NDI_UNIQUE | cf::NDI_RED); 1900 cf::NDI_UNIQUE | cf::NDI_RED);
1656 1901
1657 warn "ERROR in enter_exit: $@"; 1902 warn "ERROR in enter_exit: $@";
1658 $self->leave_link; 1903 $self->leave_link;
1659 } 1904 }
1727 } 1972 }
1728 } 1973 }
1729 }, 1974 },
1730); 1975);
1731 1976
1732=item $client->coro (\&cb) 1977=item $client->async (\&cb)
1733 1978
1734Create a new coroutine, running the specified callback. The coroutine will 1979Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 1980be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 1981or loss of connection).
1737 1982
1738=cut 1983=cut
1739 1984
1740sub cf::client::coro { 1985sub cf::client::async {
1741 my ($self, $cb) = @_; 1986 my ($self, $cb) = @_;
1742 1987
1743 my $coro = &Coro::async_pool ($cb); 1988 my $coro = &Coro::async ($cb);
1744 1989
1745 $coro->on_destroy (sub { 1990 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 1991 delete $self->{_coro}{$coro+0};
1747 }); 1992 });
1748 1993
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2236 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2237 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993 2238
1994 if (exists $CFG{mlockall}) { 2239 if (exists $CFG{mlockall}) {
1995 eval { 2240 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall 2241 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1997 and die "WARNING: m(un)lockall failed: $!\n"; 2242 and die "WARNING: m(un)lockall failed: $!\n";
1998 }; 2243 };
1999 warn $@ if $@; 2244 warn $@ if $@;
2000 } 2245 }
2001} 2246}
2002 2247
2003sub main { 2248sub main {
2004 # we must not ever block the main coroutine 2249 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2250 local $Coro::idle = sub {
2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2251 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007 Coro::async_pool { Event::one_event }; 2252 async { Event::one_event };
2008 }; 2253 };
2009 2254
2010 cfg_load; 2255 cfg_load;
2011 db_load; 2256 db_load;
2012 load_extensions; 2257 load_extensions;
2013 Event::loop; 2258 Event::loop;
2014} 2259}
2015 2260
2016############################################################################# 2261#############################################################################
2017# initialisation 2262# initialisation and cleanup
2263
2264# install some emergency cleanup handlers
2265BEGIN {
2266 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal (
2268 data => WF_AUTOCANCEL,
2269 signal => $signal,
2270 cb => sub {
2271 cf::cleanup "SIG$signal";
2272 },
2273 );
2274 }
2275}
2276
2277sub emergency_save() {
2278 my $freeze_guard = cf::freeze_mainloop;
2279
2280 warn "enter emergency perl save\n";
2281
2282 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously.
2286 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next;
2290 $pl->save;
2291 }
2292 warn "end emergency player save\n";
2293
2294 warn "begin emergency map save\n";
2295 for my $path (keys %cf::MAP) {
2296 my $map = $cf::MAP{$path} or next;
2297 $map->valid or next;
2298 $map->save;
2299 }
2300 warn "end emergency map save\n";
2301 };
2302
2303 warn "leave emergency perl save\n";
2304}
2018 2305
2019sub reload() { 2306sub reload() {
2020 # can/must only be called in main 2307 # can/must only be called in main
2021 if ($Coro::current != $Coro::main) { 2308 if ($Coro::current != $Coro::main) {
2022 warn "can only reload from main coroutine\n"; 2309 warn "can only reload from main coroutine\n";
2023 return; 2310 return;
2024 } 2311 }
2025 2312
2026 warn "reloading..."; 2313 warn "reloading...";
2027 2314
2315 warn "freezing server";
2028 my $guard = freeze_mainloop; 2316 my $guard = freeze_mainloop;
2029 cf::emergency_save; 2317 cf::emergency_save;
2030 2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322
2031 eval { 2323 eval {
2032 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2033 2325
2034 # cancel all watchers 2326 warn "cancel all watchers";
2035 for (Event::all_watchers) { 2327 for (Event::all_watchers) {
2036 $_->cancel if $_->data & WF_AUTOCANCEL; 2328 $_->cancel if $_->data & WF_AUTOCANCEL;
2037 } 2329 }
2038 2330
2039 # cancel all extension coros 2331 warn "cancel all extension coros";
2040 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2041 %EXT_CORO = (); 2333 %EXT_CORO = ();
2042 2334
2335 warn "remove commands";
2336 %COMMAND = ();
2337
2338 warn "remove ext commands";
2339 %EXTCMD = ();
2340
2043 # unload all extensions 2341 warn "unload/nuke all extensions";
2044 for (@exts) { 2342 for my $pkg (@EXTS) {
2045 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2046 unload_extension $_; 2344
2345 if (my $cb = $pkg->can ("unload")) {
2346 eval {
2347 $cb->($pkg);
2348 1
2349 } or warn "$pkg unloaded, but with errors: $@";
2047 } 2350 }
2048 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2049 # unload all modules loaded from $LIBDIR 2356 warn "unload all perl modules loaded from $LIBDIR";
2050 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2052 2359
2053 warn "removing <$k>"; 2360 warn "removing <$k>";
2054 delete $INC{$k}; 2361 delete $INC{$k};
2061 } 2368 }
2062 2369
2063 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2064 } 2371 }
2065 2372
2066 # sync database to disk
2067 cf::db_sync;
2068 IO::AIO::flush;
2069
2070 # get rid of safe::, as good as possible 2373 warn "get rid of safe::, as good as possible";
2071 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2072 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2073 2376
2074 # remove register_script_function callbacks
2075 # TODO
2076
2077 # unload cf.pm "a bit" 2377 warn "unload cf.pm \"a bit\"";
2078 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2079 2379
2080 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2081 # and global variables created in xs 2381 # and global variables created in xs
2082 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2083 2383
2084 # reload cf.pm
2085 warn "reloading cf.pm"; 2384 warn "reloading cf.pm";
2086 require cf; 2385 require cf;
2087 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2088 2387
2089 # load config and database again 2388 warn "load config and database again";
2090 cf::cfg_load; 2389 cf::cfg_load;
2091 cf::db_load; 2390 cf::db_load;
2092 2391
2093 # load extensions
2094 warn "load extensions"; 2392 warn "load extensions";
2095 cf::load_extensions; 2393 cf::load_extensions;
2096 2394
2097 # reattach attachments to objects 2395 warn "reattach attachments to objects/players";
2098 warn "reattach";
2099 _global_reattach; 2396 _global_reattach;
2397 warn "reattach attachments to maps";
2398 reattach $_ for values %MAP;
2100 }; 2399 };
2101 2400
2102 if ($@) { 2401 if ($@) {
2103 warn $@; 2402 warn $@;
2104 warn "error while reloading, exiting."; 2403 warn "error while reloading, exiting.";
2105 exit 1; 2404 exit 1;
2106 } 2405 }
2107 2406
2108 warn "reloaded successfully"; 2407 warn "reloaded";
2109}; 2408};
2110 2409
2111############################################################################# 2410#############################################################################
2112 2411
2113unless ($LINK_MAP) { 2412unless ($LINK_MAP) {
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2421
2123 # dirty hack because... archetypes are not yet loaded 2422 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2423 Event->timer (
2125 after => 2, 2424 after => 10,
2126 cb => sub { 2425 cb => sub {
2127 $_[0]->w->cancel; 2426 $_[0]->w->cancel;
2128 2427
2129 # provide some exits "home" 2428 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2429 my $exit = cf::object::new "exit";
2148 $LINK_MAP->{deny_save} = 1; 2447 $LINK_MAP->{deny_save} = 1;
2149 $LINK_MAP->{deny_reset} = 1; 2448 $LINK_MAP->{deny_reset} = 1;
2150 2449
2151 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2152} 2451}
2153
2154register "<global>", __PACKAGE__;
2155 2452
2156register_command "reload" => sub { 2453register_command "reload" => sub {
2157 my ($who, $arg) = @_; 2454 my ($who, $arg) = @_;
2158 2455
2159 if ($who->flag (FLAG_WIZ)) { 2456 if ($who->flag (FLAG_WIZ)) {
2172 data => WF_AUTOCANCEL, 2469 data => WF_AUTOCANCEL,
2173 cb => sub { 2470 cb => sub {
2174 cf::server_tick; # one server iteration 2471 cf::server_tick; # one server iteration
2175 $RUNTIME += $TICK; 2472 $RUNTIME += $TICK;
2176 $NEXT_TICK += $TICK; 2473 $NEXT_TICK += $TICK;
2474
2475 $WAIT_FOR_TICK->broadcast;
2476 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2177 2477
2178 # if we are delayed by four ticks or more, skip them all 2478 # if we are delayed by four ticks or more, skip them all
2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2180 2480
2181 $TICK_WATCHER->at ($NEXT_TICK); 2481 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines