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.140 by root, Fri Jan 5 20:04:02 2007 UTC vs.
Revision 1.164 by root, Thu Jan 11 01:24:25 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
273 warn $@ if $@; 305 warn $@ if $@;
274 undef $busy; 306 undef $busy;
275 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
276 308
277 while ($busy) { 309 while ($busy) {
278 unless (Coro::cede) { 310 Coro::cede or Event::one_event;
279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
282 } 311 }
283 312
284 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
285 } else { 314 } else {
286 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
289 } 318 }
290} 319}
291 320
292=item $coro = cf::async_ext { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
293 322
294Like async, but this coro is automcatially being canceled when the 323Like async, but this coro is automatically being canceled when the
295extension calling this is being unloaded. 324extension calling this is being unloaded.
296 325
297=cut 326=cut
298 327
299sub async_ext(&) { 328sub async_ext(&) {
337 366
338############################################################################# 367#############################################################################
339 368
340package cf::path; 369package cf::path;
341 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
342sub new { 383sub new {
343 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
344 385
345 $path = $path->as_string if ref $path; 386 return $path if ref $path;
346 387
347 my $self = bless { }, $class; 388 my $self = {};
348 389
349 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
350 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
351 # ?random/... random maps 392 # ?random/... random maps
352 # /! non-realised random map exit 393 # /! non-realised random map exit
353 # /... normal maps 394 # /... normal maps
354 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
355 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
356 397
398 $path =~ s/$PATH_SEP/\//go;
399
357 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
358 # fine as it is 401 # fine as it is
359 } elsif ($path =~ s{^\?random/}{}) {
360 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
361 $self->{random} = cf::from_json $data;
362 } else { 402 } else {
363 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
364 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
365 406
366 if (defined $1) { 407 if (defined $1) {
367 $self->{user} = $1; 408 $self->{user} = $1;
368 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
369 $self->{user} = $1; 410 $self->{user} = $1;
370 } else { 411 } else {
371 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
372 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
373 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
374 # already absolute 422 # already absolute
375 } else { 423 } else {
424 # relative
376 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
377 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
378 } 427 }
379 428
380 for ($path) { 429 for ($path) {
383 } 432 }
384 } 433 }
385 434
386 $self->{path} = $path; 435 $self->{path} = $path;
387 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
388 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
389} 458}
390 459
391# the name / primary key / in-game path 460# the name / primary key / in-game path
392sub as_string { 461sub as_string {
393 my ($self) = @_; 462 my ($self) = @_;
394 463
395 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
396 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
397 : $self->{path} 466 : $self->{path}
398} 467}
399 468
400# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
401sub visible_name { 470sub visible_name {
402 my ($self) = @_; 471 &as_string
403
404# if (my $rmp = $self->{random}) {
405# # todo: be more intelligent about this
406# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
407# } else {
408 $self->as_string
409# }
410} 472}
411 473
412# escape the /'s in the path 474# escape the /'s in the path
413sub _escaped_path { 475sub _escaped_path {
414 # ∕ is U+2215
415 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
416 $path 478 $path
417} 479}
418 480
419# the original (read-only) location 481# the original (read-only) location
420sub load_path { 482sub load_path {
425 487
426# the temporary/swap location 488# the temporary/swap location
427sub save_path { 489sub save_path {
428 my ($self) = @_; 490 my ($self) = @_;
429 491
492 $self->{user_rel}
430 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 493 ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
431 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
432 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
433} 495}
434 496
435# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
436sub uniq_path { 498sub uniq_path {
437 my ($self) = @_; 499 my ($self) = @_;
438 500
439 $self->{user_rel} || $self->{random}
440 ? undef
441 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
442}
443
444# return random map parameters, or undef
445sub random_map_params {
446 my ($self) = @_;
447
448 $self->{random}
449} 502}
450 503
451# this is somewhat ugly, but style maps do need special treatment 504# this is somewhat ugly, but style maps do need special treatment
452sub is_style_map { 505sub is_style_map {
453 $_[0]{path} =~ m{^/styles/} 506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
454} 527}
455 528
456package cf; 529package cf;
457 530
458############################################################################# 531#############################################################################
908=cut 981=cut
909 982
910sub register_extcmd { 983sub register_extcmd {
911 my ($name, $cb) = @_; 984 my ($name, $cb) = @_;
912 985
913 my $caller = caller;
914 #warn "registering extcmd '$name' to '$caller'";
915
916 $EXTCMD{$name} = [$cb, $caller]; 986 $EXTCMD{$name} = $cb;
917} 987}
918 988
919cf::player->attach ( 989cf::player->attach (
920 on_command => sub { 990 on_command => sub {
921 my ($pl, $name, $params) = @_; 991 my ($pl, $name, $params) = @_;
934 1004
935 my $msg = eval { from_json $buf }; 1005 my $msg = eval { from_json $buf };
936 1006
937 if (ref $msg) { 1007 if (ref $msg) {
938 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1008 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
939 if (my %reply = $cb->[0]->($pl, $msg)) { 1009 if (my %reply = $cb->($pl, $msg)) {
940 $pl->ext_reply ($msg->{msgid}, %reply); 1010 $pl->ext_reply ($msg->{msgid}, %reply);
941 } 1011 }
942 } 1012 }
943 } else { 1013 } else {
944 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1014 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
946 1016
947 cf::override; 1017 cf::override;
948 }, 1018 },
949); 1019);
950 1020
951sub register {
952 my ($base, $pkg) = @_;
953
954 #TODO
955}
956
957sub load_extension { 1021sub load_extension {
958 my ($path) = @_; 1022 my ($path) = @_;
959 1023
960 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1024 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
961 my $base = $1; 1025 my $base = $1;
962 my $pkg = $1; 1026 my $pkg = $1;
963 $pkg =~ s/[^[:word:]]/_/g; 1027 $pkg =~ s/[^[:word:]]/_/g;
964 $pkg = "ext::$pkg"; 1028 $pkg = "ext::$pkg";
965 1029
966 warn "loading '$path' into '$pkg'\n"; 1030 warn "... loading '$path' into '$pkg'\n";
967 1031
968 open my $fh, "<:utf8", $path 1032 open my $fh, "<:utf8", $path
969 or die "$path: $!"; 1033 or die "$path: $!";
970 1034
971 my $source = 1035 my $source =
976 1040
977 eval $source 1041 eval $source
978 or die $@ ? "$path: $@\n" 1042 or die $@ ? "$path: $@\n"
979 : "extension disabled.\n"; 1043 : "extension disabled.\n";
980 1044
981 push @exts, $pkg; 1045 push @EXTS, $pkg;
982 $ext_pkg{$base} = $pkg;
983
984# no strict 'refs';
985# @{"$pkg\::ISA"} = ext::;
986
987 register $base, $pkg;
988}
989
990sub unload_extension {
991 my ($pkg) = @_;
992
993 warn "removing extension $pkg\n";
994
995 # remove hooks
996 #TODO
997# for my $idx (0 .. $#PLUGIN_EVENT) {
998# delete $hook[$idx]{$pkg};
999# }
1000
1001 # remove commands
1002 for my $name (keys %COMMAND) {
1003 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1004
1005 if (@cb) {
1006 $COMMAND{$name} = \@cb;
1007 } else {
1008 delete $COMMAND{$name};
1009 }
1010 }
1011
1012 # remove extcmds
1013 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1014 delete $EXTCMD{$name};
1015 }
1016
1017 if (my $cb = $pkg->can ("unload")) {
1018 eval {
1019 $cb->($pkg);
1020 1
1021 } or warn "$pkg unloaded, but with errors: $@";
1022 }
1023
1024 Symbol::delete_package $pkg;
1025} 1046}
1026 1047
1027sub load_extensions { 1048sub load_extensions {
1028 for my $ext (<$LIBDIR/*.ext>) { 1049 for my $ext (<$LIBDIR/*.ext>) {
1029 next unless -r $ext; 1050 next unless -r $ext;
1047}; 1068};
1048 1069
1049cf::map->attach (prio => -10000, package => cf::mapsupport::); 1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1050 1071
1051############################################################################# 1072#############################################################################
1052# load/save perl data associated with player->ob objects
1053
1054sub all_objects(@) {
1055 @_, map all_objects ($_->inv), @_
1056}
1057
1058# TODO: compatibility cruft, remove when no longer needed
1059cf::player->attach (
1060 on_load => sub {
1061 my ($pl, $path) = @_;
1062
1063 for my $o (all_objects $pl->ob) {
1064 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1065 $o->set_ob_key_value ("_perl_data");
1066
1067 %$o = %{ Storable::thaw pack "H*", $value };
1068 }
1069 }
1070 },
1071);
1072
1073#############################################################################
1074 1073
1075=head2 CORE EXTENSIONS 1074=head2 CORE EXTENSIONS
1076 1075
1077Functions and methods that extend core crossfire objects. 1076Functions and methods that extend core crossfire objects.
1078 1077
1078=cut
1079
1080package cf::player;
1081
1082use Coro::AIO;
1083
1079=head3 cf::player 1084=head3 cf::player
1080 1085
1081=over 4 1086=over 4
1082 1087
1083=item cf::player::exists $login 1088=item cf::player::find $login
1084 1089
1085Returns true when the given account exists. 1090Returns the given player object, loading it if necessary (might block).
1086 1091
1087=cut 1092=cut
1088 1093
1089sub cf::player::exists($) { 1094sub playerdir($) {
1090 cf::player::find $_[0] 1095 cf::localdir
1091 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1096 . "/"
1097 . cf::playerdir
1098 . "/"
1099 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1100}
1101
1102sub path($) {
1103 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1104
1105 (playerdir $login) . "/$login.pl"
1106}
1107
1108sub find_active($) {
1109 $cf::PLAYER{$_[0]}
1110 and $cf::PLAYER{$_[0]}->active
1111 and $cf::PLAYER{$_[0]}
1112}
1113
1114sub exists($) {
1115 my ($login) = @_;
1116
1117 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login }
1119}
1120
1121sub find($) {
1122 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0];
1124
1125 my $guard = cf::lock_acquire "user_find:$login";
1126
1127 $cf::PLAYER{$_[0]} || do {
1128 my $pl = load_pl path $login
1129 or return;
1130 $cf::PLAYER{$login} = $pl
1131 }
1132 }
1133}
1134
1135sub save($) {
1136 my ($pl) = @_;
1137
1138 return if $pl->{deny_save};
1139
1140 my $path = path $pl;
1141 my $guard = cf::lock_acquire "user_save:$path";
1142
1143 return if $pl->{deny_save};
1144
1145 aio_mkdir playerdir $pl, 0770;
1146 $pl->{last_save} = $cf::RUNTIME;
1147
1148 $pl->save_pl ($path);
1149 Coro::cede;
1150}
1151
1152sub new($) {
1153 my ($login) = @_;
1154
1155 my $self = create;
1156
1157 $self->ob->name ($login);
1158 $self->{deny_save} = 1;
1159
1160 $cf::PLAYER{$login} = $self;
1161
1162 $self
1163}
1164
1165=item $pl->quit_character
1166
1167Nukes the player without looking back. If logged in, the connection will
1168be destroyed. May block for a long time.
1169
1170=cut
1171
1172sub quit_character {
1173 my ($pl) = @_;
1174
1175 $pl->{deny_save} = 1;
1176 $pl->password ("*"); # this should lock out the player until we nuked the dir
1177
1178 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1179 $pl->deactivate;
1180 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1181 $pl->ns->destroy if $pl->ns;
1182
1183 my $path = playerdir $pl;
1184 my $temp = "$path~$cf::RUNTIME~deleting~";
1185 aio_rename $path, $temp;
1186 delete $cf::PLAYER{$pl->ob->name};
1187 $pl->destroy;
1188 IO::AIO::aio_rmtree $temp;
1189}
1190
1191=item cf::player::list_logins
1192
1193Returns am arrayref of all valid playernames in the system, can take a
1194while and may block, so not sync_job-capable, ever.
1195
1196=cut
1197
1198sub list_logins {
1199 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1200 or return [];
1201
1202 my @logins;
1203
1204 for my $login (@$dirs) {
1205 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1206 aio_read $fh, 0, 512, my $buf, 0 or next;
1207 $buf !~ /^password -------------$/m or next; # official not-valid tag
1208
1209 utf8::decode $login;
1210 push @logins, $login;
1211 }
1212
1213 \@logins
1214}
1215
1216=item $player->maps
1217
1218Returns an arrayref of cf::path's of all maps that are private for this
1219player. May block.
1220
1221=cut
1222
1223sub maps($) {
1224 my ($pl) = @_;
1225
1226 my $files = aio_readdir playerdir $pl
1227 or return;
1228
1229 my @paths;
1230
1231 for (@$files) {
1232 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o;
1235
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1237 }
1238
1239 \@paths
1092} 1240}
1093 1241
1094=item $player->ext_reply ($msgid, $msgtype, %msg) 1242=item $player->ext_reply ($msgid, $msgtype, %msg)
1095 1243
1096Sends an ext reply to the player. 1244Sends an ext reply to the player.
1097 1245
1098=cut 1246=cut
1099 1247
1100sub cf::player::ext_reply($$$%) { 1248sub ext_reply($$$%) {
1101 my ($self, $id, %msg) = @_; 1249 my ($self, $id, %msg) = @_;
1102 1250
1103 $msg{msgid} = $id; 1251 $msg{msgid} = $id;
1104 1252
1105 $self->send ("ext " . to_json \%msg); 1253 $self->send ("ext " . cf::to_json \%msg);
1106} 1254}
1255
1256package cf;
1107 1257
1108=back 1258=back
1109 1259
1110 1260
1111=head3 cf::map 1261=head3 cf::map
1124 1274
1125sub generate_random_map { 1275sub generate_random_map {
1126 my ($path, $rmp) = @_; 1276 my ($path, $rmp) = @_;
1127 1277
1128 # mit "rum" bekleckern, nicht 1278 # mit "rum" bekleckern, nicht
1129 cf::map::_create_random_map 1279 cf::map::_create_random_map (
1130 $path, 1280 $path,
1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1134 $rmp->{exit_on_final_map}, 1284 $rmp->{exit_on_final_map},
1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1286 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1287 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1288 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1289 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}) 1291 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 )
1142} 1293}
1143 1294
1144# and all this just because we cannot iterate over 1295# and all this just because we cannot iterate over
1145# all maps in C++... 1296# all maps in C++...
1146sub change_all_map_light { 1297sub change_all_map_light {
1148 1299
1149 $_->change_map_light ($change) 1300 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP; 1301 for grep $_->outdoor, values %cf::MAP;
1151} 1302}
1152 1303
1153sub try_load_header($) { 1304sub load_map_header($) {
1154 my ($path) = @_; 1305 my ($path) = @_;
1155 1306
1156 utf8::encode $path; 1307 utf8::encode $path;
1157 aio_open $path, O_RDONLY, 0 1308 aio_open $path, O_RDONLY, 0
1158 or return; 1309 or return;
1159 1310
1160 my $map = cf::map::new 1311 my $map = cf::map::new
1161 or return; 1312 or return;
1162 1313
1163 # for better error messages only, will be overwritten 1314 # for better error messages only, will be overwritten later
1164 $map->path ($path); 1315 $map->path ($path);
1165 1316
1166 $map->load_header ($path) 1317 $map->load_header ($path)
1167 or return; 1318 or return;
1168 1319
1184 1335
1185 $cf::MAP{$key} || do { 1336 $cf::MAP{$key} || do {
1186 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$key";
1187 1338
1188 # do it the slow way 1339 # do it the slow way
1189 my $map = try_load_header $path->save_path; 1340 my $map = $path->load_temp;
1190 1341
1191 Coro::cede; 1342 Coro::cede;
1192 1343
1193 if ($map) { 1344 if ($map) {
1194 $map->last_access ((delete $map->{last_access}) 1345 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d# 1346 || $cf::RUNTIME); #d#
1196 # safety 1347 # safety
1197 $map->{instantiate_time} = $cf::RUNTIME 1348 $map->{instantiate_time} = $cf::RUNTIME
1198 if $map->{instantiate_time} > $cf::RUNTIME; 1349 if $map->{instantiate_time} > $cf::RUNTIME;
1199 } else { 1350 } else {
1200 if (my $rmp = $path->random_map_params) { 1351 $map = $path->load_orig
1201 $map = generate_random_map $key, $rmp;
1202 } else {
1203 $map = try_load_header $path->load_path;
1204 }
1205
1206 $map or return; 1352 or return;
1207 1353
1208 $map->{load_original} = 1; 1354 $map->{load_original} = 1;
1209 $map->{instantiate_time} = $cf::RUNTIME; 1355 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME); 1356 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1357 $map->instantiate;
1263 1409
1264 if ($self->{path}->is_style_map) { 1410 if ($self->{path}->is_style_map) {
1265 $self->{deny_save} = 1; 1411 $self->{deny_save} = 1;
1266 $self->{deny_reset} = 1; 1412 $self->{deny_reset} = 1;
1267 } else { 1413 } else {
1414 $self->decay_objects;
1268 $self->fix_auto_apply; 1415 $self->fix_auto_apply;
1269 $self->decay_objects;
1270 $self->update_buttons; 1416 $self->update_buttons;
1271 $self->set_darkness_map; 1417 $self->set_darkness_map;
1272 $self->difficulty ($self->estimate_difficulty) 1418 $self->difficulty ($self->estimate_difficulty)
1273 unless $self->difficulty; 1419 unless $self->difficulty;
1274 $self->activate; 1420 $self->activate;
1277 Coro::cede; 1423 Coro::cede;
1278 1424
1279 $self->in_memory (cf::MAP_IN_MEMORY); 1425 $self->in_memory (cf::MAP_IN_MEMORY);
1280} 1426}
1281 1427
1428# find and load all maps in the 3x3 area around a map
1429sub load_diag {
1430 my ($map) = @_;
1431
1432 my @diag; # diagonal neighbours
1433
1434 for (0 .. 3) {
1435 my $neigh = $map->tile_path ($_)
1436 or next;
1437 $neigh = find $neigh, $map
1438 or next;
1439 $neigh->load;
1440
1441 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1442 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1443 }
1444
1445 for (@diag) {
1446 my $neigh = find @$_
1447 or next;
1448 $neigh->load;
1449 }
1450}
1451
1282sub find_sync { 1452sub find_sync {
1283 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1284 1454
1285 cf::sync_job { cf::map::find $path, $origin } 1455 cf::sync_job { find $path, $origin }
1286} 1456}
1287 1457
1288sub do_load_sync { 1458sub do_load_sync {
1289 my ($map) = @_; 1459 my ($map) = @_;
1290 1460
1291 cf::sync_job { $map->load }; 1461 cf::sync_job { $map->load };
1292} 1462}
1293 1463
1464our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async {
1466 while () {
1467 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path
1473 or next;
1474 $map->load;
1475 }
1476 Coro::schedule;
1477 }
1478};
1479
1480sub find_async {
1481 my ($path, $origin) = @_;
1482
1483 $path = new cf::path $path, $origin && $origin->path;
1484 my $key = $path->as_string;
1485
1486 if (my $map = $cf::MAP{$key}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 }
1489
1490 $MAP_PREFETCH{$key} = $path;
1491 $MAP_PREFETCHER->ready;
1492
1493 ()
1494}
1495
1294sub save { 1496sub save {
1295 my ($self) = @_; 1497 my ($self) = @_;
1296 1498
1297 my $lock = cf::lock_acquire "map_data:" . $self->path; 1499 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298 1500
1306 $self->{load_path} = $save; 1508 $self->{load_path} = $save;
1307 1509
1308 return if $self->{deny_save}; 1510 return if $self->{deny_save};
1309 1511
1310 local $self->{last_access} = $self->last_access;#d# 1512 local $self->{last_access} = $self->last_access;#d#
1513
1514 cf::async {
1515 $_->contr->save for $self->players;
1516 };
1311 1517
1312 if ($uniq) { 1518 if ($uniq) {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1314 $self->save_objects ($uniq, cf::IO_UNIQUES); 1520 $self->save_objects ($uniq, cf::IO_UNIQUES);
1315 } else { 1521 } else {
1350 my ($self) = @_; 1556 my ($self) = @_;
1351 1557
1352 $self->reset_at <= $cf::RUNTIME 1558 $self->reset_at <= $cf::RUNTIME
1353} 1559}
1354 1560
1355sub unlink_save {
1356 my ($self) = @_;
1357
1358 utf8::encode (my $save = $self->{path}->save_path);
1359 aioreq_pri 3; IO::AIO::aio_unlink $save;
1360 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1361}
1362
1363sub rename { 1561sub rename {
1364 my ($self, $new_path) = @_; 1562 my ($self, $new_path) = @_;
1365 1563
1366 $self->unlink_save; 1564 $self->{path}->unlink_save;
1367 1565
1368 delete $cf::MAP{$self->path}; 1566 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path; 1567 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string); 1568 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self; 1569 $cf::MAP{$self->path} = $self;
1385 1583
1386 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1387 1585
1388 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1389 1587
1390 $self->unlink_save; 1588 $self->{path}->unlink_save;
1391 $self->destroy; 1589 $self->destroy;
1392} 1590}
1393 1591
1394my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1395 1593
1410 } 1608 }
1411 1609
1412 $map 1610 $map
1413} 1611}
1414 1612
1415sub emergency_save { 1613=item cf::map::unique_maps
1416 my $freeze_guard = cf::freeze_mainloop;
1417 1614
1418 warn "enter emergency map save\n"; 1615Returns an arrayref of cf::path's of all shared maps that have
1616instantiated unique items. May block.
1419 1617
1420 cf::sync_job { 1618=cut
1421 warn "begin emergency map save\n"; 1619
1422 $_->save for values %cf::MAP; 1620sub unique_maps() {
1621 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1622 or return;
1623
1624 my @paths;
1625
1626 for (@$files) {
1627 utf8::decode $_;
1628 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o;
1630
1631 push @paths, new cf::path $_;
1423 }; 1632 }
1424 1633
1425 warn "end emergency map save\n"; 1634 \@paths
1426} 1635}
1427 1636
1428package cf; 1637package cf;
1429 1638
1430=back 1639=back
1431 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1432 1667
1433=head3 cf::object::player 1668=head3 cf::object::player
1434 1669
1435=over 4 1670=over 4
1436 1671
1528 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1531 1766
1532 $map->load; 1767 $map->load;
1768 $map->load_diag;
1533 1769
1770 return unless $self->contr->active;
1534 $self->activate_recursive; 1771 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1536} 1773}
1537 1774
1538cf::player->attach ( 1775cf::player->attach (
1550 my ($pl) = @_; 1787 my ($pl) = @_;
1551 1788
1552 # try to abort aborted map switching on player login :) 1789 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1790 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1791 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link; 1792 $pl->ob->enter_link;
1557 (async { 1793 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running 1794 # we need this sleep as the login has a concurrent enter_exit running
1559 # and this sleep increases chances of the player not ending up in scorn 1795 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef, 1796 $pl->ob->reply (undef,
1573=cut 1809=cut
1574 1810
1575sub cf::object::player::goto { 1811sub cf::object::player::goto {
1576 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1577 1813
1814 $path = new cf::path $path;
1815
1578 $self->enter_link; 1816 $self->enter_link;
1579 1817
1580 (async { 1818 (async {
1581 $path = new cf::path $path;
1582
1583 my $map = cf::map::find $path->as_string; 1819 my $map = cf::map::find $path->as_string;
1584 $map = $map->customise_for ($self) if $map; 1820 $map = $map->customise_for ($self) if $map;
1585 1821
1586# warn "entering ", $map->path, " at ($x, $y)\n" 1822# warn "entering ", $map->path, " at ($x, $y)\n"
1587# if $map; 1823# if $map;
1588 1824
1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1590 1826
1591 $self->leave_link ($map, $x, $y); 1827 $self->leave_link ($map, $x, $y);
1592 })->prio (1); 1828 })->prio (1);
1593} 1829}
1594 1830
1660 1896
1661 1; 1897 1;
1662 }) { 1898 }) {
1663 $self->message ("Something went wrong deep within the crossfire server. " 1899 $self->message ("Something went wrong deep within the crossfire server. "
1664 . "I'll try to bring you back to the map you were before. " 1900 . "I'll try to bring you back to the map you were before. "
1665 . "Please report this to the dungeon master", 1901 . "Please report this to the dungeon master!",
1666 cf::NDI_UNIQUE | cf::NDI_RED); 1902 cf::NDI_UNIQUE | cf::NDI_RED);
1667 1903
1668 warn "ERROR in enter_exit: $@"; 1904 warn "ERROR in enter_exit: $@";
1669 $self->leave_link; 1905 $self->leave_link;
1670 } 1906 }
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2238 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2239 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004 2240
2005 if (exists $CFG{mlockall}) { 2241 if (exists $CFG{mlockall}) {
2006 eval { 2242 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall 2243 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2008 and die "WARNING: m(un)lockall failed: $!\n"; 2244 and die "WARNING: m(un)lockall failed: $!\n";
2009 }; 2245 };
2010 warn $@ if $@; 2246 warn $@ if $@;
2011 } 2247 }
2012} 2248}
2023 load_extensions; 2259 load_extensions;
2024 Event::loop; 2260 Event::loop;
2025} 2261}
2026 2262
2027############################################################################# 2263#############################################################################
2028# initialisation 2264# initialisation and cleanup
2265
2266# install some emergency cleanup handlers
2267BEGIN {
2268 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal (
2270 data => WF_AUTOCANCEL,
2271 signal => $signal,
2272 cb => sub {
2273 cf::cleanup "SIG$signal";
2274 },
2275 );
2276 }
2277}
2278
2279sub emergency_save() {
2280 my $freeze_guard = cf::freeze_mainloop;
2281
2282 warn "enter emergency perl save\n";
2283
2284 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously.
2288 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next;
2292 $pl->save;
2293 }
2294 warn "end emergency player save\n";
2295
2296 warn "begin emergency map save\n";
2297 for my $path (keys %cf::MAP) {
2298 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next;
2300 $map->save;
2301 }
2302 warn "end emergency map save\n";
2303 };
2304
2305 warn "leave emergency perl save\n";
2306}
2029 2307
2030sub reload() { 2308sub reload() {
2031 # can/must only be called in main 2309 # can/must only be called in main
2032 if ($Coro::current != $Coro::main) { 2310 if ($Coro::current != $Coro::main) {
2033 warn "can only reload from main coroutine\n"; 2311 warn "can only reload from main coroutine\n";
2034 return; 2312 return;
2035 } 2313 }
2036 2314
2037 warn "reloading..."; 2315 warn "reloading...";
2038 2316
2317 warn "freezing server";
2039 my $guard = freeze_mainloop; 2318 my $guard = freeze_mainloop;
2040 cf::emergency_save; 2319 cf::emergency_save;
2041 2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2324
2042 eval { 2325 eval {
2043 # if anything goes wrong in here, we should simply crash as we already saved 2326 # if anything goes wrong in here, we should simply crash as we already saved
2044 2327
2045 # cancel all watchers 2328 warn "cancel all watchers";
2046 for (Event::all_watchers) { 2329 for (Event::all_watchers) {
2047 $_->cancel if $_->data & WF_AUTOCANCEL; 2330 $_->cancel if $_->data & WF_AUTOCANCEL;
2048 } 2331 }
2049 2332
2050 # cancel all extension coros 2333 warn "cancel all extension coros";
2051 $_->cancel for values %EXT_CORO; 2334 $_->cancel for values %EXT_CORO;
2052 %EXT_CORO = (); 2335 %EXT_CORO = ();
2053 2336
2337 warn "remove commands";
2338 %COMMAND = ();
2339
2340 warn "remove ext commands";
2341 %EXTCMD = ();
2342
2054 # unload all extensions 2343 warn "unload/nuke all extensions";
2055 for (@exts) { 2344 for my $pkg (@EXTS) {
2056 warn "unloading <$_>"; 2345 warn "... unloading $pkg";
2057 unload_extension $_; 2346
2347 if (my $cb = $pkg->can ("unload")) {
2348 eval {
2349 $cb->($pkg);
2350 1
2351 } or warn "$pkg unloaded, but with errors: $@";
2058 } 2352 }
2059 2353
2354 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg;
2356 }
2357
2060 # unload all modules loaded from $LIBDIR 2358 warn "unload all perl modules loaded from $LIBDIR";
2061 while (my ($k, $v) = each %INC) { 2359 while (my ($k, $v) = each %INC) {
2062 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2063 2361
2064 warn "removing <$k>"; 2362 warn "removing <$k>";
2065 delete $INC{$k}; 2363 delete $INC{$k};
2072 } 2370 }
2073 2371
2074 Symbol::delete_package $k; 2372 Symbol::delete_package $k;
2075 } 2373 }
2076 2374
2077 # sync database to disk
2078 cf::db_sync;
2079 IO::AIO::flush;
2080
2081 # get rid of safe::, as good as possible 2375 warn "get rid of safe::, as good as possible";
2082 Symbol::delete_package "safe::$_" 2376 Symbol::delete_package "safe::$_"
2083 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2084 2378
2085 # remove register_script_function callbacks
2086 # TODO
2087
2088 # unload cf.pm "a bit" 2379 warn "unload cf.pm \"a bit\"";
2089 delete $INC{"cf.pm"}; 2380 delete $INC{"cf.pm"};
2090 2381
2091 # don't, removes xs symbols, too, 2382 # don't, removes xs symbols, too,
2092 # and global variables created in xs 2383 # and global variables created in xs
2093 #Symbol::delete_package __PACKAGE__; 2384 #Symbol::delete_package __PACKAGE__;
2094 2385
2095 # reload cf.pm
2096 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2097 require cf; 2387 require cf;
2098 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2099 2389
2100 # load config and database again 2390 warn "load config and database again";
2101 cf::cfg_load; 2391 cf::cfg_load;
2102 cf::db_load; 2392 cf::db_load;
2103 2393
2104 # load extensions
2105 warn "load extensions"; 2394 warn "load extensions";
2106 cf::load_extensions; 2395 cf::load_extensions;
2107 2396
2108 # reattach attachments to objects 2397 warn "reattach attachments to objects/players";
2109 warn "reattach";
2110 _global_reattach; 2398 _global_reattach;
2399 warn "reattach attachments to maps";
2400 reattach $_ for values %MAP;
2111 }; 2401 };
2112 2402
2113 if ($@) { 2403 if ($@) {
2114 warn $@; 2404 warn $@;
2115 warn "error while reloading, exiting."; 2405 warn "error while reloading, exiting.";
2116 exit 1; 2406 exit 1;
2117 } 2407 }
2118 2408
2119 warn "reloaded successfully"; 2409 warn "reloaded";
2120}; 2410};
2121 2411
2122############################################################################# 2412#############################################################################
2123 2413
2124unless ($LINK_MAP) { 2414unless ($LINK_MAP) {
2131 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2132 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2133 2423
2134 # dirty hack because... archetypes are not yet loaded 2424 # dirty hack because... archetypes are not yet loaded
2135 Event->timer ( 2425 Event->timer (
2136 after => 2, 2426 after => 10,
2137 cb => sub { 2427 cb => sub {
2138 $_[0]->w->cancel; 2428 $_[0]->w->cancel;
2139 2429
2140 # provide some exits "home" 2430 # provide some exits "home"
2141 my $exit = cf::object::new "exit"; 2431 my $exit = cf::object::new "exit";
2160 $LINK_MAP->{deny_reset} = 1; 2450 $LINK_MAP->{deny_reset} = 1;
2161 2451
2162 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2163} 2453}
2164 2454
2165register "<global>", __PACKAGE__;
2166
2167register_command "reload" => sub { 2455register_command "reload" => sub {
2168 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2169 2457
2170 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2171 $who->message ("start of reload."); 2459 $who->message ("start of reload.");
2180 reentrant => 0, 2468 reentrant => 0,
2181 prio => 0, 2469 prio => 0,
2182 at => $NEXT_TICK || $TICK, 2470 at => $NEXT_TICK || $TICK,
2183 data => WF_AUTOCANCEL, 2471 data => WF_AUTOCANCEL,
2184 cb => sub { 2472 cb => sub {
2473 $NOW = Event::time;
2474
2185 cf::server_tick; # one server iteration 2475 cf::server_tick; # one server iteration
2186 $RUNTIME += $TICK; 2476 $RUNTIME += $TICK;
2187 $NEXT_TICK += $TICK; 2477 $NEXT_TICK += $TICK;
2478
2479 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2188 2481
2189 # if we are delayed by four ticks or more, skip them all 2482 # if we are delayed by four ticks or more, skip them all
2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2191 2484
2192 $TICK_WATCHER->at ($NEXT_TICK); 2485 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines