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.134 by root, Thu Jan 4 17:28:49 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
179sub to_json($) { 211sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 212 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 213 JSON::Syck::Dump $_[0]
182} 214}
183 215
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string 216=item cf::lock_wait $string
207 217
208Wait until the given lock is available. See cf::lock_acquire. 218Wait until the given lock is available. See cf::lock_acquire.
209 219
210=item my $lock = cf::lock_acquire $string 220=item my $lock = cf::lock_acquire $string
211 221
212Wait until the given lock is available and then acquires it and returns 222Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope, 223a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically 224for example when the coroutine gets canceled), the lock is automatically
215returned. 225returned.
216 226
217Lock names should begin with a unique identifier (for example, cf::map::find 227Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load). 228uses map_find and cf::map::load uses map_load).
237 # wait, to be sure we are not locked 247 # wait, to be sure we are not locked
238 lock_wait $key; 248 lock_wait $key;
239 249
240 $LOCK{$key} = []; 250 $LOCK{$key} = [];
241 251
242 cf::guard { 252 Coro::guard {
243 # wake up all waiters, to be on the safe side 253 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} }; 254 $_->ready for @{ delete $LOCK{$key} };
245 } 255 }
246} 256}
247 257
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop { 258sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 259 return unless $TICK_WATCHER->is_active;
266 260
267 my $guard = guard { $TICK_WATCHER->start }; 261 my $guard = Coro::guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop; 262 $TICK_WATCHER->stop;
269 $guard 263 $guard
270} 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 }
271 275
272=item cf::sync_job { BLOCK } 276=item cf::sync_job { BLOCK }
273 277
274The design of crossfire+ requires that the main coro ($Coro::main) is 278The design of crossfire+ requires that the main coro ($Coro::main) is
275always able to handle events or runnable, as crossfire+ is only partly 279always able to handle events or runnable, as crossfire+ is only partly
294 my $freeze_guard = freeze_mainloop; 298 my $freeze_guard = freeze_mainloop;
295 299
296 my $busy = 1; 300 my $busy = 1;
297 my @res; 301 my @res;
298 302
299 (Coro::async { 303 (async {
300 @res = eval { $job->() }; 304 @res = eval { $job->() };
301 warn $@ if $@; 305 warn $@ if $@;
302 undef $busy; 306 undef $busy;
303 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
304 308
305 while ($busy) { 309 while ($busy) {
306 Coro::cede_notself; 310 Coro::cede or Event::one_event;
307 Event::one_event unless Coro::nready;
308 } 311 }
309 312
310 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
311 } else { 314 } else {
312 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
313 316
314 $job->() 317 $job->()
315 } 318 }
316} 319}
317 320
318=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
319 322
320Creates and returns a new coro. This coro is automcatially being canceled 323Like async, but this coro is automatically being canceled when the
321when the extension calling this is being unloaded. 324extension calling this is being unloaded.
322 325
323=cut 326=cut
324 327
325sub coro(&) { 328sub async_ext(&) {
326 my $cb = shift; 329 my $cb = shift;
327 330
328 my $coro = &cf::async ($cb); 331 my $coro = &Coro::async ($cb);
329 332
330 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
331 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
332 }); 335 });
333 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
363 366
364############################################################################# 367#############################################################################
365 368
366package cf::path; 369package cf::path;
367 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
368sub new { 383sub new {
369 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
370 385
371 $path = $path->as_string if ref $path; 386 return $path if ref $path;
372 387
373 my $self = bless { }, $class; 388 my $self = {};
374 389
375 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
376 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
377 # ?random/... random maps 392 # ?random/... random maps
378 # /! non-realised random map exit 393 # /! non-realised random map exit
379 # /... normal maps 394 # /... normal maps
380 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
381 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
382 397
398 $path =~ s/$PATH_SEP/\//go;
399
383 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
384 # fine as it is 401 # fine as it is
385 } elsif ($path =~ s{^\?random/}{}) {
386 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
387 $self->{random} = cf::from_json $data;
388 } else { 402 } else {
389 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
390 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
391 406
392 if (defined $1) { 407 if (defined $1) {
393 $self->{user} = $1; 408 $self->{user} = $1;
394 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
395 $self->{user} = $1; 410 $self->{user} = $1;
396 } else { 411 } else {
397 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
398 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
399 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
400 # already absolute 422 # already absolute
401 } else { 423 } else {
424 # relative
402 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
403 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
404 } 427 }
405 428
406 for ($path) { 429 for ($path) {
409 } 432 }
410 } 433 }
411 434
412 $self->{path} = $path; 435 $self->{path} = $path;
413 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
414 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
415} 458}
416 459
417# the name / primary key / in-game path 460# the name / primary key / in-game path
418sub as_string { 461sub as_string {
419 my ($self) = @_; 462 my ($self) = @_;
420 463
421 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
422 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
423 : $self->{path} 466 : $self->{path}
424} 467}
425 468
426# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
427sub visible_name { 470sub visible_name {
428 my ($self) = @_; 471 &as_string
429
430# if (my $rmp = $self->{random}) {
431# # todo: be more intelligent about this
432# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
433# } else {
434 $self->as_string
435# }
436} 472}
437 473
438# escape the /'s in the path 474# escape the /'s in the path
439sub _escaped_path { 475sub _escaped_path {
440 # ∕ is U+2215
441 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
442 $path 477 $path
443} 478}
444 479
445# the original (read-only) location 480# the original (read-only) location
446sub load_path { 481sub load_path {
456 $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
457 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path} 492 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
458 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 493 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
459} 494}
460 495
461# the unique path, might be eq to save_path 496# the unique path, undef == no special unique path
462sub uniq_path { 497sub uniq_path {
463 my ($self) = @_; 498 my ($self) = @_;
464 499
465 $self->{user_rel} || $self->{random}
466 ? undef
467 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 500 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
468}
469
470# return random map parameters, or undef
471sub random_map_params {
472 my ($self) = @_;
473
474 $self->{random}
475} 501}
476 502
477# this is somewhat ugly, but style maps do need special treatment 503# this is somewhat ugly, but style maps do need special treatment
478sub is_style_map { 504sub is_style_map {
479 $_[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)
480} 518}
481 519
482package cf; 520package cf;
483 521
484############################################################################# 522#############################################################################
934=cut 972=cut
935 973
936sub register_extcmd { 974sub register_extcmd {
937 my ($name, $cb) = @_; 975 my ($name, $cb) = @_;
938 976
939 my $caller = caller;
940 #warn "registering extcmd '$name' to '$caller'";
941
942 $EXTCMD{$name} = [$cb, $caller]; 977 $EXTCMD{$name} = $cb;
943} 978}
944 979
945cf::player->attach ( 980cf::player->attach (
946 on_command => sub { 981 on_command => sub {
947 my ($pl, $name, $params) = @_; 982 my ($pl, $name, $params) = @_;
960 995
961 my $msg = eval { from_json $buf }; 996 my $msg = eval { from_json $buf };
962 997
963 if (ref $msg) { 998 if (ref $msg) {
964 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 999 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
965 if (my %reply = $cb->[0]->($pl, $msg)) { 1000 if (my %reply = $cb->($pl, $msg)) {
966 $pl->ext_reply ($msg->{msgid}, %reply); 1001 $pl->ext_reply ($msg->{msgid}, %reply);
967 } 1002 }
968 } 1003 }
969 } else { 1004 } else {
970 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1005 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
972 1007
973 cf::override; 1008 cf::override;
974 }, 1009 },
975); 1010);
976 1011
977sub register {
978 my ($base, $pkg) = @_;
979
980 #TODO
981}
982
983sub load_extension { 1012sub load_extension {
984 my ($path) = @_; 1013 my ($path) = @_;
985 1014
986 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1015 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
987 my $base = $1; 1016 my $base = $1;
988 my $pkg = $1; 1017 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 1018 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 1019 $pkg = "ext::$pkg";
991 1020
992 warn "loading '$path' into '$pkg'\n"; 1021 warn "... loading '$path' into '$pkg'\n";
993 1022
994 open my $fh, "<:utf8", $path 1023 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 1024 or die "$path: $!";
996 1025
997 my $source = 1026 my $source =
1002 1031
1003 eval $source 1032 eval $source
1004 or die $@ ? "$path: $@\n" 1033 or die $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 1034 : "extension disabled.\n";
1006 1035
1007 push @exts, $pkg; 1036 push @EXTS, $pkg;
1008 $ext_pkg{$base} = $pkg;
1009
1010# no strict 'refs';
1011# @{"$pkg\::ISA"} = ext::;
1012
1013 register $base, $pkg;
1014}
1015
1016sub unload_extension {
1017 my ($pkg) = @_;
1018
1019 warn "removing extension $pkg\n";
1020
1021 # remove hooks
1022 #TODO
1023# for my $idx (0 .. $#PLUGIN_EVENT) {
1024# delete $hook[$idx]{$pkg};
1025# }
1026
1027 # remove commands
1028 for my $name (keys %COMMAND) {
1029 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1030
1031 if (@cb) {
1032 $COMMAND{$name} = \@cb;
1033 } else {
1034 delete $COMMAND{$name};
1035 }
1036 }
1037
1038 # remove extcmds
1039 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1040 delete $EXTCMD{$name};
1041 }
1042
1043 if (my $cb = $pkg->can ("unload")) {
1044 eval {
1045 $cb->($pkg);
1046 1
1047 } or warn "$pkg unloaded, but with errors: $@";
1048 }
1049
1050 Symbol::delete_package $pkg;
1051} 1037}
1052 1038
1053sub load_extensions { 1039sub load_extensions {
1054 for my $ext (<$LIBDIR/*.ext>) { 1040 for my $ext (<$LIBDIR/*.ext>) {
1055 next unless -r $ext; 1041 next unless -r $ext;
1073}; 1059};
1074 1060
1075cf::map->attach (prio => -10000, package => cf::mapsupport::); 1061cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076 1062
1077############################################################################# 1063#############################################################################
1078# load/save perl data associated with player->ob objects
1079
1080sub all_objects(@) {
1081 @_, map all_objects ($_->inv), @_
1082}
1083
1084# TODO: compatibility cruft, remove when no longer needed
1085cf::player->attach (
1086 on_load => sub {
1087 my ($pl, $path) = @_;
1088
1089 for my $o (all_objects $pl->ob) {
1090 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1091 $o->set_ob_key_value ("_perl_data");
1092
1093 %$o = %{ Storable::thaw pack "H*", $value };
1094 }
1095 }
1096 },
1097);
1098
1099#############################################################################
1100 1064
1101=head2 CORE EXTENSIONS 1065=head2 CORE EXTENSIONS
1102 1066
1103Functions and methods that extend core crossfire objects. 1067Functions and methods that extend core crossfire objects.
1104 1068
1069=cut
1070
1071package cf::player;
1072
1073use Coro::AIO;
1074
1105=head3 cf::player 1075=head3 cf::player
1106 1076
1107=over 4 1077=over 4
1108 1078
1109=item cf::player::exists $login 1079=item cf::player::find $login
1110 1080
1111Returns true when the given account exists. 1081Returns the given player object, loading it if necessary (might block).
1112 1082
1113=cut 1083=cut
1114 1084
1115sub cf::player::exists($) { 1085sub playerdir($) {
1116 cf::player::find $_[0] 1086 cf::localdir
1117 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
1118} 1231}
1119 1232
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1233=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1234
1122Sends an ext reply to the player. 1235Sends an ext reply to the player.
1123 1236
1124=cut 1237=cut
1125 1238
1126sub cf::player::ext_reply($$$%) { 1239sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1240 my ($self, $id, %msg) = @_;
1128 1241
1129 $msg{msgid} = $id; 1242 $msg{msgid} = $id;
1130 1243
1131 $self->send ("ext " . to_json \%msg); 1244 $self->send ("ext " . cf::to_json \%msg);
1132} 1245}
1246
1247package cf;
1133 1248
1134=back 1249=back
1135 1250
1136 1251
1137=head3 cf::map 1252=head3 cf::map
1174 1289
1175 $_->change_map_light ($change) 1290 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP; 1291 for grep $_->outdoor, values %cf::MAP;
1177} 1292}
1178 1293
1179sub try_load_header($) { 1294sub load_map_header($) {
1180 my ($path) = @_; 1295 my ($path) = @_;
1181 1296
1182 utf8::encode $path; 1297 utf8::encode $path;
1183 aio_open $path, O_RDONLY, 0 1298 aio_open $path, O_RDONLY, 0
1184 or return; 1299 or return;
1185 1300
1186 my $map = cf::map::new 1301 my $map = cf::map::new
1187 or return; 1302 or return;
1188 1303
1304 # for better error messages only, will be overwritten later
1305 $map->path ($path);
1306
1189 $map->load_header ($path) 1307 $map->load_header ($path)
1190 or return; 1308 or return;
1191 1309
1192 $map->{load_path} = $path; 1310 $map->{load_path} = $path;
1193 1311
1207 1325
1208 $cf::MAP{$key} || do { 1326 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key"; 1327 my $guard = cf::lock_acquire "map_find:$key";
1210 1328
1211 # do it the slow way 1329 # do it the slow way
1212 my $map = try_load_header $path->save_path; 1330 my $map = $path->load_temp;
1213 1331
1214 Coro::cede; 1332 Coro::cede;
1215 1333
1216 if ($map) { 1334 if ($map) {
1217 $map->last_access ((delete $map->{last_access}) 1335 $map->last_access ((delete $map->{last_access})
1218 || $cf::RUNTIME); #d# 1336 || $cf::RUNTIME); #d#
1219 # safety 1337 # safety
1220 $map->{instantiate_time} = $cf::RUNTIME 1338 $map->{instantiate_time} = $cf::RUNTIME
1221 if $map->{instantiate_time} > $cf::RUNTIME; 1339 if $map->{instantiate_time} > $cf::RUNTIME;
1222 } else { 1340 } else {
1223 if (my $rmp = $path->random_map_params) { 1341 $map = $path->load_orig
1224 $map = generate_random_map $key, $rmp;
1225 } else {
1226 $map = try_load_header $path->load_path;
1227 }
1228
1229 $map or return; 1342 or return;
1230 1343
1231 $map->{load_original} = 1; 1344 $map->{load_original} = 1;
1232 $map->{instantiate_time} = $cf::RUNTIME; 1345 $map->{instantiate_time} = $cf::RUNTIME;
1233 $map->last_access ($cf::RUNTIME); 1346 $map->last_access ($cf::RUNTIME);
1234 $map->instantiate; 1347 $map->instantiate;
1300 Coro::cede; 1413 Coro::cede;
1301 1414
1302 $self->in_memory (cf::MAP_IN_MEMORY); 1415 $self->in_memory (cf::MAP_IN_MEMORY);
1303} 1416}
1304 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
1305sub find_sync { 1442sub find_sync {
1306 my ($path, $origin) = @_; 1443 my ($path, $origin) = @_;
1307 1444
1308 cf::sync_job { cf::map::find $path, $origin } 1445 cf::sync_job { find $path, $origin }
1309} 1446}
1310 1447
1311sub do_load_sync { 1448sub do_load_sync {
1312 my ($map) = @_; 1449 my ($map) = @_;
1313 1450
1314 cf::sync_job { $map->load }; 1451 cf::sync_job { $map->load };
1315} 1452}
1316 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
1317sub save { 1486sub save {
1318 my ($self) = @_; 1487 my ($self) = @_;
1319 1488
1489 my $lock = cf::lock_acquire "map_data:" . $self->path;
1490
1320 $self->{last_save} = $cf::RUNTIME; 1491 $self->{last_save} = $cf::RUNTIME;
1321 1492
1322 return unless $self->dirty; 1493 return unless $self->dirty;
1323 1494
1324 my $save = $self->{path}->save_path; utf8::encode $save; 1495 my $save = $self->{path}->save_path; utf8::encode $save;
1327 $self->{load_path} = $save; 1498 $self->{load_path} = $save;
1328 1499
1329 return if $self->{deny_save}; 1500 return if $self->{deny_save};
1330 1501
1331 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 };
1332 1507
1333 if ($uniq) { 1508 if ($uniq) {
1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1509 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1335 $self->save_objects ($uniq, cf::IO_UNIQUES); 1510 $self->save_objects ($uniq, cf::IO_UNIQUES);
1336 } else { 1511 } else {
1342 my ($self) = @_; 1517 my ($self) = @_;
1343 1518
1344 # save first because save cedes 1519 # save first because save cedes
1345 $self->save; 1520 $self->save;
1346 1521
1522 my $lock = cf::lock_acquire "map_data:" . $self->path;
1523
1347 return if $self->players; 1524 return if $self->players;
1348 return if $self->in_memory != cf::MAP_IN_MEMORY; 1525 return if $self->in_memory != cf::MAP_IN_MEMORY;
1349 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1350 1527
1351 $self->clear; 1528 $self->clear;
1393} 1570}
1394 1571
1395sub reset { 1572sub reset {
1396 my ($self) = @_; 1573 my ($self) = @_;
1397 1574
1575 my $lock = cf::lock_acquire "map_data:" . $self->path;
1576
1398 return if $self->players; 1577 return if $self->players;
1399 return if $self->{path}{user_rel};#d# 1578 return if $self->{path}{user_rel};#d#
1400 1579
1401 warn "resetting map ", $self->path;#d# 1580 warn "resetting map ", $self->path;#d#
1402 1581
1427 } 1606 }
1428 1607
1429 $map 1608 $map
1430} 1609}
1431 1610
1432sub emergency_save { 1611=item cf::map::unique_maps
1433 my $freeze_guard = cf::freeze_mainloop;
1434 1612
1435 warn "enter emergency map save\n"; 1613Returns an arrayref of cf::path's of all shared maps that have
1614instantiated unique items. May block.
1436 1615
1437 cf::sync_job { 1616=cut
1438 warn "begin emergency map save\n"; 1617
1439 $_->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 $_;
1440 }; 1630 }
1441 1631
1442 warn "end emergency map save\n"; 1632 \@paths
1443} 1633}
1444 1634
1445package cf; 1635package cf;
1446 1636
1447=back 1637=back
1448 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
1449 1665
1450=head3 cf::object::player 1666=head3 cf::object::player
1451 1667
1452=over 4 1668=over 4
1453 1669
1545 # use -1 or undef as default coordinates, not 0, 0 1761 # use -1 or undef as default coordinates, not 0, 0
1546 ($x, $y) = ($map->enter_x, $map->enter_y) 1762 ($x, $y) = ($map->enter_x, $map->enter_y)
1547 if $x <=0 && $y <= 0; 1763 if $x <=0 && $y <= 0;
1548 1764
1549 $map->load; 1765 $map->load;
1766 $map->load_diag;
1550 1767
1768 return unless $self->contr->active;
1551 $self->activate_recursive; 1769 $self->activate_recursive;
1552 $self->enter_map ($map, $x, $y); 1770 $self->enter_map ($map, $x, $y);
1553} 1771}
1554 1772
1555cf::player->attach ( 1773cf::player->attach (
1568 1786
1569 # try to abort aborted map switching on player login :) 1787 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes 1788 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) { 1789 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link; 1790 $pl->ob->enter_link;
1573 cf::async { 1791 (async {
1574 # 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
1575 # 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);
1576 Coro::Timer::sleep 1; 1798 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link; 1799 $pl->ob->leave_link;
1578 }; 1800 })->prio (2);
1579 } 1801 }
1580 }, 1802 },
1581); 1803);
1582 1804
1583=item $player_object->goto_map ($path, $x, $y) 1805=item $player_object->goto ($path, $x, $y)
1584 1806
1585=cut 1807=cut
1586 1808
1587sub cf::object::player::goto_map { 1809sub cf::object::player::goto {
1588 my ($self, $path, $x, $y) = @_; 1810 my ($self, $path, $x, $y) = @_;
1589 1811
1812 $path = new cf::path $path;
1813
1590 $self->enter_link; 1814 $self->enter_link;
1591 1815
1592 (cf::async { 1816 (async {
1593 $path = new cf::path $path;
1594
1595 my $map = cf::map::find $path->as_string; 1817 my $map = cf::map::find $path->as_string;
1596 $map = $map->customise_for ($self) if $map; 1818 $map = $map->customise_for ($self) if $map;
1597 1819
1598# warn "entering ", $map->path, " at ($x, $y)\n" 1820# warn "entering ", $map->path, " at ($x, $y)\n"
1599# if $map; 1821# if $map;
1600 1822
1601 $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);
1602 1824
1603 $self->leave_link ($map, $x, $y); 1825 $self->leave_link ($map, $x, $y);
1604 })->prio (1); 1826 })->prio (1);
1605} 1827}
1606 1828
1659 1881
1660 return unless $self->type == cf::PLAYER; 1882 return unless $self->type == cf::PLAYER;
1661 1883
1662 $self->enter_link; 1884 $self->enter_link;
1663 1885
1664 (cf::async { 1886 (async {
1665 $self->deactivate_recursive; # just to be sure 1887 $self->deactivate_recursive; # just to be sure
1666 unless (eval { 1888 unless (eval {
1667 prepare_random_map $exit 1889 prepare_random_map $exit
1668 if $exit->slaying eq "/!"; 1890 if $exit->slaying eq "/!";
1669 1891
1670 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;
1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1893 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672 1894
1673 1; 1895 1;
1674 }) { 1896 }) {
1675 $self->message ("Something went wrong deep within the crossfire server. " 1897 $self->message ("Something went wrong deep within the crossfire server. "
1676 . "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. "
1677 . "Please report this to the dungeon master", 1899 . "Please report this to the dungeon master!",
1678 cf::NDI_UNIQUE | cf::NDI_RED); 1900 cf::NDI_UNIQUE | cf::NDI_RED);
1679 1901
1680 warn "ERROR in enter_exit: $@"; 1902 warn "ERROR in enter_exit: $@";
1681 $self->leave_link; 1903 $self->leave_link;
1682 } 1904 }
1750 } 1972 }
1751 } 1973 }
1752 }, 1974 },
1753); 1975);
1754 1976
1755=item $client->coro (\&cb) 1977=item $client->async (\&cb)
1756 1978
1757Create a new coroutine, running the specified callback. The coroutine will 1979Create a new coroutine, running the specified callback. The coroutine will
1758be automatically cancelled when the client gets destroyed (e.g. on logout, 1980be automatically cancelled when the client gets destroyed (e.g. on logout,
1759or loss of connection). 1981or loss of connection).
1760 1982
1761=cut 1983=cut
1762 1984
1763sub cf::client::coro { 1985sub cf::client::async {
1764 my ($self, $cb) = @_; 1986 my ($self, $cb) = @_;
1765 1987
1766 my $coro = &cf::async ($cb); 1988 my $coro = &Coro::async ($cb);
1767 1989
1768 $coro->on_destroy (sub { 1990 $coro->on_destroy (sub {
1769 delete $self->{_coro}{$coro+0}; 1991 delete $self->{_coro}{$coro+0};
1770 }); 1992 });
1771 1993
2009 local $/; 2231 local $/;
2010 *CFG = YAML::Syck::Load <$fh>; 2232 *CFG = YAML::Syck::Load <$fh>;
2011 2233
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2234 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013 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
2014 if (exists $CFG{mlockall}) { 2239 if (exists $CFG{mlockall}) {
2015 eval { 2240 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall 2241 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017 and die "WARNING: m(un)lockall failed: $!\n"; 2242 and die "WARNING: m(un)lockall failed: $!\n";
2018 }; 2243 };
2019 warn $@ if $@; 2244 warn $@ if $@;
2020 } 2245 }
2021} 2246}
2022 2247
2023sub main { 2248sub main {
2024 # we must not ever block the main coroutine 2249 # we must not ever block the main coroutine
2025 local $Coro::idle = sub { 2250 local $Coro::idle = sub {
2026 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#
2027 (Coro::unblock_sub {
2028 Event::one_event; 2252 async { Event::one_event };
2029 })->();
2030 }; 2253 };
2031 2254
2032 cfg_load; 2255 cfg_load;
2033 db_load; 2256 db_load;
2034 load_extensions; 2257 load_extensions;
2035 Event::loop; 2258 Event::loop;
2036} 2259}
2037 2260
2038############################################################################# 2261#############################################################################
2039# 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}
2040 2305
2041sub reload() { 2306sub reload() {
2042 # can/must only be called in main 2307 # can/must only be called in main
2043 if ($Coro::current != $Coro::main) { 2308 if ($Coro::current != $Coro::main) {
2044 warn "can only reload from main coroutine\n"; 2309 warn "can only reload from main coroutine\n";
2045 return; 2310 return;
2046 } 2311 }
2047 2312
2048 warn "reloading..."; 2313 warn "reloading...";
2049 2314
2315 warn "freezing server";
2050 my $guard = freeze_mainloop; 2316 my $guard = freeze_mainloop;
2051 cf::emergency_save; 2317 cf::emergency_save;
2052 2318
2319 warn "sync database to disk";
2320 cf::db_sync;
2321 IO::AIO::flush;
2322
2053 eval { 2323 eval {
2054 # 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
2055 2325
2056 # cancel all watchers 2326 warn "cancel all watchers";
2057 for (Event::all_watchers) { 2327 for (Event::all_watchers) {
2058 $_->cancel if $_->data & WF_AUTOCANCEL; 2328 $_->cancel if $_->data & WF_AUTOCANCEL;
2059 } 2329 }
2060 2330
2061 # cancel all extension coros 2331 warn "cancel all extension coros";
2062 $_->cancel for values %EXT_CORO; 2332 $_->cancel for values %EXT_CORO;
2063 %EXT_CORO = (); 2333 %EXT_CORO = ();
2064 2334
2335 warn "remove commands";
2336 %COMMAND = ();
2337
2338 warn "remove ext commands";
2339 %EXTCMD = ();
2340
2065 # unload all extensions 2341 warn "unload/nuke all extensions";
2066 for (@exts) { 2342 for my $pkg (@EXTS) {
2067 warn "unloading <$_>"; 2343 warn "... unloading $pkg";
2068 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: $@";
2069 } 2350 }
2070 2351
2352 warn "... nuking $pkg";
2353 Symbol::delete_package $pkg;
2354 }
2355
2071 # unload all modules loaded from $LIBDIR 2356 warn "unload all perl modules loaded from $LIBDIR";
2072 while (my ($k, $v) = each %INC) { 2357 while (my ($k, $v) = each %INC) {
2073 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2358 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2074 2359
2075 warn "removing <$k>"; 2360 warn "removing <$k>";
2076 delete $INC{$k}; 2361 delete $INC{$k};
2083 } 2368 }
2084 2369
2085 Symbol::delete_package $k; 2370 Symbol::delete_package $k;
2086 } 2371 }
2087 2372
2088 # sync database to disk
2089 cf::db_sync;
2090 IO::AIO::flush;
2091
2092 # get rid of safe::, as good as possible 2373 warn "get rid of safe::, as good as possible";
2093 Symbol::delete_package "safe::$_" 2374 Symbol::delete_package "safe::$_"
2094 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);
2095 2376
2096 # remove register_script_function callbacks
2097 # TODO
2098
2099 # unload cf.pm "a bit" 2377 warn "unload cf.pm \"a bit\"";
2100 delete $INC{"cf.pm"}; 2378 delete $INC{"cf.pm"};
2101 2379
2102 # don't, removes xs symbols, too, 2380 # don't, removes xs symbols, too,
2103 # and global variables created in xs 2381 # and global variables created in xs
2104 #Symbol::delete_package __PACKAGE__; 2382 #Symbol::delete_package __PACKAGE__;
2105 2383
2106 # reload cf.pm
2107 warn "reloading cf.pm"; 2384 warn "reloading cf.pm";
2108 require cf; 2385 require cf;
2109 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2386 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2110 2387
2111 # load config and database again 2388 warn "load config and database again";
2112 cf::cfg_load; 2389 cf::cfg_load;
2113 cf::db_load; 2390 cf::db_load;
2114 2391
2115 # load extensions
2116 warn "load extensions"; 2392 warn "load extensions";
2117 cf::load_extensions; 2393 cf::load_extensions;
2118 2394
2119 # reattach attachments to objects 2395 warn "reattach attachments to objects/players";
2120 warn "reattach";
2121 _global_reattach; 2396 _global_reattach;
2397 warn "reattach attachments to maps";
2398 reattach $_ for values %MAP;
2122 }; 2399 };
2123 2400
2124 if ($@) { 2401 if ($@) {
2125 warn $@; 2402 warn $@;
2126 warn "error while reloading, exiting."; 2403 warn "error while reloading, exiting.";
2127 exit 1; 2404 exit 1;
2128 } 2405 }
2129 2406
2130 warn "reloaded successfully"; 2407 warn "reloaded";
2131}; 2408};
2132 2409
2133############################################################################# 2410#############################################################################
2134 2411
2135unless ($LINK_MAP) { 2412unless ($LINK_MAP) {
2142 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2419 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2420 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2144 2421
2145 # dirty hack because... archetypes are not yet loaded 2422 # dirty hack because... archetypes are not yet loaded
2146 Event->timer ( 2423 Event->timer (
2147 after => 2, 2424 after => 10,
2148 cb => sub { 2425 cb => sub {
2149 $_[0]->w->cancel; 2426 $_[0]->w->cancel;
2150 2427
2151 # provide some exits "home" 2428 # provide some exits "home"
2152 my $exit = cf::object::new "exit"; 2429 my $exit = cf::object::new "exit";
2170 $LINK_MAP->{deny_save} = 1; 2447 $LINK_MAP->{deny_save} = 1;
2171 $LINK_MAP->{deny_reset} = 1; 2448 $LINK_MAP->{deny_reset} = 1;
2172 2449
2173 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2450 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2174} 2451}
2175
2176register "<global>", __PACKAGE__;
2177 2452
2178register_command "reload" => sub { 2453register_command "reload" => sub {
2179 my ($who, $arg) = @_; 2454 my ($who, $arg) = @_;
2180 2455
2181 if ($who->flag (FLAG_WIZ)) { 2456 if ($who->flag (FLAG_WIZ)) {
2194 data => WF_AUTOCANCEL, 2469 data => WF_AUTOCANCEL,
2195 cb => sub { 2470 cb => sub {
2196 cf::server_tick; # one server iteration 2471 cf::server_tick; # one server iteration
2197 $RUNTIME += $TICK; 2472 $RUNTIME += $TICK;
2198 $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;
2199 2477
2200 # 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
2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2479 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202 2480
2203 $TICK_WATCHER->at ($NEXT_TICK); 2481 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines