ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.162 by root, Thu Jan 11 00:41:08 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines