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.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 (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} 501 $self->{user_rel} || $self->{ext}
428 ? undef 502 ? undef
429 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
430} 504}
431 505
432# return random map parameters, or undef 506sub customise_for {
433sub random_map_params {
434 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
435 508
436 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
437} 514}
438 515
439# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
440sub is_style_map { 517sub is_style_map {
441 $_[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";
442} 539}
443 540
444package cf; 541package cf;
445 542
446############################################################################# 543#############################################################################
896=cut 993=cut
897 994
898sub register_extcmd { 995sub register_extcmd {
899 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
900 997
901 my $caller = caller;
902 #warn "registering extcmd '$name' to '$caller'";
903
904 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
905} 999}
906 1000
907cf::player->attach ( 1001cf::player->attach (
908 on_command => sub { 1002 on_command => sub {
909 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
922 1016
923 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
924 1018
925 if (ref $msg) { 1019 if (ref $msg) {
926 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
927 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
928 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
929 } 1023 }
930 } 1024 }
931 } else { 1025 } else {
932 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
934 1028
935 cf::override; 1029 cf::override;
936 }, 1030 },
937); 1031);
938 1032
939sub register {
940 my ($base, $pkg) = @_;
941
942 #TODO
943}
944
945sub load_extension { 1033sub load_extension {
946 my ($path) = @_; 1034 my ($path) = @_;
947 1035
948 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
949 my $base = $1; 1037 my $base = $1;
950 my $pkg = $1; 1038 my $pkg = $1;
951 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
952 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
953 1041
954 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
955 1043
956 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
957 or die "$path: $!"; 1045 or die "$path: $!";
958 1046
959 my $source = 1047 my $source =
964 1052
965 eval $source 1053 eval $source
966 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
967 : "extension disabled.\n"; 1055 : "extension disabled.\n";
968 1056
969 push @exts, $pkg; 1057 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} 1058}
1014 1059
1015sub load_extensions { 1060sub load_extensions {
1016 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
1017 next unless -r $ext; 1062 next unless -r $ext;
1035}; 1080};
1036 1081
1037cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1038 1083
1039############################################################################# 1084#############################################################################
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 1085
1063=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1064 1087
1065Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1066 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1067=head3 cf::player 1096=head3 cf::player
1068 1097
1069=over 4 1098=over 4
1070 1099
1071=item cf::player::exists $login 1100=item cf::player::find $login
1072 1101
1073Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1074 1103
1075=cut 1104=cut
1076 1105
1077sub cf::player::exists($) { 1106sub playerdir($) {
1078 cf::player::find $_[0] 1107 cf::localdir
1079 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
1080} 1252}
1081 1253
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1255
1084Sends an ext reply to the player. 1256Sends an ext reply to the player.
1085 1257
1086=cut 1258=cut
1087 1259
1088sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1090 1262
1091 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1092 1264
1093 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1094} 1266}
1267
1268package cf;
1095 1269
1096=back 1270=back
1097 1271
1098 1272
1099=head3 cf::map 1273=head3 cf::map
1112 1286
1113sub generate_random_map { 1287sub generate_random_map {
1114 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1115 1289
1116 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1117 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1118 $path, 1292 $path,
1119 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1120 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1121 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1122 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1124 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1125 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1126 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1127 $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},
1128 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1129 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1130} 1305}
1131 1306
1132# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1133# all maps in C++... 1308# all maps in C++...
1134sub change_all_map_light { 1309sub change_all_map_light {
1136 1311
1137 $_->change_map_light ($change) 1312 $_->change_map_light ($change)
1138 for grep $_->outdoor, values %cf::MAP; 1313 for grep $_->outdoor, values %cf::MAP;
1139} 1314}
1140 1315
1141sub try_load_header($) { 1316sub load_map_header($) {
1142 my ($path) = @_; 1317 my ($path) = @_;
1143 1318
1144 utf8::encode $path; 1319 utf8::encode $path;
1145 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1146 or return; 1321 or return;
1147 1322
1148 my $map = cf::map::new 1323 my $map = cf::map::new
1149 or return; 1324 or return;
1150 1325
1151 # for better error messages only, will be overwritten 1326 # for better error messages only, will be overwritten later
1152 $map->path ($path); 1327 $map->path ($path);
1153 1328
1154 $map->load_header ($path) 1329 $map->load_header ($path)
1155 or return; 1330 or return;
1156 1331
1172 1347
1173 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1174 my $guard = cf::lock_acquire "map_find:$key"; 1349 my $guard = cf::lock_acquire "map_find:$key";
1175 1350
1176 # do it the slow way 1351 # do it the slow way
1177 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1178 1353
1179 Coro::cede; 1354 Coro::cede;
1180 1355
1181 if ($map) { 1356 if ($map) {
1182 $map->last_access ((delete $map->{last_access}) 1357 $map->last_access ((delete $map->{last_access})
1183 || $cf::RUNTIME); #d# 1358 || $cf::RUNTIME); #d#
1184 # safety 1359 # safety
1185 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1186 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1187 } else { 1362 } else {
1188 if (my $rmp = $path->random_map_params) { 1363 $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; 1364 or return;
1195 1365
1196 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1197 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1198 $map->last_access ($cf::RUNTIME); 1368 $map->last_access ($cf::RUNTIME);
1199 $map->instantiate; 1369 $map->instantiate;
1251 1421
1252 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1253 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1254 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1255 } else { 1425 } else {
1426 $self->decay_objects;
1256 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1257 $self->decay_objects;
1258 $self->update_buttons; 1428 $self->update_buttons;
1259 $self->set_darkness_map; 1429 $self->set_darkness_map;
1260 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1261 unless $self->difficulty; 1431 unless $self->difficulty;
1262 $self->activate; 1432 $self->activate;
1265 Coro::cede; 1435 Coro::cede;
1266 1436
1267 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1268} 1438}
1269 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
1270sub find_sync { 1464sub find_sync {
1271 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1272 1466
1273 cf::sync_job { cf::map::find $path, $origin } 1467 cf::sync_job { find $path, $origin }
1274} 1468}
1275 1469
1276sub do_load_sync { 1470sub do_load_sync {
1277 my ($map) = @_; 1471 my ($map) = @_;
1278 1472
1279 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1280} 1474}
1281 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
1282sub save { 1508sub save {
1283 my ($self) = @_; 1509 my ($self) = @_;
1284 1510
1285 my $lock = cf::lock_acquire "map_data:" . $self->path; 1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286 1512
1294 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1295 1521
1296 return if $self->{deny_save}; 1522 return if $self->{deny_save};
1297 1523
1298 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 };
1299 1529
1300 if ($uniq) { 1530 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1533 } else {
1338 my ($self) = @_; 1568 my ($self) = @_;
1339 1569
1340 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1341} 1571}
1342 1572
1343sub unlink_save {
1344 my ($self) = @_;
1345
1346 utf8::encode (my $save = $self->{path}->save_path);
1347 aioreq_pri 3; IO::AIO::aio_unlink $save;
1348 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1349}
1350
1351sub rename { 1573sub rename {
1352 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1353 1575
1354 $self->unlink_save; 1576 $self->{path}->unlink_save;
1355 1577
1356 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1357 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1358 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1359 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1373 1595
1374 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1375 1597
1376 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1377 1599
1378 $self->unlink_save; 1600 $self->{path}->unlink_save;
1379 $self->destroy; 1601 $self->destroy;
1380} 1602}
1381 1603
1382my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1383 1605
1388 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1389 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1390 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1391} 1613}
1392 1614
1393sub customise_for { 1615=item cf::map::unique_maps
1394 my ($map, $ob) = @_;
1395 1616
1396 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1397 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1398 }
1399 1619
1400 $map 1620=cut
1401}
1402 1621
1403sub emergency_save { 1622sub unique_maps() {
1404 my $freeze_guard = cf::freeze_mainloop; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1405 1625
1406 warn "enter emergency map save\n"; 1626 my @paths;
1407 1627
1408 cf::sync_job { 1628 for (@$files) {
1409 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1410 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1411 }; 1634 }
1412 1635
1413 warn "end emergency map save\n"; 1636 \@paths
1414} 1637}
1415 1638
1416package cf; 1639package cf;
1417 1640
1418=back 1641=back
1419 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
1420 1669
1421=head3 cf::object::player 1670=head3 cf::object::player
1422 1671
1423=over 4 1672=over 4
1424 1673
1516 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1519 1768
1520 $map->load; 1769 $map->load;
1770 $map->load_diag;
1521 1771
1772 return unless $self->contr->active;
1522 $self->activate_recursive; 1773 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1524} 1775}
1525 1776
1526cf::player->attach ( 1777cf::player->attach (
1539 1790
1540 # try to abort aborted map switching on player login :) 1791 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1792 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1793 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1794 $pl->ob->enter_link;
1544 Coro::async_pool { 1795 (async {
1545 # 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
1546 # 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
1798 $pl->ob->reply (undef,
1799 "There was an internal problem at your last logout, "
1800 . "the server will try to bring you to your intended destination in a second.",
1801 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1802 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1803 $pl->ob->leave_link;
1549 }; 1804 })->prio (2);
1550 } 1805 }
1551 }, 1806 },
1552); 1807);
1553 1808
1554=item $player_object->goto ($path, $x, $y) 1809=item $player_object->goto ($path, $x, $y)
1556=cut 1811=cut
1557 1812
1558sub cf::object::player::goto { 1813sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1560 1815
1816 $path = new cf::path $path;
1817
1561 $self->enter_link; 1818 $self->enter_link;
1562 1819
1563 (Coro::async_pool { 1820 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1568 1823
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1825# if $map;
1571 1826
1572 $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);
1573 1828
1574 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1830 })->prio (1);
1576} 1831}
1577 1832
1630 1885
1631 return unless $self->type == cf::PLAYER; 1886 return unless $self->type == cf::PLAYER;
1632 1887
1633 $self->enter_link; 1888 $self->enter_link;
1634 1889
1635 (Coro::async_pool { 1890 (async {
1636 $self->deactivate_recursive; # just to be sure 1891 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1892 unless (eval {
1638 prepare_random_map $exit 1893 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1894 if $exit->slaying eq "/!";
1640 1895
1643 1898
1644 1; 1899 1;
1645 }) { 1900 }) {
1646 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1647 . "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. "
1648 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1649 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1650 1905
1651 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1652 $self->leave_link; 1907 $self->leave_link;
1653 } 1908 }
1721 } 1976 }
1722 } 1977 }
1723 }, 1978 },
1724); 1979);
1725 1980
1726=item $client->coro (\&cb) 1981=item $client->async (\&cb)
1727 1982
1728Create a new coroutine, running the specified callback. The coroutine will 1983Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1984be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1985or loss of connection).
1731 1986
1732=cut 1987=cut
1733 1988
1734sub cf::client::coro { 1989sub cf::client::async {
1735 my ($self, $cb) = @_; 1990 my ($self, $cb) = @_;
1736 1991
1737 my $coro = &Coro::async_pool ($cb); 1992 my $coro = &Coro::async ($cb);
1738 1993
1739 $coro->on_destroy (sub { 1994 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1995 delete $self->{_coro}{$coro+0};
1741 }); 1996 });
1742 1997
1980 local $/; 2235 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2236 *CFG = YAML::Syck::Load <$fh>;
1982 2237
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2238 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2239
2240 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2241 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2242
1985 if (exists $CFG{mlockall}) { 2243 if (exists $CFG{mlockall}) {
1986 eval { 2244 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2245 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2246 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2247 };
1990 warn $@ if $@; 2248 warn $@ if $@;
1991 } 2249 }
1992} 2250}
1993 2251
1994sub main { 2252sub main {
1995 # we must not ever block the main coroutine 2253 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2254 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2255 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2256 async { Event::one_event };
2000 })->();
2001 }; 2257 };
2002 2258
2003 cfg_load; 2259 cfg_load;
2004 db_load; 2260 db_load;
2005 load_extensions; 2261 load_extensions;
2006 Event::loop; 2262 Event::loop;
2007} 2263}
2008 2264
2009############################################################################# 2265#############################################################################
2010# 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}
2011 2309
2012sub reload() { 2310sub reload() {
2013 # can/must only be called in main 2311 # can/must only be called in main
2014 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
2015 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
2016 return; 2314 return;
2017 } 2315 }
2018 2316
2019 warn "reloading..."; 2317 warn "reloading...";
2020 2318
2319 warn "freezing server";
2021 my $guard = freeze_mainloop; 2320 my $guard = freeze_mainloop;
2022 cf::emergency_save; 2321 cf::emergency_save;
2023 2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326
2024 eval { 2327 eval {
2025 # 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
2026 2329
2027 # cancel all watchers 2330 warn "cancel all watchers";
2028 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
2029 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
2030 } 2333 }
2031 2334
2032 # cancel all extension coros 2335 warn "cancel all extension coros";
2033 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
2034 %EXT_CORO = (); 2337 %EXT_CORO = ();
2035 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
2036 # unload all extensions 2345 warn "unload/nuke all extensions";
2037 for (@exts) { 2346 for my $pkg (@EXTS) {
2038 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
2039 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: $@";
2040 } 2354 }
2041 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
2042 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
2043 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
2044 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2045 2363
2046 warn "removing <$k>"; 2364 warn "removing <$k>";
2047 delete $INC{$k}; 2365 delete $INC{$k};
2054 } 2372 }
2055 2373
2056 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
2057 } 2375 }
2058 2376
2059 # sync database to disk
2060 cf::db_sync;
2061 IO::AIO::flush;
2062
2063 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
2064 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
2065 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);
2066 2380
2067 # remove register_script_function callbacks
2068 # TODO
2069
2070 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
2071 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
2072 2383
2073 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
2074 # and global variables created in xs 2385 # and global variables created in xs
2075 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
2076 2387
2077 # reload cf.pm
2078 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
2079 require cf; 2389 require cf;
2080 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2081 2391
2082 # load config and database again 2392 warn "load config and database again";
2083 cf::cfg_load; 2393 cf::cfg_load;
2084 cf::db_load; 2394 cf::db_load;
2085 2395
2086 # load extensions
2087 warn "load extensions"; 2396 warn "load extensions";
2088 cf::load_extensions; 2397 cf::load_extensions;
2089 2398
2090 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
2091 warn "reattach";
2092 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
2093 }; 2403 };
2094 2404
2095 if ($@) { 2405 if ($@) {
2096 warn $@; 2406 warn $@;
2097 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
2098 exit 1; 2408 exit 1;
2099 } 2409 }
2100 2410
2101 warn "reloaded successfully"; 2411 warn "reloaded";
2102}; 2412};
2103 2413
2104############################################################################# 2414#############################################################################
2105 2415
2106unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2425
2116 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2427 Event->timer (
2118 after => 2, 2428 after => 10,
2119 cb => sub { 2429 cb => sub {
2120 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2121 2431
2122 # provide some exits "home" 2432 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2142 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2143 2453
2144 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2145} 2455}
2146 2456
2147register "<global>", __PACKAGE__;
2148
2149register_command "reload" => sub { 2457register_command "reload" => sub {
2150 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2151 2459
2152 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2153 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2162 reentrant => 0, 2470 reentrant => 0,
2163 prio => 0, 2471 prio => 0,
2164 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2165 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2166 cb => sub { 2474 cb => sub {
2475 $NOW = Event::time;
2476
2167 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2169 $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;
2170 2483
2171 # 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
2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2173 2486
2174 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines