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.165 by root, Fri Jan 12 22:09:22 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} 501 $self->{user_rel} || $self->{ext}
440 ? undef 502 ? undef
441 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
442} 504}
443 505
444# return random map parameters, or undef 506sub customise_for {
445sub random_map_params {
446 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
447 508
448 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
449} 514}
450 515
451# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
452sub is_style_map { 517sub is_style_map {
453 $_[0]{path} =~ m{^/styles/} 518 $_[0]{path} =~ m{^/styles/}
519}
520
521sub load_orig {
522 my ($self) = @_;
523
524 &cf::map::load_map_header ($self->load_path)
525}
526
527sub load_temp {
528 my ($self) = @_;
529
530 &cf::map::load_map_header ($self->save_path)
531}
532
533sub unlink_save {
534 my ($self) = @_;
535
536 utf8::encode (my $save = $self->save_path);
537 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
538 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
454} 539}
455 540
456package cf; 541package cf;
457 542
458############################################################################# 543#############################################################################
908=cut 993=cut
909 994
910sub register_extcmd { 995sub register_extcmd {
911 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
912 997
913 my $caller = caller;
914 #warn "registering extcmd '$name' to '$caller'";
915
916 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
917} 999}
918 1000
919cf::player->attach ( 1001cf::player->attach (
920 on_command => sub { 1002 on_command => sub {
921 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
934 1016
935 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
936 1018
937 if (ref $msg) { 1019 if (ref $msg) {
938 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
939 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
940 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
941 } 1023 }
942 } 1024 }
943 } else { 1025 } else {
944 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
946 1028
947 cf::override; 1029 cf::override;
948 }, 1030 },
949); 1031);
950 1032
951sub register {
952 my ($base, $pkg) = @_;
953
954 #TODO
955}
956
957sub load_extension { 1033sub load_extension {
958 my ($path) = @_; 1034 my ($path) = @_;
959 1035
960 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
961 my $base = $1; 1037 my $base = $1;
962 my $pkg = $1; 1038 my $pkg = $1;
963 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
964 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
965 1041
966 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
967 1043
968 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
969 or die "$path: $!"; 1045 or die "$path: $!";
970 1046
971 my $source = 1047 my $source =
976 1052
977 eval $source 1053 eval $source
978 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
979 : "extension disabled.\n"; 1055 : "extension disabled.\n";
980 1056
981 push @exts, $pkg; 1057 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} 1058}
1026 1059
1027sub load_extensions { 1060sub load_extensions {
1028 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
1029 next unless -r $ext; 1062 next unless -r $ext;
1047}; 1080};
1048 1081
1049cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1050 1083
1051############################################################################# 1084#############################################################################
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 1085
1075=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1076 1087
1077Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1078 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1079=head3 cf::player 1096=head3 cf::player
1080 1097
1081=over 4 1098=over 4
1082 1099
1083=item cf::player::exists $login 1100=item cf::player::find $login
1084 1101
1085Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1086 1103
1087=cut 1104=cut
1088 1105
1089sub cf::player::exists($) { 1106sub playerdir($) {
1090 cf::player::find $_[0] 1107 cf::localdir
1091 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1108 . "/"
1109 . cf::playerdir
1110 . "/"
1111 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1112}
1113
1114sub path($) {
1115 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1116
1117 (playerdir $login) . "/$login.pl"
1118}
1119
1120sub find_active($) {
1121 $cf::PLAYER{$_[0]}
1122 and $cf::PLAYER{$_[0]}->active
1123 and $cf::PLAYER{$_[0]}
1124}
1125
1126sub exists($) {
1127 my ($login) = @_;
1128
1129 $cf::PLAYER{$login}
1130 or cf::sync_job { !aio_stat $login }
1131}
1132
1133sub find($) {
1134 return $cf::PLAYER{$_[0]} || do {
1135 my $login = $_[0];
1136
1137 my $guard = cf::lock_acquire "user_find:$login";
1138
1139 $cf::PLAYER{$_[0]} || do {
1140 my $pl = load_pl path $login
1141 or return;
1142 $cf::PLAYER{$login} = $pl
1143 }
1144 }
1145}
1146
1147sub save($) {
1148 my ($pl) = @_;
1149
1150 return if $pl->{deny_save};
1151
1152 my $path = path $pl;
1153 my $guard = cf::lock_acquire "user_save:$path";
1154
1155 return if $pl->{deny_save};
1156
1157 aio_mkdir playerdir $pl, 0770;
1158 $pl->{last_save} = $cf::RUNTIME;
1159
1160 $pl->save_pl ($path);
1161 Coro::cede;
1162}
1163
1164sub new($) {
1165 my ($login) = @_;
1166
1167 my $self = create;
1168
1169 $self->ob->name ($login);
1170 $self->{deny_save} = 1;
1171
1172 $cf::PLAYER{$login} = $self;
1173
1174 $self
1175}
1176
1177=item $pl->quit_character
1178
1179Nukes the player without looking back. If logged in, the connection will
1180be destroyed. May block for a long time.
1181
1182=cut
1183
1184sub quit_character {
1185 my ($pl) = @_;
1186
1187 $pl->{deny_save} = 1;
1188 $pl->password ("*"); # this should lock out the player until we nuked the dir
1189
1190 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1191 $pl->deactivate;
1192 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1193 $pl->ns->destroy if $pl->ns;
1194
1195 my $path = playerdir $pl;
1196 my $temp = "$path~$cf::RUNTIME~deleting~";
1197 aio_rename $path, $temp;
1198 delete $cf::PLAYER{$pl->ob->name};
1199 $pl->destroy;
1200 IO::AIO::aio_rmtree $temp;
1201}
1202
1203=item cf::player::list_logins
1204
1205Returns am arrayref of all valid playernames in the system, can take a
1206while and may block, so not sync_job-capable, ever.
1207
1208=cut
1209
1210sub list_logins {
1211 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1212 or return [];
1213
1214 my @logins;
1215
1216 for my $login (@$dirs) {
1217 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1218 aio_read $fh, 0, 512, my $buf, 0 or next;
1219 $buf !~ /^password -------------$/m or next; # official not-valid tag
1220
1221 utf8::decode $login;
1222 push @logins, $login;
1223 }
1224
1225 \@logins
1226}
1227
1228=item $player->maps
1229
1230Returns an arrayref of cf::path's of all maps that are private for this
1231player. May block.
1232
1233=cut
1234
1235sub maps($) {
1236 my ($pl) = @_;
1237
1238 my $files = aio_readdir playerdir $pl
1239 or return;
1240
1241 my @paths;
1242
1243 for (@$files) {
1244 utf8::decode $_;
1245 next if /\.(?:pl|pst)$/;
1246 next unless /^$PATH_SEP/o;
1247
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1092} 1252}
1093 1253
1094=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1095 1255
1096Sends an ext reply to the player. 1256Sends an ext reply to the player.
1097 1257
1098=cut 1258=cut
1099 1259
1100sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1101 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1102 1262
1103 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1104 1264
1105 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1106} 1266}
1267
1268package cf;
1107 1269
1108=back 1270=back
1109 1271
1110 1272
1111=head3 cf::map 1273=head3 cf::map
1124 1286
1125sub generate_random_map { 1287sub generate_random_map {
1126 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1127 1289
1128 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1129 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1130 $path, 1292 $path,
1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1134 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1301 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1141 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1142} 1305}
1143 1306
1144# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1145# all maps in C++... 1308# all maps in C++...
1146sub change_all_map_light { 1309sub change_all_map_light {
1148 1311
1149 $_->change_map_light ($change) 1312 $_->change_map_light ($change)
1150 for grep $_->outdoor, values %cf::MAP; 1313 for grep $_->outdoor, values %cf::MAP;
1151} 1314}
1152 1315
1153sub try_load_header($) { 1316sub load_map_header($) {
1154 my ($path) = @_; 1317 my ($path) = @_;
1155 1318
1156 utf8::encode $path; 1319 utf8::encode $path;
1157 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1158 or return; 1321 or return;
1159 1322
1160 my $map = cf::map::new 1323 my $map = cf::map::new
1161 or return; 1324 or return;
1162 1325
1163 # for better error messages only, will be overwritten 1326 # for better error messages only, will be overwritten later
1164 $map->path ($path); 1327 $map->path ($path);
1165 1328
1166 $map->load_header ($path) 1329 $map->load_header ($path)
1167 or return; 1330 or return;
1168 1331
1184 1347
1185 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1186 my $guard = cf::lock_acquire "map_find:$key"; 1349 my $guard = cf::lock_acquire "map_find:$key";
1187 1350
1188 # do it the slow way 1351 # do it the slow way
1189 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1190 1353
1191 Coro::cede; 1354 Coro::cede;
1192 1355
1193 if ($map) { 1356 if ($map) {
1194 $map->last_access ((delete $map->{last_access}) 1357 $map->last_access ((delete $map->{last_access})
1195 || $cf::RUNTIME); #d# 1358 || $cf::RUNTIME); #d#
1196 # safety 1359 # safety
1197 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1198 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1199 } else { 1362 } else {
1200 if (my $rmp = $path->random_map_params) { 1363 $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; 1364 or return;
1207 1365
1208 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1209 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1210 $map->last_access ($cf::RUNTIME); 1368 $map->last_access ($cf::RUNTIME);
1211 $map->instantiate; 1369 $map->instantiate;
1263 1421
1264 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1265 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1266 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1267 } else { 1425 } else {
1426 $self->decay_objects;
1268 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1269 $self->decay_objects;
1270 $self->update_buttons; 1428 $self->update_buttons;
1271 $self->set_darkness_map; 1429 $self->set_darkness_map;
1272 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1273 unless $self->difficulty; 1431 unless $self->difficulty;
1274 $self->activate; 1432 $self->activate;
1277 Coro::cede; 1435 Coro::cede;
1278 1436
1279 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1280} 1438}
1281 1439
1440# find and load all maps in the 3x3 area around a map
1441sub load_diag {
1442 my ($map) = @_;
1443
1444 my @diag; # diagonal neighbours
1445
1446 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_)
1448 or next;
1449 $neigh = find $neigh, $map
1450 or next;
1451 $neigh->load;
1452
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 }
1456
1457 for (@diag) {
1458 my $neigh = find @$_
1459 or next;
1460 $neigh->load;
1461 }
1462}
1463
1282sub find_sync { 1464sub find_sync {
1283 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1284 1466
1285 cf::sync_job { cf::map::find $path, $origin } 1467 cf::sync_job { find $path, $origin }
1286} 1468}
1287 1469
1288sub do_load_sync { 1470sub do_load_sync {
1289 my ($map) = @_; 1471 my ($map) = @_;
1290 1472
1291 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1292} 1474}
1293 1475
1476our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async {
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491
1492sub find_async {
1493 my ($path, $origin) = @_;
1494
1495 $path = new cf::path $path, $origin && $origin->path;
1496 my $key = $path->as_string;
1497
1498 if (my $map = $cf::MAP{$key}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 }
1501
1502 $MAP_PREFETCH{$key} = $path;
1503 $MAP_PREFETCHER->ready;
1504
1505 ()
1506}
1507
1294sub save { 1508sub save {
1295 my ($self) = @_; 1509 my ($self) = @_;
1296 1510
1297 my $lock = cf::lock_acquire "map_data:" . $self->path; 1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1298 1512
1306 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1307 1521
1308 return if $self->{deny_save}; 1522 return if $self->{deny_save};
1309 1523
1310 local $self->{last_access} = $self->last_access;#d# 1524 local $self->{last_access} = $self->last_access;#d#
1525
1526 cf::async {
1527 $_->contr->save for $self->players;
1528 };
1311 1529
1312 if ($uniq) { 1530 if ($uniq) {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1314 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1315 } else { 1533 } else {
1350 my ($self) = @_; 1568 my ($self) = @_;
1351 1569
1352 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1353} 1571}
1354 1572
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 { 1573sub rename {
1364 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1365 1575
1366 $self->unlink_save; 1576 $self->{path}->unlink_save;
1367 1577
1368 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1369 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1370 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1371 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1385 1595
1386 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1387 1597
1388 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1389 1599
1390 $self->unlink_save; 1600 $self->{path}->unlink_save;
1391 $self->destroy; 1601 $self->destroy;
1392} 1602}
1393 1603
1394my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1395 1605
1400 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1401 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1402 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1403} 1613}
1404 1614
1405sub customise_for { 1615=item cf::map::unique_maps
1406 my ($map, $ob) = @_;
1407 1616
1408 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1409 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1410 }
1411 1619
1412 $map 1620=cut
1413}
1414 1621
1415sub emergency_save { 1622sub unique_maps() {
1416 my $freeze_guard = cf::freeze_mainloop; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1417 1625
1418 warn "enter emergency map save\n"; 1626 my @paths;
1419 1627
1420 cf::sync_job { 1628 for (@$files) {
1421 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1422 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1423 }; 1634 }
1424 1635
1425 warn "end emergency map save\n"; 1636 \@paths
1426} 1637}
1427 1638
1428package cf; 1639package cf;
1429 1640
1430=back 1641=back
1431 1642
1643=head3 cf::object
1644
1645=cut
1646
1647package cf::object;
1648
1649=over 4
1650
1651=item $ob->inv_recursive
1652
1653Returns the inventory of the object _and_ their inventories, recursively.
1654
1655=cut
1656
1657sub inv_recursive_;
1658sub inv_recursive_ {
1659 map { $_, inv_recursive_ $_->inv } @_
1660}
1661
1662sub inv_recursive {
1663 inv_recursive_ inv $_[0]
1664}
1665
1666package cf;
1667
1668=back
1432 1669
1433=head3 cf::object::player 1670=head3 cf::object::player
1434 1671
1435=over 4 1672=over 4
1436 1673
1528 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1531 1768
1532 $map->load; 1769 $map->load;
1770 $map->load_diag;
1533 1771
1772 return unless $self->contr->active;
1534 $self->activate_recursive; 1773 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1536} 1775}
1537 1776
1538cf::player->attach ( 1777cf::player->attach (
1550 my ($pl) = @_; 1789 my ($pl) = @_;
1551 1790
1552 # try to abort aborted map switching on player login :) 1791 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1792 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1793 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link; 1794 $pl->ob->enter_link;
1557 (async { 1795 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running 1796 # 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 1797 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef, 1798 $pl->ob->reply (undef,
1573=cut 1811=cut
1574 1812
1575sub cf::object::player::goto { 1813sub cf::object::player::goto {
1576 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1577 1815
1816 $path = new cf::path $path;
1817
1578 $self->enter_link; 1818 $self->enter_link;
1579 1819
1580 (async { 1820 (async {
1581 $path = new cf::path $path;
1582
1583 my $map = cf::map::find $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1584 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1585 1823
1586# warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1587# if $map; 1825# if $map;
1588 1826
1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1827 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1590 1828
1591 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1592 })->prio (1); 1830 })->prio (1);
1593} 1831}
1594 1832
1660 1898
1661 1; 1899 1;
1662 }) { 1900 }) {
1663 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1664 . "I'll try to bring you back to the map you were before. " 1902 . "I'll try to bring you back to the map you were before. "
1665 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1666 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1667 1905
1668 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1669 $self->leave_link; 1907 $self->leave_link;
1670 } 1908 }
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2240 $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}; 2241 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004 2242
2005 if (exists $CFG{mlockall}) { 2243 if (exists $CFG{mlockall}) {
2006 eval { 2244 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall 2245 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2008 and die "WARNING: m(un)lockall failed: $!\n"; 2246 and die "WARNING: m(un)lockall failed: $!\n";
2009 }; 2247 };
2010 warn $@ if $@; 2248 warn $@ if $@;
2011 } 2249 }
2012} 2250}
2023 load_extensions; 2261 load_extensions;
2024 Event::loop; 2262 Event::loop;
2025} 2263}
2026 2264
2027############################################################################# 2265#############################################################################
2028# initialisation 2266# initialisation and cleanup
2267
2268# install some emergency cleanup handlers
2269BEGIN {
2270 for my $signal (qw(INT HUP TERM)) {
2271 Event->signal (
2272 data => WF_AUTOCANCEL,
2273 signal => $signal,
2274 cb => sub {
2275 cf::cleanup "SIG$signal";
2276 },
2277 );
2278 }
2279}
2280
2281sub emergency_save() {
2282 my $freeze_guard = cf::freeze_mainloop;
2283
2284 warn "enter emergency perl save\n";
2285
2286 cf::sync_job {
2287 # use a peculiar iteration method to avoid tripping on perl
2288 # refcount bugs in for. also avoids problems with players
2289 # and maps saved/Destroyed asynchronously.
2290 warn "begin emergency player save\n";
2291 for my $login (keys %cf::PLAYER) {
2292 my $pl = $cf::PLAYER{$login} or next;
2293 $pl->valid or next;
2294 $pl->save;
2295 }
2296 warn "end emergency player save\n";
2297
2298 warn "begin emergency map save\n";
2299 for my $path (keys %cf::MAP) {
2300 my $map = $cf::MAP{$path} or next;
2301 $map->valid or next;
2302 $map->save;
2303 }
2304 warn "end emergency map save\n";
2305 };
2306
2307 warn "leave emergency perl save\n";
2308}
2029 2309
2030sub reload() { 2310sub reload() {
2031 # can/must only be called in main 2311 # can/must only be called in main
2032 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
2033 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
2034 return; 2314 return;
2035 } 2315 }
2036 2316
2037 warn "reloading..."; 2317 warn "reloading...";
2038 2318
2319 warn "freezing server";
2039 my $guard = freeze_mainloop; 2320 my $guard = freeze_mainloop;
2040 cf::emergency_save; 2321 cf::emergency_save;
2041 2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326
2042 eval { 2327 eval {
2043 # if anything goes wrong in here, we should simply crash as we already saved 2328 # if anything goes wrong in here, we should simply crash as we already saved
2044 2329
2045 # cancel all watchers 2330 warn "cancel all watchers";
2046 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
2047 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
2048 } 2333 }
2049 2334
2050 # cancel all extension coros 2335 warn "cancel all extension coros";
2051 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
2052 %EXT_CORO = (); 2337 %EXT_CORO = ();
2053 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
2054 # unload all extensions 2345 warn "unload/nuke all extensions";
2055 for (@exts) { 2346 for my $pkg (@EXTS) {
2056 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
2057 unload_extension $_; 2348
2349 if (my $cb = $pkg->can ("unload")) {
2350 eval {
2351 $cb->($pkg);
2352 1
2353 } or warn "$pkg unloaded, but with errors: $@";
2058 } 2354 }
2059 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
2060 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
2061 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
2062 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2063 2363
2064 warn "removing <$k>"; 2364 warn "removing <$k>";
2065 delete $INC{$k}; 2365 delete $INC{$k};
2072 } 2372 }
2073 2373
2074 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
2075 } 2375 }
2076 2376
2077 # sync database to disk
2078 cf::db_sync;
2079 IO::AIO::flush;
2080
2081 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
2082 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
2083 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2379 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2084 2380
2085 # remove register_script_function callbacks
2086 # TODO
2087
2088 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
2089 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
2090 2383
2091 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
2092 # and global variables created in xs 2385 # and global variables created in xs
2093 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
2094 2387
2095 # reload cf.pm
2096 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
2097 require cf; 2389 require cf;
2098 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2099 2391
2100 # load config and database again 2392 warn "load config and database again";
2101 cf::cfg_load; 2393 cf::cfg_load;
2102 cf::db_load; 2394 cf::db_load;
2103 2395
2104 # load extensions
2105 warn "load extensions"; 2396 warn "load extensions";
2106 cf::load_extensions; 2397 cf::load_extensions;
2107 2398
2108 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
2109 warn "reattach";
2110 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
2111 }; 2403 };
2112 2404
2113 if ($@) { 2405 if ($@) {
2114 warn $@; 2406 warn $@;
2115 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
2116 exit 1; 2408 exit 1;
2117 } 2409 }
2118 2410
2119 warn "reloaded successfully"; 2411 warn "reloaded";
2120}; 2412};
2121 2413
2122############################################################################# 2414#############################################################################
2123 2415
2124unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2131 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2132 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2133 2425
2134 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2135 Event->timer ( 2427 Event->timer (
2136 after => 2, 2428 after => 10,
2137 cb => sub { 2429 cb => sub {
2138 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2139 2431
2140 # provide some exits "home" 2432 # provide some exits "home"
2141 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2160 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2161 2453
2162 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2163} 2455}
2164 2456
2165register "<global>", __PACKAGE__;
2166
2167register_command "reload" => sub { 2457register_command "reload" => sub {
2168 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2169 2459
2170 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2171 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2180 reentrant => 0, 2470 reentrant => 0,
2181 prio => 0, 2471 prio => 0,
2182 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2183 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2184 cb => sub { 2474 cb => sub {
2475 $NOW = Event::time;
2476
2185 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2186 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2187 $NEXT_TICK += $TICK; 2479 $NEXT_TICK += $TICK;
2480
2481 $WAIT_FOR_TICK->broadcast;
2482 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2188 2483
2189 # if we are delayed by four ticks or more, skip them all 2484 # if we are delayed by four ticks or more, skip them all
2190 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2191 2486
2192 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines