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.138 by root, Fri Jan 5 17:07:17 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 (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 = ();
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 Coro::cede_notself; 310 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 311 }
271 312
272 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
273 } else { 314 } else {
274 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
275 316
276 $job->() 317 $job->()
277 } 318 }
278} 319}
279 320
280=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
281 322
282Creates (and readies) and returns a new coro. This coro is automcatially 323Like async, but this coro is automatically being canceled when the
283being canceled when the extension calling this is being unloaded. 324extension calling this is being unloaded.
284 325
285=cut 326=cut
286 327
287sub coro(&) { 328sub async_ext(&) {
288 my $cb = shift; 329 my $cb = shift;
289 330
290 my $coro = &Coro::async_pool ($cb); 331 my $coro = &Coro::async ($cb);
291 332
292 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
294 }); 335 });
295 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
325 366
326############################################################################# 367#############################################################################
327 368
328package cf::path; 369package cf::path;
329 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
330sub new { 383sub new {
331 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
332 385
333 $path = $path->as_string if ref $path; 386 return $path if ref $path;
334 387
335 my $self = bless { }, $class; 388 my $self = {};
336 389
337 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
338 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
339 # ?random/... random maps 392 # ?random/... random maps
340 # /! non-realised random map exit 393 # /! non-realised random map exit
341 # /... normal maps 394 # /... normal maps
342 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
343 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
344 397
398 $path =~ s/$PATH_SEP/\//go;
399
345 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
346 # fine as it is 401 # fine as it is
347 } elsif ($path =~ s{^\?random/}{}) {
348 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
349 $self->{random} = cf::from_json $data;
350 } else { 402 } else {
351 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
352 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
353 406
354 if (defined $1) { 407 if (defined $1) {
355 $self->{user} = $1; 408 $self->{user} = $1;
356 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
357 $self->{user} = $1; 410 $self->{user} = $1;
358 } else { 411 } else {
359 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
360 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
361 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
362 # already absolute 422 # already absolute
363 } else { 423 } else {
424 # relative
364 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
365 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
366 } 427 }
367 428
368 for ($path) { 429 for ($path) {
371 } 432 }
372 } 433 }
373 434
374 $self->{path} = $path; 435 $self->{path} = $path;
375 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
376 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
377} 458}
378 459
379# the name / primary key / in-game path 460# the name / primary key / in-game path
380sub as_string { 461sub as_string {
381 my ($self) = @_; 462 my ($self) = @_;
382 463
383 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
384 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
385 : $self->{path} 466 : $self->{path}
386} 467}
387 468
388# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
389sub visible_name { 470sub visible_name {
390 my ($self) = @_; 471 &as_string
391
392# if (my $rmp = $self->{random}) {
393# # todo: be more intelligent about this
394# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
395# } else {
396 $self->as_string
397# }
398} 472}
399 473
400# escape the /'s in the path 474# escape the /'s in the path
401sub _escaped_path { 475sub _escaped_path {
402 # ∕ is U+2215
403 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
404 $path 477 $path
405} 478}
406 479
407# the original (read-only) location 480# the original (read-only) location
408sub load_path { 481sub load_path {
418 $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
419 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} 492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
420 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
421} 494}
422 495
423# the unique path, might be eq to save_path 496# the unique path, undef == no special unique path
424sub uniq_path { 497sub uniq_path {
425 my ($self) = @_; 498 my ($self) = @_;
426 499
427 $self->{user_rel} || $self->{random}
428 ? undef
429 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
430}
431
432# return random map parameters, or undef
433sub random_map_params {
434 my ($self) = @_;
435
436 $self->{random}
437} 501}
438 502
439# this is somewhat ugly, but style maps do need special treatment 503# this is somewhat ugly, but style maps do need special treatment
440sub is_style_map { 504sub is_style_map {
441 $_[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)
442} 518}
443 519
444package cf; 520package cf;
445 521
446############################################################################# 522#############################################################################
896=cut 972=cut
897 973
898sub register_extcmd { 974sub register_extcmd {
899 my ($name, $cb) = @_; 975 my ($name, $cb) = @_;
900 976
901 my $caller = caller;
902 #warn "registering extcmd '$name' to '$caller'";
903
904 $EXTCMD{$name} = [$cb, $caller]; 977 $EXTCMD{$name} = $cb;
905} 978}
906 979
907cf::player->attach ( 980cf::player->attach (
908 on_command => sub { 981 on_command => sub {
909 my ($pl, $name, $params) = @_; 982 my ($pl, $name, $params) = @_;
922 995
923 my $msg = eval { from_json $buf }; 996 my $msg = eval { from_json $buf };
924 997
925 if (ref $msg) { 998 if (ref $msg) {
926 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 999 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
927 if (my %reply = $cb->[0]->($pl, $msg)) { 1000 if (my %reply = $cb->($pl, $msg)) {
928 $pl->ext_reply ($msg->{msgid}, %reply); 1001 $pl->ext_reply ($msg->{msgid}, %reply);
929 } 1002 }
930 } 1003 }
931 } else { 1004 } else {
932 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1005 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
934 1007
935 cf::override; 1008 cf::override;
936 }, 1009 },
937); 1010);
938 1011
939sub register {
940 my ($base, $pkg) = @_;
941
942 #TODO
943}
944
945sub load_extension { 1012sub load_extension {
946 my ($path) = @_; 1013 my ($path) = @_;
947 1014
948 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1015 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
949 my $base = $1; 1016 my $base = $1;
950 my $pkg = $1; 1017 my $pkg = $1;
951 $pkg =~ s/[^[:word:]]/_/g; 1018 $pkg =~ s/[^[:word:]]/_/g;
952 $pkg = "ext::$pkg"; 1019 $pkg = "ext::$pkg";
953 1020
954 warn "loading '$path' into '$pkg'\n"; 1021 warn "... loading '$path' into '$pkg'\n";
955 1022
956 open my $fh, "<:utf8", $path 1023 open my $fh, "<:utf8", $path
957 or die "$path: $!"; 1024 or die "$path: $!";
958 1025
959 my $source = 1026 my $source =
964 1031
965 eval $source 1032 eval $source
966 or die $@ ? "$path: $@\n" 1033 or die $@ ? "$path: $@\n"
967 : "extension disabled.\n"; 1034 : "extension disabled.\n";
968 1035
969 push @exts, $pkg; 1036 push @EXTS, $pkg;
970 $ext_pkg{$base} = $pkg;
971
972# no strict 'refs';
973# @{"$pkg\::ISA"} = ext::;
974
975 register $base, $pkg;
976}
977
978sub unload_extension {
979 my ($pkg) = @_;
980
981 warn "removing extension $pkg\n";
982
983 # remove hooks
984 #TODO
985# for my $idx (0 .. $#PLUGIN_EVENT) {
986# delete $hook[$idx]{$pkg};
987# }
988
989 # remove commands
990 for my $name (keys %COMMAND) {
991 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
992
993 if (@cb) {
994 $COMMAND{$name} = \@cb;
995 } else {
996 delete $COMMAND{$name};
997 }
998 }
999
1000 # remove extcmds
1001 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1002 delete $EXTCMD{$name};
1003 }
1004
1005 if (my $cb = $pkg->can ("unload")) {
1006 eval {
1007 $cb->($pkg);
1008 1
1009 } or warn "$pkg unloaded, but with errors: $@";
1010 }
1011
1012 Symbol::delete_package $pkg;
1013} 1037}
1014 1038
1015sub load_extensions { 1039sub load_extensions {
1016 for my $ext (<$LIBDIR/*.ext>) { 1040 for my $ext (<$LIBDIR/*.ext>) {
1017 next unless -r $ext; 1041 next unless -r $ext;
1035}; 1059};
1036 1060
1037cf::map->attach (prio => -10000, package => cf::mapsupport::); 1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1038 1062
1039############################################################################# 1063#############################################################################
1040# load/save perl data associated with player->ob objects
1041
1042sub all_objects(@) {
1043 @_, map all_objects ($_->inv), @_
1044}
1045
1046# TODO: compatibility cruft, remove when no longer needed
1047cf::player->attach (
1048 on_load => sub {
1049 my ($pl, $path) = @_;
1050
1051 for my $o (all_objects $pl->ob) {
1052 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1053 $o->set_ob_key_value ("_perl_data");
1054
1055 %$o = %{ Storable::thaw pack "H*", $value };
1056 }
1057 }
1058 },
1059);
1060
1061#############################################################################
1062 1064
1063=head2 CORE EXTENSIONS 1065=head2 CORE EXTENSIONS
1064 1066
1065Functions and methods that extend core crossfire objects. 1067Functions and methods that extend core crossfire objects.
1066 1068
1069=cut
1070
1071package cf::player;
1072
1073use Coro::AIO;
1074
1067=head3 cf::player 1075=head3 cf::player
1068 1076
1069=over 4 1077=over 4
1070 1078
1071=item cf::player::exists $login 1079=item cf::player::find $login
1072 1080
1073Returns true when the given account exists. 1081Returns the given player object, loading it if necessary (might block).
1074 1082
1075=cut 1083=cut
1076 1084
1077sub cf::player::exists($) { 1085sub playerdir($) {
1078 cf::player::find $_[0] 1086 cf::localdir
1079 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
1080} 1231}
1081 1232
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1233=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1234
1084Sends an ext reply to the player. 1235Sends an ext reply to the player.
1085 1236
1086=cut 1237=cut
1087 1238
1088sub cf::player::ext_reply($$$%) { 1239sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1240 my ($self, $id, %msg) = @_;
1090 1241
1091 $msg{msgid} = $id; 1242 $msg{msgid} = $id;
1092 1243
1093 $self->send ("ext " . to_json \%msg); 1244 $self->send ("ext " . cf::to_json \%msg);
1094} 1245}
1246
1247package cf;
1095 1248
1096=back 1249=back
1097 1250
1098 1251
1099=head3 cf::map 1252=head3 cf::map
1136 1289
1137 $_->change_map_light ($change) 1290 $_->change_map_light ($change)
1138 for grep $_->outdoor, values %cf::MAP; 1291 for grep $_->outdoor, values %cf::MAP;
1139} 1292}
1140 1293
1141sub try_load_header($) { 1294sub load_map_header($) {
1142 my ($path) = @_; 1295 my ($path) = @_;
1143 1296
1144 utf8::encode $path; 1297 utf8::encode $path;
1145 aio_open $path, O_RDONLY, 0 1298 aio_open $path, O_RDONLY, 0
1146 or return; 1299 or return;
1147 1300
1148 my $map = cf::map::new 1301 my $map = cf::map::new
1149 or return; 1302 or return;
1150 1303
1151 # for better error messages only, will be overwritten 1304 # for better error messages only, will be overwritten later
1152 $map->path ($path); 1305 $map->path ($path);
1153 1306
1154 $map->load_header ($path) 1307 $map->load_header ($path)
1155 or return; 1308 or return;
1156 1309
1172 1325
1173 $cf::MAP{$key} || do { 1326 $cf::MAP{$key} || do {
1174 my $guard = cf::lock_acquire "map_find:$key"; 1327 my $guard = cf::lock_acquire "map_find:$key";
1175 1328
1176 # do it the slow way 1329 # do it the slow way
1177 my $map = try_load_header $path->save_path; 1330 my $map = $path->load_temp;
1178 1331
1179 Coro::cede; 1332 Coro::cede;
1180 1333
1181 if ($map) { 1334 if ($map) {
1182 $map->last_access ((delete $map->{last_access}) 1335 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d# 1336 || $cf::RUNTIME); #d#
1184 # safety 1337 # safety
1185 $map->{instantiate_time} = $cf::RUNTIME 1338 $map->{instantiate_time} = $cf::RUNTIME
1186 if $map->{instantiate_time} > $cf::RUNTIME; 1339 if $map->{instantiate_time} > $cf::RUNTIME;
1187 } else { 1340 } else {
1188 if (my $rmp = $path->random_map_params) { 1341 $map = $path->load_orig
1189 $map = generate_random_map $key, $rmp;
1190 } else {
1191 $map = try_load_header $path->load_path;
1192 }
1193
1194 $map or return; 1342 or return;
1195 1343
1196 $map->{load_original} = 1; 1344 $map->{load_original} = 1;
1197 $map->{instantiate_time} = $cf::RUNTIME; 1345 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME); 1346 $map->last_access ($cf::RUNTIME);
1199 $map->instantiate; 1347 $map->instantiate;
1265 Coro::cede; 1413 Coro::cede;
1266 1414
1267 $self->in_memory (cf::MAP_IN_MEMORY); 1415 $self->in_memory (cf::MAP_IN_MEMORY);
1268} 1416}
1269 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
1270sub find_sync { 1442sub find_sync {
1271 my ($path, $origin) = @_; 1443 my ($path, $origin) = @_;
1272 1444
1273 cf::sync_job { cf::map::find $path, $origin } 1445 cf::sync_job { find $path, $origin }
1274} 1446}
1275 1447
1276sub do_load_sync { 1448sub do_load_sync {
1277 my ($map) = @_; 1449 my ($map) = @_;
1278 1450
1279 cf::sync_job { $map->load }; 1451 cf::sync_job { $map->load };
1280} 1452}
1281 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
1282sub save { 1486sub save {
1283 my ($self) = @_; 1487 my ($self) = @_;
1284 1488
1285 my $lock = cf::lock_acquire "map_data:" . $self->path; 1489 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286 1490
1294 $self->{load_path} = $save; 1498 $self->{load_path} = $save;
1295 1499
1296 return if $self->{deny_save}; 1500 return if $self->{deny_save};
1297 1501
1298 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 };
1299 1507
1300 if ($uniq) { 1508 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1510 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1511 } else {
1398 } 1606 }
1399 1607
1400 $map 1608 $map
1401} 1609}
1402 1610
1403sub emergency_save { 1611=item cf::map::unique_maps
1404 my $freeze_guard = cf::freeze_mainloop;
1405 1612
1406 warn "enter emergency map save\n"; 1613Returns an arrayref of cf::path's of all shared maps that have
1614instantiated unique items. May block.
1407 1615
1408 cf::sync_job { 1616=cut
1409 warn "begin emergency map save\n"; 1617
1410 $_->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 $_;
1411 }; 1630 }
1412 1631
1413 warn "end emergency map save\n"; 1632 \@paths
1414} 1633}
1415 1634
1416package cf; 1635package cf;
1417 1636
1418=back 1637=back
1419 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
1420 1665
1421=head3 cf::object::player 1666=head3 cf::object::player
1422 1667
1423=over 4 1668=over 4
1424 1669
1516 # use -1 or undef as default coordinates, not 0, 0 1761 # use -1 or undef as default coordinates, not 0, 0
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1762 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1763 if $x <=0 && $y <= 0;
1519 1764
1520 $map->load; 1765 $map->load;
1766 $map->load_diag;
1521 1767
1768 return unless $self->contr->active;
1522 $self->activate_recursive; 1769 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1770 $self->enter_map ($map, $x, $y);
1524} 1771}
1525 1772
1526cf::player->attach ( 1773cf::player->attach (
1539 1786
1540 # try to abort aborted map switching on player login :) 1787 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1788 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1789 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1790 $pl->ob->enter_link;
1544 Coro::async_pool { 1791 (async {
1545 # 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
1546 # 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);
1547 Coro::Timer::sleep 1; 1798 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1799 $pl->ob->leave_link;
1549 }; 1800 })->prio (2);
1550 } 1801 }
1551 }, 1802 },
1552); 1803);
1553 1804
1554=item $player_object->goto ($path, $x, $y) 1805=item $player_object->goto ($path, $x, $y)
1556=cut 1807=cut
1557 1808
1558sub cf::object::player::goto { 1809sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1810 my ($self, $path, $x, $y) = @_;
1560 1811
1812 $path = new cf::path $path;
1813
1561 $self->enter_link; 1814 $self->enter_link;
1562 1815
1563 (Coro::async_pool { 1816 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1817 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1818 $map = $map->customise_for ($self) if $map;
1568 1819
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1820# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1821# if $map;
1571 1822
1572 $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);
1573 1824
1574 $self->leave_link ($map, $x, $y); 1825 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1826 })->prio (1);
1576} 1827}
1577 1828
1630 1881
1631 return unless $self->type == cf::PLAYER; 1882 return unless $self->type == cf::PLAYER;
1632 1883
1633 $self->enter_link; 1884 $self->enter_link;
1634 1885
1635 (Coro::async_pool { 1886 (async {
1636 $self->deactivate_recursive; # just to be sure 1887 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1888 unless (eval {
1638 prepare_random_map $exit 1889 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1890 if $exit->slaying eq "/!";
1640 1891
1643 1894
1644 1; 1895 1;
1645 }) { 1896 }) {
1646 $self->message ("Something went wrong deep within the crossfire server. " 1897 $self->message ("Something went wrong deep within the crossfire server. "
1647 . "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. "
1648 . "Please report this to the dungeon master", 1899 . "Please report this to the dungeon master!",
1649 cf::NDI_UNIQUE | cf::NDI_RED); 1900 cf::NDI_UNIQUE | cf::NDI_RED);
1650 1901
1651 warn "ERROR in enter_exit: $@"; 1902 warn "ERROR in enter_exit: $@";
1652 $self->leave_link; 1903 $self->leave_link;
1653 } 1904 }
1721 } 1972 }
1722 } 1973 }
1723 }, 1974 },
1724); 1975);
1725 1976
1726=item $client->coro (\&cb) 1977=item $client->async (\&cb)
1727 1978
1728Create a new coroutine, running the specified callback. The coroutine will 1979Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1980be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1981or loss of connection).
1731 1982
1732=cut 1983=cut
1733 1984
1734sub cf::client::coro { 1985sub cf::client::async {
1735 my ($self, $cb) = @_; 1986 my ($self, $cb) = @_;
1736 1987
1737 my $coro = &Coro::async_pool ($cb); 1988 my $coro = &Coro::async ($cb);
1738 1989
1739 $coro->on_destroy (sub { 1990 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1991 delete $self->{_coro}{$coro+0};
1741 }); 1992 });
1742 1993
1980 local $/; 2231 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2232 *CFG = YAML::Syck::Load <$fh>;
1982 2233
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2234 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2235
2236 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2237 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2238
1985 if (exists $CFG{mlockall}) { 2239 if (exists $CFG{mlockall}) {
1986 eval { 2240 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2241 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2242 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2243 };
1990 warn $@ if $@; 2244 warn $@ if $@;
1991 } 2245 }
1992} 2246}
1993 2247
1994sub main { 2248sub main {
1995 # we must not ever block the main coroutine 2249 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2250 local $Coro::idle = sub {
1997 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#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2252 async { Event::one_event };
2000 })->();
2001 }; 2253 };
2002 2254
2003 cfg_load; 2255 cfg_load;
2004 db_load; 2256 db_load;
2005 load_extensions; 2257 load_extensions;
2006 Event::loop; 2258 Event::loop;
2007} 2259}
2008 2260
2009############################################################################# 2261#############################################################################
2010# 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}
2011 2305
2012sub reload() { 2306sub reload() {
2013 # can/must only be called in main 2307 # can/must only be called in main
2014 if ($Coro::current != $Coro::main) { 2308 if ($Coro::current != $Coro::main) {
2015 warn "can only reload from main coroutine\n"; 2309 warn "can only reload from main coroutine\n";
2016 return; 2310 return;
2017 } 2311 }
2018 2312
2019 warn "reloading..."; 2313 warn "reloading...";
2020 2314
2315 warn "freezing server";
2021 my $guard = freeze_mainloop; 2316 my $guard = freeze_mainloop;
2022 cf::emergency_save; 2317 cf::emergency_save;
2023 2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322
2024 eval { 2323 eval {
2025 # 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
2026 2325
2027 # cancel all watchers 2326 warn "cancel all watchers";
2028 for (Event::all_watchers) { 2327 for (Event::all_watchers) {
2029 $_->cancel if $_->data & WF_AUTOCANCEL; 2328 $_->cancel if $_->data & WF_AUTOCANCEL;
2030 } 2329 }
2031 2330
2032 # cancel all extension coros 2331 warn "cancel all extension coros";
2033 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2034 %EXT_CORO = (); 2333 %EXT_CORO = ();
2035 2334
2335 warn "remove commands";
2336 %COMMAND = ();
2337
2338 warn "remove ext commands";
2339 %EXTCMD = ();
2340
2036 # unload all extensions 2341 warn "unload/nuke all extensions";
2037 for (@exts) { 2342 for my $pkg (@EXTS) {
2038 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2039 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: $@";
2040 } 2350 }
2041 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2042 # unload all modules loaded from $LIBDIR 2356 warn "unload all perl modules loaded from $LIBDIR";
2043 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2044 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2045 2359
2046 warn "removing <$k>"; 2360 warn "removing <$k>";
2047 delete $INC{$k}; 2361 delete $INC{$k};
2054 } 2368 }
2055 2369
2056 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2057 } 2371 }
2058 2372
2059 # sync database to disk
2060 cf::db_sync;
2061 IO::AIO::flush;
2062
2063 # get rid of safe::, as good as possible 2373 warn "get rid of safe::, as good as possible";
2064 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2065 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);
2066 2376
2067 # remove register_script_function callbacks
2068 # TODO
2069
2070 # unload cf.pm "a bit" 2377 warn "unload cf.pm \"a bit\"";
2071 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2072 2379
2073 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2074 # and global variables created in xs 2381 # and global variables created in xs
2075 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2076 2383
2077 # reload cf.pm
2078 warn "reloading cf.pm"; 2384 warn "reloading cf.pm";
2079 require cf; 2385 require cf;
2080 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2081 2387
2082 # load config and database again 2388 warn "load config and database again";
2083 cf::cfg_load; 2389 cf::cfg_load;
2084 cf::db_load; 2390 cf::db_load;
2085 2391
2086 # load extensions
2087 warn "load extensions"; 2392 warn "load extensions";
2088 cf::load_extensions; 2393 cf::load_extensions;
2089 2394
2090 # reattach attachments to objects 2395 warn "reattach attachments to objects/players";
2091 warn "reattach";
2092 _global_reattach; 2396 _global_reattach;
2397 warn "reattach attachments to maps";
2398 reattach $_ for values %MAP;
2093 }; 2399 };
2094 2400
2095 if ($@) { 2401 if ($@) {
2096 warn $@; 2402 warn $@;
2097 warn "error while reloading, exiting."; 2403 warn "error while reloading, exiting.";
2098 exit 1; 2404 exit 1;
2099 } 2405 }
2100 2406
2101 warn "reloaded successfully"; 2407 warn "reloaded";
2102}; 2408};
2103 2409
2104############################################################################# 2410#############################################################################
2105 2411
2106unless ($LINK_MAP) { 2412unless ($LINK_MAP) {
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2421
2116 # dirty hack because... archetypes are not yet loaded 2422 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2423 Event->timer (
2118 after => 2, 2424 after => 10,
2119 cb => sub { 2425 cb => sub {
2120 $_[0]->w->cancel; 2426 $_[0]->w->cancel;
2121 2427
2122 # provide some exits "home" 2428 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2429 my $exit = cf::object::new "exit";
2141 $LINK_MAP->{deny_save} = 1; 2447 $LINK_MAP->{deny_save} = 1;
2142 $LINK_MAP->{deny_reset} = 1; 2448 $LINK_MAP->{deny_reset} = 1;
2143 2449
2144 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2145} 2451}
2146
2147register "<global>", __PACKAGE__;
2148 2452
2149register_command "reload" => sub { 2453register_command "reload" => sub {
2150 my ($who, $arg) = @_; 2454 my ($who, $arg) = @_;
2151 2455
2152 if ($who->flag (FLAG_WIZ)) { 2456 if ($who->flag (FLAG_WIZ)) {
2165 data => WF_AUTOCANCEL, 2469 data => WF_AUTOCANCEL,
2166 cb => sub { 2470 cb => sub {
2167 cf::server_tick; # one server iteration 2471 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2472 $RUNTIME += $TICK;
2169 $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;
2170 2477
2171 # 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
2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2173 2480
2174 $TICK_WATCHER->at ($NEXT_TICK); 2481 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines