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.141 by root, Fri Jan 5 20:08:53 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
286 } 318 }
287} 319}
288 320
289=item $coro = cf::async_ext { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
290 322
291Like async, but this coro is automcatially being canceled when the 323Like async, but this coro is automatically being canceled when the
292extension calling this is being unloaded. 324extension calling this is being unloaded.
293 325
294=cut 326=cut
295 327
296sub async_ext(&) { 328sub async_ext(&) {
334 366
335############################################################################# 367#############################################################################
336 368
337package cf::path; 369package cf::path;
338 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
339sub new { 383sub new {
340 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
341 385
342 $path = $path->as_string if ref $path; 386 return $path if ref $path;
343 387
344 my $self = bless { }, $class; 388 my $self = {};
345 389
346 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
347 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
348 # ?random/... random maps 392 # ?random/... random maps
349 # /! non-realised random map exit 393 # /! non-realised random map exit
350 # /... normal maps 394 # /... normal maps
351 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
352 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
353 397
398 $path =~ s/$PATH_SEP/\//go;
399
354 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
355 # fine as it is 401 # fine as it is
356 } elsif ($path =~ s{^\?random/}{}) {
357 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
358 $self->{random} = cf::from_json $data;
359 } else { 402 } else {
360 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
361 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
362 406
363 if (defined $1) { 407 if (defined $1) {
364 $self->{user} = $1; 408 $self->{user} = $1;
365 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
366 $self->{user} = $1; 410 $self->{user} = $1;
367 } else { 411 } else {
368 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
369 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
370 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
371 # already absolute 422 # already absolute
372 } else { 423 } else {
424 # relative
373 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
374 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
375 } 427 }
376 428
377 for ($path) { 429 for ($path) {
380 } 432 }
381 } 433 }
382 434
383 $self->{path} = $path; 435 $self->{path} = $path;
384 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
385 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
386} 458}
387 459
388# the name / primary key / in-game path 460# the name / primary key / in-game path
389sub as_string { 461sub as_string {
390 my ($self) = @_; 462 my ($self) = @_;
391 463
392 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
393 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
394 : $self->{path} 466 : $self->{path}
395} 467}
396 468
397# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
398sub visible_name { 470sub visible_name {
399 my ($self) = @_; 471 &as_string
400
401# if (my $rmp = $self->{random}) {
402# # todo: be more intelligent about this
403# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
404# } else {
405 $self->as_string
406# }
407} 472}
408 473
409# escape the /'s in the path 474# escape the /'s in the path
410sub _escaped_path { 475sub _escaped_path {
411 # ∕ is U+2215
412 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
413 $path 478 $path
414} 479}
415 480
416# the original (read-only) location 481# the original (read-only) location
417sub load_path { 482sub load_path {
422 487
423# the temporary/swap location 488# the temporary/swap location
424sub save_path { 489sub save_path {
425 my ($self) = @_; 490 my ($self) = @_;
426 491
492 $self->{user_rel}
427 $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
428 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
429 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
430} 495}
431 496
432# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
433sub uniq_path { 498sub uniq_path {
434 my ($self) = @_; 499 my ($self) = @_;
435 500
436 $self->{user_rel} || $self->{random} 501 $self->{user_rel} || $self->{ext}
437 ? undef 502 ? undef
438 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
439} 504}
440 505
441# return random map parameters, or undef 506sub customise_for {
442sub random_map_params {
443 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
444 508
445 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
446} 514}
447 515
448# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
449sub is_style_map { 517sub is_style_map {
450 $_[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";
451} 539}
452 540
453package cf; 541package cf;
454 542
455############################################################################# 543#############################################################################
905=cut 993=cut
906 994
907sub register_extcmd { 995sub register_extcmd {
908 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
909 997
910 my $caller = caller;
911 #warn "registering extcmd '$name' to '$caller'";
912
913 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
914} 999}
915 1000
916cf::player->attach ( 1001cf::player->attach (
917 on_command => sub { 1002 on_command => sub {
918 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
931 1016
932 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
933 1018
934 if (ref $msg) { 1019 if (ref $msg) {
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
936 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
937 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
938 } 1023 }
939 } 1024 }
940 } else { 1025 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 1028
944 cf::override; 1029 cf::override;
945 }, 1030 },
946); 1031);
947 1032
948sub register {
949 my ($base, $pkg) = @_;
950
951 #TODO
952}
953
954sub load_extension { 1033sub load_extension {
955 my ($path) = @_; 1034 my ($path) = @_;
956 1035
957 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
958 my $base = $1; 1037 my $base = $1;
959 my $pkg = $1; 1038 my $pkg = $1;
960 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
961 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
962 1041
963 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
964 1043
965 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
966 or die "$path: $!"; 1045 or die "$path: $!";
967 1046
968 my $source = 1047 my $source =
973 1052
974 eval $source 1053 eval $source
975 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
976 : "extension disabled.\n"; 1055 : "extension disabled.\n";
977 1056
978 push @exts, $pkg; 1057 push @EXTS, $pkg;
979 $ext_pkg{$base} = $pkg;
980
981# no strict 'refs';
982# @{"$pkg\::ISA"} = ext::;
983
984 register $base, $pkg;
985}
986
987sub unload_extension {
988 my ($pkg) = @_;
989
990 warn "removing extension $pkg\n";
991
992 # remove hooks
993 #TODO
994# for my $idx (0 .. $#PLUGIN_EVENT) {
995# delete $hook[$idx]{$pkg};
996# }
997
998 # remove commands
999 for my $name (keys %COMMAND) {
1000 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1001
1002 if (@cb) {
1003 $COMMAND{$name} = \@cb;
1004 } else {
1005 delete $COMMAND{$name};
1006 }
1007 }
1008
1009 # remove extcmds
1010 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1011 delete $EXTCMD{$name};
1012 }
1013
1014 if (my $cb = $pkg->can ("unload")) {
1015 eval {
1016 $cb->($pkg);
1017 1
1018 } or warn "$pkg unloaded, but with errors: $@";
1019 }
1020
1021 Symbol::delete_package $pkg;
1022} 1058}
1023 1059
1024sub load_extensions { 1060sub load_extensions {
1025 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
1026 next unless -r $ext; 1062 next unless -r $ext;
1044}; 1080};
1045 1081
1046cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1047 1083
1048############################################################################# 1084#############################################################################
1049# load/save perl data associated with player->ob objects
1050
1051sub all_objects(@) {
1052 @_, map all_objects ($_->inv), @_
1053}
1054
1055# TODO: compatibility cruft, remove when no longer needed
1056cf::player->attach (
1057 on_load => sub {
1058 my ($pl, $path) = @_;
1059
1060 for my $o (all_objects $pl->ob) {
1061 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1062 $o->set_ob_key_value ("_perl_data");
1063
1064 %$o = %{ Storable::thaw pack "H*", $value };
1065 }
1066 }
1067 },
1068);
1069
1070#############################################################################
1071 1085
1072=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1073 1087
1074Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1075 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1076=head3 cf::player 1096=head3 cf::player
1077 1097
1078=over 4 1098=over 4
1079 1099
1080=item cf::player::exists $login 1100=item cf::player::find $login
1081 1101
1082Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1083 1103
1084=cut 1104=cut
1085 1105
1086sub cf::player::exists($) { 1106sub playerdir($) {
1087 cf::player::find $_[0] 1107 cf::localdir
1088 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
1089} 1252}
1090 1253
1091=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1092 1255
1093Sends an ext reply to the player. 1256Sends an ext reply to the player.
1094 1257
1095=cut 1258=cut
1096 1259
1097sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1098 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1099 1262
1100 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1101 1264
1102 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1103} 1266}
1267
1268package cf;
1104 1269
1105=back 1270=back
1106 1271
1107 1272
1108=head3 cf::map 1273=head3 cf::map
1121 1286
1122sub generate_random_map { 1287sub generate_random_map {
1123 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1124 1289
1125 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1126 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1127 $path, 1292 $path,
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1131 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1133 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1134 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1135 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1136 $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},
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1139} 1305}
1140 1306
1141# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1142# all maps in C++... 1308# all maps in C++...
1143sub change_all_map_light { 1309sub change_all_map_light {
1145 1311
1146 $_->change_map_light ($change) 1312 $_->change_map_light ($change)
1147 for grep $_->outdoor, values %cf::MAP; 1313 for grep $_->outdoor, values %cf::MAP;
1148} 1314}
1149 1315
1150sub try_load_header($) { 1316sub load_map_header($) {
1151 my ($path) = @_; 1317 my ($path) = @_;
1152 1318
1153 utf8::encode $path; 1319 utf8::encode $path;
1154 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1155 or return; 1321 or return;
1156 1322
1157 my $map = cf::map::new 1323 my $map = cf::map::new
1158 or return; 1324 or return;
1159 1325
1160 # for better error messages only, will be overwritten 1326 # for better error messages only, will be overwritten later
1161 $map->path ($path); 1327 $map->path ($path);
1162 1328
1163 $map->load_header ($path) 1329 $map->load_header ($path)
1164 or return; 1330 or return;
1165 1331
1181 1347
1182 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1183 my $guard = cf::lock_acquire "map_find:$key"; 1349 my $guard = cf::lock_acquire "map_find:$key";
1184 1350
1185 # do it the slow way 1351 # do it the slow way
1186 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1187 1353
1188 Coro::cede; 1354 Coro::cede;
1189 1355
1190 if ($map) { 1356 if ($map) {
1191 $map->last_access ((delete $map->{last_access}) 1357 $map->last_access ((delete $map->{last_access})
1192 || $cf::RUNTIME); #d# 1358 || $cf::RUNTIME); #d#
1193 # safety 1359 # safety
1194 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1195 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1196 } else { 1362 } else {
1197 if (my $rmp = $path->random_map_params) { 1363 $map = $path->load_orig
1198 $map = generate_random_map $key, $rmp;
1199 } else {
1200 $map = try_load_header $path->load_path;
1201 }
1202
1203 $map or return; 1364 or return;
1204 1365
1205 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1206 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1207 $map->last_access ($cf::RUNTIME); 1368 $map->last_access ($cf::RUNTIME);
1208 $map->instantiate; 1369 $map->instantiate;
1260 1421
1261 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1262 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1263 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1264 } else { 1425 } else {
1426 $self->decay_objects;
1265 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1266 $self->decay_objects;
1267 $self->update_buttons; 1428 $self->update_buttons;
1268 $self->set_darkness_map; 1429 $self->set_darkness_map;
1269 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1270 unless $self->difficulty; 1431 unless $self->difficulty;
1271 $self->activate; 1432 $self->activate;
1274 Coro::cede; 1435 Coro::cede;
1275 1436
1276 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1277} 1438}
1278 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
1279sub find_sync { 1464sub find_sync {
1280 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1281 1466
1282 cf::sync_job { cf::map::find $path, $origin } 1467 cf::sync_job { find $path, $origin }
1283} 1468}
1284 1469
1285sub do_load_sync { 1470sub do_load_sync {
1286 my ($map) = @_; 1471 my ($map) = @_;
1287 1472
1288 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1289} 1474}
1290 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
1291sub save { 1508sub save {
1292 my ($self) = @_; 1509 my ($self) = @_;
1293 1510
1294 my $lock = cf::lock_acquire "map_data:" . $self->path; 1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1295 1512
1303 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1304 1521
1305 return if $self->{deny_save}; 1522 return if $self->{deny_save};
1306 1523
1307 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 };
1308 1529
1309 if ($uniq) { 1530 if ($uniq) {
1310 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1311 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1312 } else { 1533 } else {
1347 my ($self) = @_; 1568 my ($self) = @_;
1348 1569
1349 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1350} 1571}
1351 1572
1352sub unlink_save {
1353 my ($self) = @_;
1354
1355 utf8::encode (my $save = $self->{path}->save_path);
1356 aioreq_pri 3; IO::AIO::aio_unlink $save;
1357 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1358}
1359
1360sub rename { 1573sub rename {
1361 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1362 1575
1363 $self->unlink_save; 1576 $self->{path}->unlink_save;
1364 1577
1365 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1366 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1367 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1368 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1382 1595
1383 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1384 1597
1385 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1386 1599
1387 $self->unlink_save; 1600 $self->{path}->unlink_save;
1388 $self->destroy; 1601 $self->destroy;
1389} 1602}
1390 1603
1391my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1392 1605
1397 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1398 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1399 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1400} 1613}
1401 1614
1402sub customise_for { 1615=item cf::map::unique_maps
1403 my ($map, $ob) = @_;
1404 1616
1405 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1406 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1407 }
1408 1619
1409 $map 1620=cut
1410}
1411 1621
1412sub emergency_save { 1622sub unique_maps() {
1413 my $freeze_guard = cf::freeze_mainloop; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1414 1625
1415 warn "enter emergency map save\n"; 1626 my @paths;
1416 1627
1417 cf::sync_job { 1628 for (@$files) {
1418 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1419 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1420 }; 1634 }
1421 1635
1422 warn "end emergency map save\n"; 1636 \@paths
1423} 1637}
1424 1638
1425package cf; 1639package cf;
1426 1640
1427=back 1641=back
1428 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
1429 1669
1430=head3 cf::object::player 1670=head3 cf::object::player
1431 1671
1432=over 4 1672=over 4
1433 1673
1525 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1526 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1527 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1528 1768
1529 $map->load; 1769 $map->load;
1770 $map->load_diag;
1530 1771
1772 return unless $self->contr->active;
1531 $self->activate_recursive; 1773 $self->activate_recursive;
1532 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1533} 1775}
1534 1776
1535cf::player->attach ( 1777cf::player->attach (
1547 my ($pl) = @_; 1789 my ($pl) = @_;
1548 1790
1549 # try to abort aborted map switching on player login :) 1791 # try to abort aborted map switching on player login :)
1550 # should happen only on crashes 1792 # should happen only on crashes
1551 if ($pl->ob->{_link_pos}) { 1793 if ($pl->ob->{_link_pos}) {
1552
1553 $pl->ob->enter_link; 1794 $pl->ob->enter_link;
1554 (async { 1795 (async {
1555 # 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
1556 # 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
1557 $pl->ob->reply (undef, 1798 $pl->ob->reply (undef,
1570=cut 1811=cut
1571 1812
1572sub cf::object::player::goto { 1813sub cf::object::player::goto {
1573 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1574 1815
1816 $path = new cf::path $path;
1817
1575 $self->enter_link; 1818 $self->enter_link;
1576 1819
1577 (async { 1820 (async {
1578 $path = new cf::path $path;
1579
1580 my $map = cf::map::find $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1581 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1582 1823
1583# warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1584# if $map; 1825# if $map;
1585 1826
1586 $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);
1587 1828
1588 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1589 })->prio (1); 1830 })->prio (1);
1590} 1831}
1591 1832
1657 1898
1658 1; 1899 1;
1659 }) { 1900 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "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. "
1662 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1663 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1664 1905
1665 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1666 $self->leave_link; 1907 $self->leave_link;
1667 } 1908 }
1999 $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};
2000 $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};
2001 2242
2002 if (exists $CFG{mlockall}) { 2243 if (exists $CFG{mlockall}) {
2003 eval { 2244 eval {
2004 $CFG{mlockall} ? &mlockall : &munlockall 2245 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2005 and die "WARNING: m(un)lockall failed: $!\n"; 2246 and die "WARNING: m(un)lockall failed: $!\n";
2006 }; 2247 };
2007 warn $@ if $@; 2248 warn $@ if $@;
2008 } 2249 }
2009} 2250}
2020 load_extensions; 2261 load_extensions;
2021 Event::loop; 2262 Event::loop;
2022} 2263}
2023 2264
2024############################################################################# 2265#############################################################################
2025# 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}
2026 2309
2027sub reload() { 2310sub reload() {
2028 # can/must only be called in main 2311 # can/must only be called in main
2029 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
2030 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
2031 return; 2314 return;
2032 } 2315 }
2033 2316
2034 warn "reloading..."; 2317 warn "reloading...";
2035 2318
2319 warn "freezing server";
2036 my $guard = freeze_mainloop; 2320 my $guard = freeze_mainloop;
2037 cf::emergency_save; 2321 cf::emergency_save;
2038 2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326
2039 eval { 2327 eval {
2040 # 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
2041 2329
2042 # cancel all watchers 2330 warn "cancel all watchers";
2043 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
2044 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
2045 } 2333 }
2046 2334
2047 # cancel all extension coros 2335 warn "cancel all extension coros";
2048 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
2049 %EXT_CORO = (); 2337 %EXT_CORO = ();
2050 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
2051 # unload all extensions 2345 warn "unload/nuke all extensions";
2052 for (@exts) { 2346 for my $pkg (@EXTS) {
2053 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
2054 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: $@";
2055 } 2354 }
2056 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
2057 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
2058 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
2059 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2060 2363
2061 warn "removing <$k>"; 2364 warn "removing <$k>";
2062 delete $INC{$k}; 2365 delete $INC{$k};
2069 } 2372 }
2070 2373
2071 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
2072 } 2375 }
2073 2376
2074 # sync database to disk
2075 cf::db_sync;
2076 IO::AIO::flush;
2077
2078 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
2079 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
2080 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);
2081 2380
2082 # remove register_script_function callbacks
2083 # TODO
2084
2085 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
2086 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
2087 2383
2088 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
2089 # and global variables created in xs 2385 # and global variables created in xs
2090 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
2091 2387
2092 # reload cf.pm
2093 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
2094 require cf; 2389 require cf;
2095 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2096 2391
2097 # load config and database again 2392 warn "load config and database again";
2098 cf::cfg_load; 2393 cf::cfg_load;
2099 cf::db_load; 2394 cf::db_load;
2100 2395
2101 # load extensions
2102 warn "load extensions"; 2396 warn "load extensions";
2103 cf::load_extensions; 2397 cf::load_extensions;
2104 2398
2105 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
2106 warn "reattach";
2107 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
2108 }; 2403 };
2109 2404
2110 if ($@) { 2405 if ($@) {
2111 warn $@; 2406 warn $@;
2112 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
2113 exit 1; 2408 exit 1;
2114 } 2409 }
2115 2410
2116 warn "reloaded successfully"; 2411 warn "reloaded";
2117}; 2412};
2118 2413
2119############################################################################# 2414#############################################################################
2120 2415
2121unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2128 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2129 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2130 2425
2131 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2132 Event->timer ( 2427 Event->timer (
2133 after => 2, 2428 after => 10,
2134 cb => sub { 2429 cb => sub {
2135 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2136 2431
2137 # provide some exits "home" 2432 # provide some exits "home"
2138 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2157 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2158 2453
2159 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2160} 2455}
2161 2456
2162register "<global>", __PACKAGE__;
2163
2164register_command "reload" => sub { 2457register_command "reload" => sub {
2165 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2166 2459
2167 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2168 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2177 reentrant => 0, 2470 reentrant => 0,
2178 prio => 0, 2471 prio => 0,
2179 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2180 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2181 cb => sub { 2474 cb => sub {
2475 $NOW = Event::time;
2476
2182 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2184 $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;
2185 2483
2186 # 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
2187 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2188 2486
2189 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines