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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.138 by root, Fri Jan 5 17:07:17 2007 UTC vs.
Revision 1.163 by root, Thu Jan 11 01:01:56 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines