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.135 by root, Thu Jan 4 20:29:46 2007 UTC vs.
Revision 1.161 by root, Thu Jan 11 00:16:58 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
221 # wake up all waiters, to be on the safe side 253 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} }; 254 $_->ready for @{ delete $LOCK{$key} };
223 } 255 }
224} 256}
225 257
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop { 258sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active; 259 return unless $TICK_WATCHER->is_active;
244 260
245 my $guard = Coro::guard { $TICK_WATCHER->start }; 261 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop; 262 $TICK_WATCHER->stop;
247 $guard 263 $guard
248} 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 }
249 275
250=item cf::sync_job { BLOCK } 276=item cf::sync_job { BLOCK }
251 277
252The design of crossfire+ requires that the main coro ($Coro::main) is 278The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 279always able to handle events or runnable, as crossfire+ is only partly
272 my $freeze_guard = freeze_mainloop; 298 my $freeze_guard = freeze_mainloop;
273 299
274 my $busy = 1; 300 my $busy = 1;
275 my @res; 301 my @res;
276 302
277 (Coro::async { 303 (async {
278 @res = eval { $job->() }; 304 @res = eval { $job->() };
279 warn $@ if $@; 305 warn $@ if $@;
280 undef $busy; 306 undef $busy;
281 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
282 308
283 while ($busy) { 309 while ($busy) {
284 Coro::cede_notself; 310 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 311 }
287 312
288 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
289 } else { 314 } else {
290 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
291 316
292 $job->() 317 $job->()
293 } 318 }
294} 319}
295 320
296=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
297 322
298Creates and returns a new coro. This coro is automcatially being canceled 323Like async, but this coro is automatically being canceled when the
299when the extension calling this is being unloaded. 324extension calling this is being unloaded.
300 325
301=cut 326=cut
302 327
303sub coro(&) { 328sub async_ext(&) {
304 my $cb = shift; 329 my $cb = shift;
305 330
306 my $coro = &cf::async ($cb); 331 my $coro = &Coro::async ($cb);
307 332
308 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
309 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
310 }); 335 });
311 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
341 366
342############################################################################# 367#############################################################################
343 368
344package cf::path; 369package cf::path;
345 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
346sub new { 383sub new {
347 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
348 385
349 $path = $path->as_string if ref $path; 386 return $path if ref $path;
350 387
351 my $self = bless { }, $class; 388 my $self = {};
352 389
353 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
354 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
355 # ?random/... random maps 392 # ?random/... random maps
356 # /! non-realised random map exit 393 # /! non-realised random map exit
357 # /... normal maps 394 # /... normal maps
358 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
359 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
360 397
398 $path =~ s/$PATH_SEP/\//go;
399
361 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
362 # fine as it is 401 # fine as it is
363 } elsif ($path =~ s{^\?random/}{}) {
364 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
365 $self->{random} = cf::from_json $data;
366 } else { 402 } else {
367 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
368 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
369 406
370 if (defined $1) { 407 if (defined $1) {
371 $self->{user} = $1; 408 $self->{user} = $1;
372 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
373 $self->{user} = $1; 410 $self->{user} = $1;
374 } else { 411 } else {
375 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
376 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
377 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
378 # already absolute 422 # already absolute
379 } else { 423 } else {
424 # relative
380 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
381 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
382 } 427 }
383 428
384 for ($path) { 429 for ($path) {
387 } 432 }
388 } 433 }
389 434
390 $self->{path} = $path; 435 $self->{path} = $path;
391 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
392 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
393} 458}
394 459
395# the name / primary key / in-game path 460# the name / primary key / in-game path
396sub as_string { 461sub as_string {
397 my ($self) = @_; 462 my ($self) = @_;
398 463
399 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
400 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
401 : $self->{path} 466 : $self->{path}
402} 467}
403 468
404# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
405sub visible_name { 470sub visible_name {
406 my ($self) = @_; 471 &as_string
407
408# if (my $rmp = $self->{random}) {
409# # todo: be more intelligent about this
410# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
411# } else {
412 $self->as_string
413# }
414} 472}
415 473
416# escape the /'s in the path 474# escape the /'s in the path
417sub _escaped_path { 475sub _escaped_path {
418 # ∕ is U+2215
419 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
420 $path 477 $path
421} 478}
422 479
423# the original (read-only) location 480# the original (read-only) location
424sub load_path { 481sub load_path {
434 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path 491 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
435 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} 492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
436 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
437} 494}
438 495
439# the unique path, might be eq to save_path 496# the unique path, undef == no special unique path
440sub uniq_path { 497sub uniq_path {
441 my ($self) = @_; 498 my ($self) = @_;
442 499
443 $self->{user_rel} || $self->{random}
444 ? undef
445 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
446}
447
448# return random map parameters, or undef
449sub random_map_params {
450 my ($self) = @_;
451
452 $self->{random}
453} 501}
454 502
455# this is somewhat ugly, but style maps do need special treatment 503# this is somewhat ugly, but style maps do need special treatment
456sub is_style_map { 504sub is_style_map {
457 $_[0]{path} =~ m{^/styles/} 505 $_[0]{path} =~ m{^/styles/}
506}
507
508sub load_orig {
509 my ($self) = @_;
510
511 &cf::map::load_map_header ($self->load_path)
512}
513
514sub load_temp {
515 my ($self) = @_;
516
517 &cf::map::load_map_header ($self->save_path)
458} 518}
459 519
460package cf; 520package cf;
461 521
462############################################################################# 522#############################################################################
912=cut 972=cut
913 973
914sub register_extcmd { 974sub register_extcmd {
915 my ($name, $cb) = @_; 975 my ($name, $cb) = @_;
916 976
917 my $caller = caller;
918 #warn "registering extcmd '$name' to '$caller'";
919
920 $EXTCMD{$name} = [$cb, $caller]; 977 $EXTCMD{$name} = $cb;
921} 978}
922 979
923cf::player->attach ( 980cf::player->attach (
924 on_command => sub { 981 on_command => sub {
925 my ($pl, $name, $params) = @_; 982 my ($pl, $name, $params) = @_;
938 995
939 my $msg = eval { from_json $buf }; 996 my $msg = eval { from_json $buf };
940 997
941 if (ref $msg) { 998 if (ref $msg) {
942 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 999 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
943 if (my %reply = $cb->[0]->($pl, $msg)) { 1000 if (my %reply = $cb->($pl, $msg)) {
944 $pl->ext_reply ($msg->{msgid}, %reply); 1001 $pl->ext_reply ($msg->{msgid}, %reply);
945 } 1002 }
946 } 1003 }
947 } else { 1004 } else {
948 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1005 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
950 1007
951 cf::override; 1008 cf::override;
952 }, 1009 },
953); 1010);
954 1011
955sub register {
956 my ($base, $pkg) = @_;
957
958 #TODO
959}
960
961sub load_extension { 1012sub load_extension {
962 my ($path) = @_; 1013 my ($path) = @_;
963 1014
964 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1015 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
965 my $base = $1; 1016 my $base = $1;
966 my $pkg = $1; 1017 my $pkg = $1;
967 $pkg =~ s/[^[:word:]]/_/g; 1018 $pkg =~ s/[^[:word:]]/_/g;
968 $pkg = "ext::$pkg"; 1019 $pkg = "ext::$pkg";
969 1020
970 warn "loading '$path' into '$pkg'\n"; 1021 warn "... loading '$path' into '$pkg'\n";
971 1022
972 open my $fh, "<:utf8", $path 1023 open my $fh, "<:utf8", $path
973 or die "$path: $!"; 1024 or die "$path: $!";
974 1025
975 my $source = 1026 my $source =
980 1031
981 eval $source 1032 eval $source
982 or die $@ ? "$path: $@\n" 1033 or die $@ ? "$path: $@\n"
983 : "extension disabled.\n"; 1034 : "extension disabled.\n";
984 1035
985 push @exts, $pkg; 1036 push @EXTS, $pkg;
986 $ext_pkg{$base} = $pkg;
987
988# no strict 'refs';
989# @{"$pkg\::ISA"} = ext::;
990
991 register $base, $pkg;
992}
993
994sub unload_extension {
995 my ($pkg) = @_;
996
997 warn "removing extension $pkg\n";
998
999 # remove hooks
1000 #TODO
1001# for my $idx (0 .. $#PLUGIN_EVENT) {
1002# delete $hook[$idx]{$pkg};
1003# }
1004
1005 # remove commands
1006 for my $name (keys %COMMAND) {
1007 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1008
1009 if (@cb) {
1010 $COMMAND{$name} = \@cb;
1011 } else {
1012 delete $COMMAND{$name};
1013 }
1014 }
1015
1016 # remove extcmds
1017 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1018 delete $EXTCMD{$name};
1019 }
1020
1021 if (my $cb = $pkg->can ("unload")) {
1022 eval {
1023 $cb->($pkg);
1024 1
1025 } or warn "$pkg unloaded, but with errors: $@";
1026 }
1027
1028 Symbol::delete_package $pkg;
1029} 1037}
1030 1038
1031sub load_extensions { 1039sub load_extensions {
1032 for my $ext (<$LIBDIR/*.ext>) { 1040 for my $ext (<$LIBDIR/*.ext>) {
1033 next unless -r $ext; 1041 next unless -r $ext;
1051}; 1059};
1052 1060
1053cf::map->attach (prio => -10000, package => cf::mapsupport::); 1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1054 1062
1055############################################################################# 1063#############################################################################
1056# load/save perl data associated with player->ob objects
1057
1058sub all_objects(@) {
1059 @_, map all_objects ($_->inv), @_
1060}
1061
1062# TODO: compatibility cruft, remove when no longer needed
1063cf::player->attach (
1064 on_load => sub {
1065 my ($pl, $path) = @_;
1066
1067 for my $o (all_objects $pl->ob) {
1068 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1069 $o->set_ob_key_value ("_perl_data");
1070
1071 %$o = %{ Storable::thaw pack "H*", $value };
1072 }
1073 }
1074 },
1075);
1076
1077#############################################################################
1078 1064
1079=head2 CORE EXTENSIONS 1065=head2 CORE EXTENSIONS
1080 1066
1081Functions and methods that extend core crossfire objects. 1067Functions and methods that extend core crossfire objects.
1082 1068
1069=cut
1070
1071package cf::player;
1072
1073use Coro::AIO;
1074
1083=head3 cf::player 1075=head3 cf::player
1084 1076
1085=over 4 1077=over 4
1086 1078
1087=item cf::player::exists $login 1079=item cf::player::find $login
1088 1080
1089Returns true when the given account exists. 1081Returns the given player object, loading it if necessary (might block).
1090 1082
1091=cut 1083=cut
1092 1084
1093sub cf::player::exists($) { 1085sub playerdir($) {
1094 cf::player::find $_[0] 1086 cf::localdir
1095 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1087 . "/"
1088 . cf::playerdir
1089 . "/"
1090 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1091}
1092
1093sub path($) {
1094 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1095
1096 (playerdir $login) . "/$login.pl"
1097}
1098
1099sub find_active($) {
1100 $cf::PLAYER{$_[0]}
1101 and $cf::PLAYER{$_[0]}->active
1102 and $cf::PLAYER{$_[0]}
1103}
1104
1105sub exists($) {
1106 my ($login) = @_;
1107
1108 $cf::PLAYER{$login}
1109 or cf::sync_job { !aio_stat $login }
1110}
1111
1112sub find($) {
1113 return $cf::PLAYER{$_[0]} || do {
1114 my $login = $_[0];
1115
1116 my $guard = cf::lock_acquire "user_find:$login";
1117
1118 $cf::PLAYER{$_[0]} || do {
1119 my $pl = load_pl path $login
1120 or return;
1121 $cf::PLAYER{$login} = $pl
1122 }
1123 }
1124}
1125
1126sub save($) {
1127 my ($pl) = @_;
1128
1129 return if $pl->{deny_save};
1130
1131 my $path = path $pl;
1132 my $guard = cf::lock_acquire "user_save:$path";
1133
1134 return if $pl->{deny_save};
1135
1136 aio_mkdir playerdir $pl, 0770;
1137 $pl->{last_save} = $cf::RUNTIME;
1138
1139 $pl->save_pl ($path);
1140 Coro::cede;
1141}
1142
1143sub new($) {
1144 my ($login) = @_;
1145
1146 my $self = create;
1147
1148 $self->ob->name ($login);
1149 $self->{deny_save} = 1;
1150
1151 $cf::PLAYER{$login} = $self;
1152
1153 $self
1154}
1155
1156=item $pl->quit_character
1157
1158Nukes the player without looking back. If logged in, the connection will
1159be destroyed. May block for a long time.
1160
1161=cut
1162
1163sub quit_character {
1164 my ($pl) = @_;
1165
1166 $pl->{deny_save} = 1;
1167 $pl->password ("*"); # this should lock out the player until we nuked the dir
1168
1169 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1170 $pl->deactivate;
1171 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1172 $pl->ns->destroy if $pl->ns;
1173
1174 my $path = playerdir $pl;
1175 my $temp = "$path~$cf::RUNTIME~deleting~";
1176 aio_rename $path, $temp;
1177 delete $cf::PLAYER{$pl->ob->name};
1178 $pl->destroy;
1179 IO::AIO::aio_rmtree $temp;
1180}
1181
1182=item cf::player::list_logins
1183
1184Returns am arrayref of all valid playernames in the system, can take a
1185while and may block, so not sync_job-capable, ever.
1186
1187=cut
1188
1189sub list_logins {
1190 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1191 or return [];
1192
1193 my @logins;
1194
1195 for my $login (@$dirs) {
1196 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1197 aio_read $fh, 0, 512, my $buf, 0 or next;
1198 $buf !~ /^password -------------$/m or next; # official not-valid tag
1199
1200 utf8::decode $login;
1201 push @logins, $login;
1202 }
1203
1204 \@logins
1205}
1206
1207=item $player->maps
1208
1209Returns an arrayref of cf::path's of all maps that are private for this
1210player. May block.
1211
1212=cut
1213
1214sub maps($) {
1215 my ($pl) = @_;
1216
1217 my $files = aio_readdir playerdir $pl
1218 or return;
1219
1220 my @paths;
1221
1222 for (@$files) {
1223 utf8::decode $_;
1224 next if /\.(?:pl|pst)$/;
1225 next unless /^$PATH_SEP/o;
1226
1227 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1228 }
1229
1230 \@paths
1096} 1231}
1097 1232
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1233=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1234
1100Sends an ext reply to the player. 1235Sends an ext reply to the player.
1101 1236
1102=cut 1237=cut
1103 1238
1104sub cf::player::ext_reply($$$%) { 1239sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1240 my ($self, $id, %msg) = @_;
1106 1241
1107 $msg{msgid} = $id; 1242 $msg{msgid} = $id;
1108 1243
1109 $self->send ("ext " . to_json \%msg); 1244 $self->send ("ext " . cf::to_json \%msg);
1110} 1245}
1246
1247package cf;
1111 1248
1112=back 1249=back
1113 1250
1114 1251
1115=head3 cf::map 1252=head3 cf::map
1152 1289
1153 $_->change_map_light ($change) 1290 $_->change_map_light ($change)
1154 for grep $_->outdoor, values %cf::MAP; 1291 for grep $_->outdoor, values %cf::MAP;
1155} 1292}
1156 1293
1157sub try_load_header($) { 1294sub load_map_header($) {
1158 my ($path) = @_; 1295 my ($path) = @_;
1159 1296
1160 utf8::encode $path; 1297 utf8::encode $path;
1161 aio_open $path, O_RDONLY, 0 1298 aio_open $path, O_RDONLY, 0
1162 or return; 1299 or return;
1163 1300
1164 my $map = cf::map::new 1301 my $map = cf::map::new
1165 or return; 1302 or return;
1166 1303
1167 # for better error messages only, will be overwritten 1304 # for better error messages only, will be overwritten later
1168 $map->path ($path); 1305 $map->path ($path);
1169 1306
1170 $map->load_header ($path) 1307 $map->load_header ($path)
1171 or return; 1308 or return;
1172 1309
1188 1325
1189 $cf::MAP{$key} || do { 1326 $cf::MAP{$key} || do {
1190 my $guard = cf::lock_acquire "map_find:$key"; 1327 my $guard = cf::lock_acquire "map_find:$key";
1191 1328
1192 # do it the slow way 1329 # do it the slow way
1193 my $map = try_load_header $path->save_path; 1330 my $map = $path->load_temp;
1194 1331
1195 Coro::cede; 1332 Coro::cede;
1196 1333
1197 if ($map) { 1334 if ($map) {
1198 $map->last_access ((delete $map->{last_access}) 1335 $map->last_access ((delete $map->{last_access})
1199 || $cf::RUNTIME); #d# 1336 || $cf::RUNTIME); #d#
1200 # safety 1337 # safety
1201 $map->{instantiate_time} = $cf::RUNTIME 1338 $map->{instantiate_time} = $cf::RUNTIME
1202 if $map->{instantiate_time} > $cf::RUNTIME; 1339 if $map->{instantiate_time} > $cf::RUNTIME;
1203 } else { 1340 } else {
1204 if (my $rmp = $path->random_map_params) { 1341 $map = $path->load_orig
1205 $map = generate_random_map $key, $rmp;
1206 } else {
1207 $map = try_load_header $path->load_path;
1208 }
1209
1210 $map or return; 1342 or return;
1211 1343
1212 $map->{load_original} = 1; 1344 $map->{load_original} = 1;
1213 $map->{instantiate_time} = $cf::RUNTIME; 1345 $map->{instantiate_time} = $cf::RUNTIME;
1214 $map->last_access ($cf::RUNTIME); 1346 $map->last_access ($cf::RUNTIME);
1215 $map->instantiate; 1347 $map->instantiate;
1281 Coro::cede; 1413 Coro::cede;
1282 1414
1283 $self->in_memory (cf::MAP_IN_MEMORY); 1415 $self->in_memory (cf::MAP_IN_MEMORY);
1284} 1416}
1285 1417
1418# find and load all maps in the 3x3 area around a map
1419sub load_diag {
1420 my ($map) = @_;
1421
1422 my @diag; # diagonal neighbours
1423
1424 for (0 .. 3) {
1425 my $neigh = $map->tile_path ($_)
1426 or next;
1427 $neigh = find $neigh, $map
1428 or next;
1429 $neigh->load;
1430
1431 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1432 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1433 }
1434
1435 for (@diag) {
1436 my $neigh = find @$_
1437 or next;
1438 $neigh->load;
1439 }
1440}
1441
1286sub find_sync { 1442sub find_sync {
1287 my ($path, $origin) = @_; 1443 my ($path, $origin) = @_;
1288 1444
1289 cf::sync_job { cf::map::find $path, $origin } 1445 cf::sync_job { find $path, $origin }
1290} 1446}
1291 1447
1292sub do_load_sync { 1448sub do_load_sync {
1293 my ($map) = @_; 1449 my ($map) = @_;
1294 1450
1295 cf::sync_job { $map->load }; 1451 cf::sync_job { $map->load };
1296} 1452}
1297 1453
1454our %MAP_PREFETCH;
1455our $MAP_PREFETCHER = Coro::async {
1456 while () {
1457 while (%MAP_PREFETCH) {
1458 my $key = each %MAP_PREFETCH
1459 or next;
1460 my $path = delete $MAP_PREFETCH{$key};
1461
1462 my $map = find $path
1463 or next;
1464 $map->load;
1465 }
1466 Coro::schedule;
1467 }
1468};
1469
1470sub find_async {
1471 my ($path, $origin) = @_;
1472
1473 $path = new cf::path $path, $origin && $origin->path;
1474 my $key = $path->as_string;
1475
1476 if (my $map = $cf::MAP{$key}) {
1477 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1478 }
1479
1480 $MAP_PREFETCH{$key} = $path;
1481 $MAP_PREFETCHER->ready;
1482
1483 ()
1484}
1485
1298sub save { 1486sub save {
1299 my ($self) = @_; 1487 my ($self) = @_;
1300 1488
1489 my $lock = cf::lock_acquire "map_data:" . $self->path;
1490
1301 $self->{last_save} = $cf::RUNTIME; 1491 $self->{last_save} = $cf::RUNTIME;
1302 1492
1303 return unless $self->dirty; 1493 return unless $self->dirty;
1304 1494
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1495 my $save = $self->{path}->save_path; utf8::encode $save;
1308 $self->{load_path} = $save; 1498 $self->{load_path} = $save;
1309 1499
1310 return if $self->{deny_save}; 1500 return if $self->{deny_save};
1311 1501
1312 local $self->{last_access} = $self->last_access;#d# 1502 local $self->{last_access} = $self->last_access;#d#
1503
1504 cf::async {
1505 $_->contr->save for $self->players;
1506 };
1313 1507
1314 if ($uniq) { 1508 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1510 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1511 } else {
1323 my ($self) = @_; 1517 my ($self) = @_;
1324 1518
1325 # save first because save cedes 1519 # save first because save cedes
1326 $self->save; 1520 $self->save;
1327 1521
1522 my $lock = cf::lock_acquire "map_data:" . $self->path;
1523
1328 return if $self->players; 1524 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1525 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1331 1527
1332 $self->clear; 1528 $self->clear;
1374} 1570}
1375 1571
1376sub reset { 1572sub reset {
1377 my ($self) = @_; 1573 my ($self) = @_;
1378 1574
1575 my $lock = cf::lock_acquire "map_data:" . $self->path;
1576
1379 return if $self->players; 1577 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1578 return if $self->{path}{user_rel};#d#
1381 1579
1382 warn "resetting map ", $self->path;#d# 1580 warn "resetting map ", $self->path;#d#
1383 1581
1408 } 1606 }
1409 1607
1410 $map 1608 $map
1411} 1609}
1412 1610
1413sub emergency_save { 1611=item cf::map::unique_maps
1414 my $freeze_guard = cf::freeze_mainloop;
1415 1612
1416 warn "enter emergency map save\n"; 1613Returns an arrayref of cf::path's of all shared maps that have
1614instantiated unique items. May block.
1417 1615
1418 cf::sync_job { 1616=cut
1419 warn "begin emergency map save\n"; 1617
1420 $_->save for values %cf::MAP; 1618sub unique_maps() {
1619 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1620 or return;
1621
1622 my @paths;
1623
1624 for (@$files) {
1625 utf8::decode $_;
1626 next if /\.pst$/;
1627 next unless /^$PATH_SEP/o;
1628
1629 push @paths, new cf::path $_;
1421 }; 1630 }
1422 1631
1423 warn "end emergency map save\n"; 1632 \@paths
1424} 1633}
1425 1634
1426package cf; 1635package cf;
1427 1636
1428=back 1637=back
1429 1638
1639=head3 cf::object
1640
1641=cut
1642
1643package cf::object;
1644
1645=over 4
1646
1647=item $ob->inv_recursive
1648
1649Returns the inventory of the object _and_ their inventories, recursively.
1650
1651=cut
1652
1653sub inv_recursive_;
1654sub inv_recursive_ {
1655 map { $_, inv_recursive_ $_->inv } @_
1656}
1657
1658sub inv_recursive {
1659 inv_recursive_ inv $_[0]
1660}
1661
1662package cf;
1663
1664=back
1430 1665
1431=head3 cf::object::player 1666=head3 cf::object::player
1432 1667
1433=over 4 1668=over 4
1434 1669
1526 # use -1 or undef as default coordinates, not 0, 0 1761 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1762 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1763 if $x <=0 && $y <= 0;
1529 1764
1530 $map->load; 1765 $map->load;
1766 $map->load_diag;
1531 1767
1768 return unless $self->contr->active;
1532 $self->activate_recursive; 1769 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1770 $self->enter_map ($map, $x, $y);
1534} 1771}
1535 1772
1536cf::player->attach ( 1773cf::player->attach (
1549 1786
1550 # try to abort aborted map switching on player login :) 1787 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1788 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1789 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1790 $pl->ob->enter_link;
1554 cf::async { 1791 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1792 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1793 # and this sleep increases chances of the player not ending up in scorn
1794 $pl->ob->reply (undef,
1795 "There was an internal problem at your last logout, "
1796 . "the server will try to bring you to your intended destination in a second.",
1797 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1798 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1799 $pl->ob->leave_link;
1559 }; 1800 })->prio (2);
1560 } 1801 }
1561 }, 1802 },
1562); 1803);
1563 1804
1564=item $player_object->goto_map ($path, $x, $y) 1805=item $player_object->goto ($path, $x, $y)
1565 1806
1566=cut 1807=cut
1567 1808
1568sub cf::object::player::goto_map { 1809sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1810 my ($self, $path, $x, $y) = @_;
1570 1811
1812 $path = new cf::path $path;
1813
1571 $self->enter_link; 1814 $self->enter_link;
1572 1815
1573 (cf::async { 1816 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find $path->as_string; 1817 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1818 $map = $map->customise_for ($self) if $map;
1578 1819
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1820# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1821# if $map;
1581 1822
1582 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1823 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1583 1824
1584 $self->leave_link ($map, $x, $y); 1825 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1826 })->prio (1);
1586} 1827}
1587 1828
1640 1881
1641 return unless $self->type == cf::PLAYER; 1882 return unless $self->type == cf::PLAYER;
1642 1883
1643 $self->enter_link; 1884 $self->enter_link;
1644 1885
1645 (cf::async { 1886 (async {
1646 $self->deactivate_recursive; # just to be sure 1887 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1888 unless (eval {
1648 prepare_random_map $exit 1889 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1890 if $exit->slaying eq "/!";
1650 1891
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1892 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1894
1654 1; 1895 1;
1655 }) { 1896 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1897 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1898 . "I'll try to bring you back to the map you were before. "
1658 . "Please report this to the dungeon master", 1899 . "Please report this to the dungeon master!",
1659 cf::NDI_UNIQUE | cf::NDI_RED); 1900 cf::NDI_UNIQUE | cf::NDI_RED);
1660 1901
1661 warn "ERROR in enter_exit: $@"; 1902 warn "ERROR in enter_exit: $@";
1662 $self->leave_link; 1903 $self->leave_link;
1663 } 1904 }
1731 } 1972 }
1732 } 1973 }
1733 }, 1974 },
1734); 1975);
1735 1976
1736=item $client->coro (\&cb) 1977=item $client->async (\&cb)
1737 1978
1738Create a new coroutine, running the specified callback. The coroutine will 1979Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1980be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1981or loss of connection).
1741 1982
1742=cut 1983=cut
1743 1984
1744sub cf::client::coro { 1985sub cf::client::async {
1745 my ($self, $cb) = @_; 1986 my ($self, $cb) = @_;
1746 1987
1747 my $coro = &cf::async ($cb); 1988 my $coro = &Coro::async ($cb);
1748 1989
1749 $coro->on_destroy (sub { 1990 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1991 delete $self->{_coro}{$coro+0};
1751 }); 1992 });
1752 1993
1990 local $/; 2231 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2232 *CFG = YAML::Syck::Load <$fh>;
1992 2233
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2234 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2235
2236 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2237 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2238
1995 if (exists $CFG{mlockall}) { 2239 if (exists $CFG{mlockall}) {
1996 eval { 2240 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2241 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2242 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2243 };
2000 warn $@ if $@; 2244 warn $@ if $@;
2001 } 2245 }
2002} 2246}
2003 2247
2004sub main { 2248sub main {
2005 # we must not ever block the main coroutine 2249 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2250 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2251 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2252 async { Event::one_event };
2010 })->();
2011 }; 2253 };
2012 2254
2013 cfg_load; 2255 cfg_load;
2014 db_load; 2256 db_load;
2015 load_extensions; 2257 load_extensions;
2016 Event::loop; 2258 Event::loop;
2017} 2259}
2018 2260
2019############################################################################# 2261#############################################################################
2020# initialisation 2262# initialisation and cleanup
2263
2264# install some emergency cleanup handlers
2265BEGIN {
2266 for my $signal (qw(INT HUP TERM)) {
2267 Event->signal (
2268 data => WF_AUTOCANCEL,
2269 signal => $signal,
2270 cb => sub {
2271 cf::cleanup "SIG$signal";
2272 },
2273 );
2274 }
2275}
2276
2277sub emergency_save() {
2278 my $freeze_guard = cf::freeze_mainloop;
2279
2280 warn "enter emergency perl save\n";
2281
2282 cf::sync_job {
2283 # use a peculiar iteration method to avoid tripping on perl
2284 # refcount bugs in for. also avoids problems with players
2285 # and maps saved/Destroyed asynchronously.
2286 warn "begin emergency player save\n";
2287 for my $login (keys %cf::PLAYER) {
2288 my $pl = $cf::PLAYER{$login} or next;
2289 $pl->valid or next;
2290 $pl->save;
2291 }
2292 warn "end emergency player save\n";
2293
2294 warn "begin emergency map save\n";
2295 for my $path (keys %cf::MAP) {
2296 my $map = $cf::MAP{$path} or next;
2297 $map->valid or next;
2298 $map->save;
2299 }
2300 warn "end emergency map save\n";
2301 };
2302
2303 warn "leave emergency perl save\n";
2304}
2021 2305
2022sub reload() { 2306sub reload() {
2023 # can/must only be called in main 2307 # can/must only be called in main
2024 if ($Coro::current != $Coro::main) { 2308 if ($Coro::current != $Coro::main) {
2025 warn "can only reload from main coroutine\n"; 2309 warn "can only reload from main coroutine\n";
2026 return; 2310 return;
2027 } 2311 }
2028 2312
2029 warn "reloading..."; 2313 warn "reloading...";
2030 2314
2315 warn "freezing server";
2031 my $guard = freeze_mainloop; 2316 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2317 cf::emergency_save;
2033 2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322
2034 eval { 2323 eval {
2035 # if anything goes wrong in here, we should simply crash as we already saved 2324 # if anything goes wrong in here, we should simply crash as we already saved
2036 2325
2037 # cancel all watchers 2326 warn "cancel all watchers";
2038 for (Event::all_watchers) { 2327 for (Event::all_watchers) {
2039 $_->cancel if $_->data & WF_AUTOCANCEL; 2328 $_->cancel if $_->data & WF_AUTOCANCEL;
2040 } 2329 }
2041 2330
2042 # cancel all extension coros 2331 warn "cancel all extension coros";
2043 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2044 %EXT_CORO = (); 2333 %EXT_CORO = ();
2045 2334
2335 warn "remove commands";
2336 %COMMAND = ();
2337
2338 warn "remove ext commands";
2339 %EXTCMD = ();
2340
2046 # unload all extensions 2341 warn "unload/nuke all extensions";
2047 for (@exts) { 2342 for my $pkg (@EXTS) {
2048 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2049 unload_extension $_; 2344
2345 if (my $cb = $pkg->can ("unload")) {
2346 eval {
2347 $cb->($pkg);
2348 1
2349 } or warn "$pkg unloaded, but with errors: $@";
2050 } 2350 }
2051 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2052 # unload all modules loaded from $LIBDIR 2356 warn "unload all perl modules loaded from $LIBDIR";
2053 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2054 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2055 2359
2056 warn "removing <$k>"; 2360 warn "removing <$k>";
2057 delete $INC{$k}; 2361 delete $INC{$k};
2064 } 2368 }
2065 2369
2066 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2067 } 2371 }
2068 2372
2069 # sync database to disk
2070 cf::db_sync;
2071 IO::AIO::flush;
2072
2073 # get rid of safe::, as good as possible 2373 warn "get rid of safe::, as good as possible";
2074 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2075 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2375 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2076 2376
2077 # remove register_script_function callbacks
2078 # TODO
2079
2080 # unload cf.pm "a bit" 2377 warn "unload cf.pm \"a bit\"";
2081 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2082 2379
2083 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2084 # and global variables created in xs 2381 # and global variables created in xs
2085 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2086 2383
2087 # reload cf.pm
2088 warn "reloading cf.pm"; 2384 warn "reloading cf.pm";
2089 require cf; 2385 require cf;
2090 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2091 2387
2092 # load config and database again 2388 warn "load config and database again";
2093 cf::cfg_load; 2389 cf::cfg_load;
2094 cf::db_load; 2390 cf::db_load;
2095 2391
2096 # load extensions
2097 warn "load extensions"; 2392 warn "load extensions";
2098 cf::load_extensions; 2393 cf::load_extensions;
2099 2394
2100 # reattach attachments to objects 2395 warn "reattach attachments to objects/players";
2101 warn "reattach";
2102 _global_reattach; 2396 _global_reattach;
2397 warn "reattach attachments to maps";
2398 reattach $_ for values %MAP;
2103 }; 2399 };
2104 2400
2105 if ($@) { 2401 if ($@) {
2106 warn $@; 2402 warn $@;
2107 warn "error while reloading, exiting."; 2403 warn "error while reloading, exiting.";
2108 exit 1; 2404 exit 1;
2109 } 2405 }
2110 2406
2111 warn "reloaded successfully"; 2407 warn "reloaded";
2112}; 2408};
2113 2409
2114############################################################################# 2410#############################################################################
2115 2411
2116unless ($LINK_MAP) { 2412unless ($LINK_MAP) {
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2421
2126 # dirty hack because... archetypes are not yet loaded 2422 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2423 Event->timer (
2128 after => 2, 2424 after => 10,
2129 cb => sub { 2425 cb => sub {
2130 $_[0]->w->cancel; 2426 $_[0]->w->cancel;
2131 2427
2132 # provide some exits "home" 2428 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2429 my $exit = cf::object::new "exit";
2151 $LINK_MAP->{deny_save} = 1; 2447 $LINK_MAP->{deny_save} = 1;
2152 $LINK_MAP->{deny_reset} = 1; 2448 $LINK_MAP->{deny_reset} = 1;
2153 2449
2154 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2155} 2451}
2156
2157register "<global>", __PACKAGE__;
2158 2452
2159register_command "reload" => sub { 2453register_command "reload" => sub {
2160 my ($who, $arg) = @_; 2454 my ($who, $arg) = @_;
2161 2455
2162 if ($who->flag (FLAG_WIZ)) { 2456 if ($who->flag (FLAG_WIZ)) {
2175 data => WF_AUTOCANCEL, 2469 data => WF_AUTOCANCEL,
2176 cb => sub { 2470 cb => sub {
2177 cf::server_tick; # one server iteration 2471 cf::server_tick; # one server iteration
2178 $RUNTIME += $TICK; 2472 $RUNTIME += $TICK;
2179 $NEXT_TICK += $TICK; 2473 $NEXT_TICK += $TICK;
2474
2475 $WAIT_FOR_TICK->broadcast;
2476 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2180 2477
2181 # if we are delayed by four ticks or more, skip them all 2478 # if we are delayed by four ticks or more, skip them all
2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2183 2480
2184 $TICK_WATCHER->at ($NEXT_TICK); 2481 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines