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.131 by root, Thu Jan 4 00:53:54 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 $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
56our %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;
57 64
58binmode STDOUT; 65binmode STDOUT;
59binmode STDERR; 66binmode STDERR;
60 67
61# read virtual server time, if available 68# read virtual server time, if available
106=item %cf::CFG 113=item %cf::CFG
107 114
108Configuration for the server, loaded from C</etc/crossfire/config>, or 115Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 116from wherever your confdir points to.
110 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
111=back 125=back
112 126
113=cut 127=cut
114 128
115BEGIN { 129BEGIN {
118 utf8::encode $msg; 132 utf8::encode $msg;
119 133
120 $msg .= "\n" 134 $msg .= "\n"
121 unless $msg =~ /\n$/; 135 unless $msg =~ /\n$/;
122 136
123 LOG llevError, "cfperl: $msg"; 137 LOG llevError, $msg;
124 }; 138 };
125} 139}
126 140
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 141@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 142@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146 160
147$Event::DIED = sub { 161$Event::DIED = sub {
148 warn "error in event callback: @_"; 162 warn "error in event callback: @_";
149}; 163};
150 164
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 165=head2 UTILITY FUNCTIONS
156 166
157=over 4 167=over 4
158 168
169=item dumpval $ref
170
159=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}
160 191
161use JSON::Syck (); # TODO# replace by JSON::PC once working 192use JSON::Syck (); # TODO# replace by JSON::PC once working
162 193
163=item $ref = cf::from_json $json 194=item $ref = cf::from_json $json
164 195
180sub to_json($) { 211sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 212 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 213 JSON::Syck::Dump $_[0]
183} 214}
184 215
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string 216=item cf::lock_wait $string
208 217
209Wait until the given lock is available. See cf::lock_acquire. 218Wait until the given lock is available. See cf::lock_acquire.
210 219
211=item my $lock = cf::lock_acquire $string 220=item my $lock = cf::lock_acquire $string
212 221
213Wait 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
214a 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,
215for example when the coroutine gets canceled), the lock is automatically 224for example when the coroutine gets canceled), the lock is automatically
216returned. 225returned.
217 226
218Lock names should begin with a unique identifier (for example, find_map 227Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 228uses map_find and cf::map::load uses map_load).
220 229
221=cut 230=cut
222 231
223our %LOCK; 232our %LOCK;
224 233
238 # wait, to be sure we are not locked 247 # wait, to be sure we are not locked
239 lock_wait $key; 248 lock_wait $key;
240 249
241 $LOCK{$key} = []; 250 $LOCK{$key} = [];
242 251
243 cf::guard { 252 Coro::guard {
244 # wake up all waiters, to be on the safe side 253 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 254 $_->ready for @{ delete $LOCK{$key} };
246 } 255 }
247} 256}
248 257
258sub freeze_mainloop {
259 return unless $TICK_WATCHER->is_active;
260
261 my $guard = Coro::guard { $TICK_WATCHER->start };
262 $TICK_WATCHER->stop;
263 $guard
264}
265
249=item cf::async { BLOCK } 266=item cf::async { BLOCK }
250 267
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 268Currently the same as Coro::async_pool, meaning you cannot use
252error instead of exiting the server in case of a problem. 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.
253 271
254=cut 272=cut
255 273
256sub async(&) { 274BEGIN { *async = \&Coro::async_pool }
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264 275
265=item cf::sync_job { BLOCK } 276=item cf::sync_job { BLOCK }
266 277
267The design of crossfire+ requires that the main coro ($Coro::main) is 278The design of crossfire+ requires that the main coro ($Coro::main) is
268always able to handle events or runnable, as crossfire+ is only partly 279always able to handle events or runnable, as crossfire+ is only partly
282 # this is the main coro, too bad, we have to block 293 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 294 # till the operation succeeds, freezing the server :/
284 295
285 # TODO: use suspend/resume instead 296 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 297 # (but this is cancel-safe)
287 local $FREEZE = 1; 298 my $freeze_guard = freeze_mainloop;
288 299
289 my $busy = 1; 300 my $busy = 1;
290 my @res; 301 my @res;
291 302
292 (Coro::async { 303 (async {
293 @res = eval { $job->() }; 304 @res = eval { $job->() };
294 warn $@ if $@; 305 warn $@ if $@;
295 undef $busy; 306 undef $busy;
296 })->prio (Coro::PRIO_MAX); 307 })->prio (Coro::PRIO_MAX);
297 308
298 while ($busy) { 309 while ($busy) {
299 Coro::cede_notself; 310 Coro::cede or Event::one_event;
300 Event::one_event unless Coro::nready;
301 } 311 }
302 312
303 wantarray ? @res : $res[0] 313 wantarray ? @res : $res[0]
304 } else { 314 } else {
305 # we are in another coroutine, how wonderful, everything just works 315 # we are in another coroutine, how wonderful, everything just works
306 316
307 $job->() 317 $job->()
308 } 318 }
309} 319}
310 320
311=item $coro = cf::coro { BLOCK } 321=item $coro = cf::async_ext { BLOCK }
312 322
313Creates and returns a new coro. This coro is automcatially being canceled 323Like async, but this coro is automatically being canceled when the
314when the extension calling this is being unloaded. 324extension calling this is being unloaded.
315 325
316=cut 326=cut
317 327
318sub coro(&) { 328sub async_ext(&) {
319 my $cb = shift; 329 my $cb = shift;
320 330
321 my $coro = &cf::async ($cb); 331 my $coro = &Coro::async ($cb);
322 332
323 $coro->on_destroy (sub { 333 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 334 delete $EXT_CORO{$coro+0};
325 }); 335 });
326 $EXT_CORO{$coro+0} = $coro; 336 $EXT_CORO{$coro+0} = $coro;
356 366
357############################################################################# 367#############################################################################
358 368
359package cf::path; 369package cf::path;
360 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
361sub new { 383sub new {
362 my ($class, $path, $base) = @_; 384 my ($class, $path, $base) = @_;
363 385
364 $path = $path->as_string if ref $path; 386 return $path if ref $path;
365 387
366 my $self = bless { }, $class; 388 my $self = {};
367 389
368 # {... are special paths that are not touched 390 # {... are special paths that are not being touched
369 # ?xxx/... are special absolute paths 391 # ?xxx/... are special absolute paths
370 # ?random/... random maps 392 # ?random/... random maps
371 # /! non-realised random map exit 393 # /! non-realised random map exit
372 # /... normal maps 394 # /... normal maps
373 # ~/... per-player maps without a specific player (DO NOT USE) 395 # ~/... per-player maps without a specific player (DO NOT USE)
374 # ~user/... per-player map of a specific user 396 # ~user/... per-player map of a specific user
375 397
398 $path =~ s/$PATH_SEP/\//go;
399
376 if ($path =~ /^{/) { 400 if ($path =~ /^{/) {
377 # fine as it is 401 # fine as it is
378 } elsif ($path =~ s{^\?random/}{}) {
379 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
380 $self->{random} = cf::from_json $data;
381 } else { 402 } else {
382 if ($path =~ s{^~([^/]+)?}{}) { 403 if ($path =~ s{^~([^/]+)?}{}) {
404 # ~user
383 $self->{user_rel} = 1; 405 $self->{user_rel} = 1;
384 406
385 if (defined $1) { 407 if (defined $1) {
386 $self->{user} = $1; 408 $self->{user} = $1;
387 } elsif ($base =~ m{^~([^/]+)/}) { 409 } elsif ($base =~ m{^~([^/]+)/}) {
388 $self->{user} = $1; 410 $self->{user} = $1;
389 } else { 411 } else {
390 warn "cannot resolve user-relative path without user <$path,$base>\n"; 412 warn "cannot resolve user-relative path without user <$path,$base>\n";
391 } 413 }
414 } elsif ($path =~ s{^\?([^/]+)/}{}) {
415 # ?...
416 $self->{ext} = $1;
417 if (my $ext = $EXT_MAP{$1}) {
418 bless $self, $ext;
419 }
392 } elsif ($path =~ /^\//) { 420 } elsif ($path =~ /^\//) {
421 # /...
393 # already absolute 422 # already absolute
394 } else { 423 } else {
424 # relative
395 $base =~ s{[^/]+/?$}{}; 425 $base =~ s{[^/]+/?$}{};
396 return $class->new ("$base/$path"); 426 return $class->new ("$base/$path");
397 } 427 }
398 428
399 for ($path) { 429 for ($path) {
402 } 432 }
403 } 433 }
404 434
405 $self->{path} = $path; 435 $self->{path} = $path;
406 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
407 $self 449 $self
450}
451
452sub init {
453 # nop
454}
455
456sub substitute {
457 ()
408} 458}
409 459
410# the name / primary key / in-game path 460# the name / primary key / in-game path
411sub as_string { 461sub as_string {
412 my ($self) = @_; 462 my ($self) = @_;
413 463
414 $self->{user_rel} ? "~$self->{user}$self->{path}" 464 $self->{user_rel} ? "~$self->{user}$self->{path}"
415 : $self->{random} ? "?random/$self->{path}" 465 : $self->{ext} ? "?$self->{ext}/$self->{path}"
416 : $self->{path} 466 : $self->{path}
417} 467}
418 468
419# the displayed name, this is a one way mapping 469# the displayed name, this is a one way mapping
420sub visible_name { 470sub visible_name {
421 my ($self) = @_; 471 &as_string
422
423# if (my $rmp = $self->{random}) {
424# # todo: be more intelligent about this
425# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
426# } else {
427 $self->as_string
428# }
429} 472}
430 473
431# escape the /'s in the path 474# escape the /'s in the path
432sub _escaped_path { 475sub _escaped_path {
433 # ∕ is U+2215
434 (my $path = $_[0]{path}) =~ s/\///g; 476 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
477
435 $path 478 $path
436} 479}
437 480
438# the original (read-only) location 481# the original (read-only) location
439sub load_path { 482sub load_path {
444 487
445# the temporary/swap location 488# the temporary/swap location
446sub save_path { 489sub save_path {
447 my ($self) = @_; 490 my ($self) = @_;
448 491
492 $self->{user_rel}
449 $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
450 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
451 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
452} 495}
453 496
454# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
455sub uniq_path { 498sub uniq_path {
456 my ($self) = @_; 499 my ($self) = @_;
457 500
458 $self->{user_rel} || $self->{random} 501 $self->{user_rel} || $self->{ext}
459 ? undef 502 ? undef
460 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
461} 504}
462 505
463# return random map parameters, or undef 506sub customise_for {
464sub random_map_params {
465 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
466 508
467 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
468} 514}
469 515
470# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
471sub is_style_map { 517sub is_style_map {
472 $_[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";
473} 539}
474 540
475package cf; 541package cf;
476 542
477############################################################################# 543#############################################################################
927=cut 993=cut
928 994
929sub register_extcmd { 995sub register_extcmd {
930 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
931 997
932 my $caller = caller;
933 #warn "registering extcmd '$name' to '$caller'";
934
935 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
936} 999}
937 1000
938cf::player->attach ( 1001cf::player->attach (
939 on_command => sub { 1002 on_command => sub {
940 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
953 1016
954 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
955 1018
956 if (ref $msg) { 1019 if (ref $msg) {
957 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
958 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
959 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
960 } 1023 }
961 } 1024 }
962 } else { 1025 } else {
963 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
965 1028
966 cf::override; 1029 cf::override;
967 }, 1030 },
968); 1031);
969 1032
970sub register {
971 my ($base, $pkg) = @_;
972
973 #TODO
974}
975
976sub load_extension { 1033sub load_extension {
977 my ($path) = @_; 1034 my ($path) = @_;
978 1035
979 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
980 my $base = $1; 1037 my $base = $1;
981 my $pkg = $1; 1038 my $pkg = $1;
982 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
983 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
984 1041
985 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
986 1043
987 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
988 or die "$path: $!"; 1045 or die "$path: $!";
989 1046
990 my $source = 1047 my $source =
995 1052
996 eval $source 1053 eval $source
997 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
998 : "extension disabled.\n"; 1055 : "extension disabled.\n";
999 1056
1000 push @exts, $pkg; 1057 push @EXTS, $pkg;
1001 $ext_pkg{$base} = $pkg;
1002
1003# no strict 'refs';
1004# @{"$pkg\::ISA"} = ext::;
1005
1006 register $base, $pkg;
1007}
1008
1009sub unload_extension {
1010 my ($pkg) = @_;
1011
1012 warn "removing extension $pkg\n";
1013
1014 # remove hooks
1015 #TODO
1016# for my $idx (0 .. $#PLUGIN_EVENT) {
1017# delete $hook[$idx]{$pkg};
1018# }
1019
1020 # remove commands
1021 for my $name (keys %COMMAND) {
1022 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1023
1024 if (@cb) {
1025 $COMMAND{$name} = \@cb;
1026 } else {
1027 delete $COMMAND{$name};
1028 }
1029 }
1030
1031 # remove extcmds
1032 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1033 delete $EXTCMD{$name};
1034 }
1035
1036 if (my $cb = $pkg->can ("unload")) {
1037 eval {
1038 $cb->($pkg);
1039 1
1040 } or warn "$pkg unloaded, but with errors: $@";
1041 }
1042
1043 Symbol::delete_package $pkg;
1044} 1058}
1045 1059
1046sub load_extensions { 1060sub load_extensions {
1047 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
1048 next unless -r $ext; 1062 next unless -r $ext;
1066}; 1080};
1067 1081
1068cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1069 1083
1070############################################################################# 1084#############################################################################
1071# load/save perl data associated with player->ob objects
1072
1073sub all_objects(@) {
1074 @_, map all_objects ($_->inv), @_
1075}
1076
1077# TODO: compatibility cruft, remove when no longer needed
1078cf::player->attach (
1079 on_load => sub {
1080 my ($pl, $path) = @_;
1081
1082 for my $o (all_objects $pl->ob) {
1083 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1084 $o->set_ob_key_value ("_perl_data");
1085
1086 %$o = %{ Storable::thaw pack "H*", $value };
1087 }
1088 }
1089 },
1090);
1091
1092#############################################################################
1093 1085
1094=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1095 1087
1096Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1097 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1098=head3 cf::player 1096=head3 cf::player
1099 1097
1100=over 4 1098=over 4
1101 1099
1102=item cf::player::exists $login 1100=item cf::player::find $login
1103 1101
1104Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1105 1103
1106=cut 1104=cut
1107 1105
1108sub cf::player::exists($) { 1106sub playerdir($) {
1109 cf::player::find $_[0] 1107 cf::localdir
1110 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
1111} 1252}
1112 1253
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1255
1115Sends an ext reply to the player. 1256Sends an ext reply to the player.
1116 1257
1117=cut 1258=cut
1118 1259
1119sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1121 1262
1122 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1123 1264
1124 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1125} 1266}
1267
1268package cf;
1126 1269
1127=back 1270=back
1128 1271
1129 1272
1130=head3 cf::map 1273=head3 cf::map
1136package cf::map; 1279package cf::map;
1137 1280
1138use Fcntl; 1281use Fcntl;
1139use Coro::AIO; 1282use Coro::AIO;
1140 1283
1141our $MAX_RESET = 7200; 1284our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1285our $DEFAULT_RESET = 3000;
1143 1286
1144sub generate_random_map { 1287sub generate_random_map {
1145 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1146 1289
1147 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1148 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1149 $path, 1292 $path,
1150 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1151 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1152 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1153 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1155 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1156 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1157 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1158 $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},
1159 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1160 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1161} 1305}
1162 1306
1163# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1164# all maps in C++... 1308# all maps in C++...
1165sub change_all_map_light { 1309sub change_all_map_light {
1167 1311
1168 $_->change_map_light ($change) 1312 $_->change_map_light ($change)
1169 for grep $_->outdoor, values %cf::MAP; 1313 for grep $_->outdoor, values %cf::MAP;
1170} 1314}
1171 1315
1172sub try_load_header($) { 1316sub load_map_header($) {
1173 my ($path) = @_; 1317 my ($path) = @_;
1174 1318
1175 utf8::encode $path; 1319 utf8::encode $path;
1176 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1177 or return; 1321 or return;
1178 1322
1179 my $map = cf::map::new 1323 my $map = cf::map::new
1180 or return; 1324 or return;
1181 1325
1326 # for better error messages only, will be overwritten later
1327 $map->path ($path);
1328
1182 $map->load_header ($path) 1329 $map->load_header ($path)
1183 or return; 1330 or return;
1184 1331
1185 $map->{load_path} = $path; 1332 $map->{load_path} = $path;
1186 1333
1187 $map 1334 $map
1188} 1335}
1189 1336
1190sub find_map; 1337sub find;
1191sub find_map { 1338sub find {
1192 my ($path, $origin) = @_; 1339 my ($path, $origin) = @_;
1193 1340
1194 #warn "find_map<$path,$origin>\n";#d# 1341 #warn "find<$path,$origin>\n";#d#
1195 1342
1196 $path = new cf::path $path, $origin && $origin->path; 1343 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1344 my $key = $path->as_string;
1198 1345
1199 cf::lock_wait "map_find:$key"; 1346 cf::lock_wait "map_find:$key";
1200 1347
1201 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1349 my $guard = cf::lock_acquire "map_find:$key";
1203 1350
1204 # do it the slow way 1351 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1206 1355
1207 if ($map) { 1356 if ($map) {
1357 $map->last_access ((delete $map->{last_access})
1358 || $cf::RUNTIME); #d#
1208 # safety 1359 # safety
1209 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1210 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1211 } else { 1362 } else {
1212 if (my $rmp = $path->random_map_params) { 1363 $map = $path->load_orig
1213 $map = generate_random_map $key, $rmp;
1214 } else {
1215 $map = try_load_header $path->load_path;
1216 }
1217
1218 $map or return; 1364 or return;
1219 1365
1220 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1221 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1368 $map->last_access ($cf::RUNTIME);
1222 $map->instantiate; 1369 $map->instantiate;
1223 1370
1224 # per-player maps become, after loading, normal maps 1371 # per-player maps become, after loading, normal maps
1225 $map->per_player (0) if $path->{user_rel}; 1372 $map->per_player (0) if $path->{user_rel};
1226 } 1373 }
1227 1374
1228 $map->path ($key); 1375 $map->path ($key);
1229 $map->{path} = $path; 1376 $map->{path} = $path;
1230 $map->{last_save} = $cf::RUNTIME; 1377 $map->{last_save} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME); 1378
1379 Coro::cede;
1232 1380
1233 if ($map->should_reset) { 1381 if ($map->should_reset) {
1234 $map->reset; 1382 $map->reset;
1235 undef $guard; 1383 undef $guard;
1236 $map = find_map $path 1384 $map = find $path
1237 or return; 1385 or return;
1238 } 1386 }
1239 1387
1240 $cf::MAP{$key} = $map 1388 $cf::MAP{$key} = $map
1241 } 1389 }
1264 $self->clear_unique_items; 1412 $self->clear_unique_items;
1265 $self->load_objects ($uniq, 0); 1413 $self->load_objects ($uniq, 0);
1266 } 1414 }
1267 } 1415 }
1268 1416
1417 Coro::cede;
1418
1269 # now do the right thing for maps 1419 # now do the right thing for maps
1270 $self->link_multipart_objects; 1420 $self->link_multipart_objects;
1271 1421
1272 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1273 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1274 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1275 } else { 1425 } else {
1426 $self->decay_objects;
1276 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1277 $self->decay_objects;
1278 $self->update_buttons; 1428 $self->update_buttons;
1279 $self->set_darkness_map; 1429 $self->set_darkness_map;
1280 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1281 unless $self->difficulty; 1431 unless $self->difficulty;
1282 $self->activate; 1432 $self->activate;
1283 } 1433 }
1284 1434
1435 Coro::cede;
1436
1285 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1286} 1438}
1287 1439
1288sub load_map_sync { 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
1464sub find_sync {
1289 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1290 1466
1291 #warn "load_map_sync<$path, $origin>\n";#d# 1467 cf::sync_job { find $path, $origin }
1468}
1292 1469
1293 cf::sync_job { 1470sub do_load_sync {
1294 my $map = cf::map::find_map $path, $origin 1471 my ($map) = @_;
1472
1473 cf::sync_job { $map->load };
1474}
1475
1476our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async {
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1295 or return; 1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1296 $map->load; 1486 $map->load;
1297 $map 1487 }
1488 Coro::schedule;
1298 } 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 ()
1299} 1506}
1300 1507
1301sub save { 1508sub save {
1302 my ($self) = @_; 1509 my ($self) = @_;
1303 1510
1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1512
1304 $self->{last_save} = $cf::RUNTIME; 1513 $self->{last_save} = $cf::RUNTIME;
1305 1514
1306 return unless $self->dirty; 1515 return unless $self->dirty;
1307 1516
1308 my $save = $self->{path}->save_path; utf8::encode $save; 1517 my $save = $self->{path}->save_path; utf8::encode $save;
1309 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1518 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1310 1519
1311 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1312 1521
1313 return if $self->{deny_save}; 1522 return if $self->{deny_save};
1523
1524 local $self->{last_access} = $self->last_access;#d#
1525
1526 cf::async {
1527 $_->contr->save for $self->players;
1528 };
1314 1529
1315 if ($uniq) { 1530 if ($uniq) {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1317 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1318 } else { 1533 } else {
1324 my ($self) = @_; 1539 my ($self) = @_;
1325 1540
1326 # save first because save cedes 1541 # save first because save cedes
1327 $self->save; 1542 $self->save;
1328 1543
1544 my $lock = cf::lock_acquire "map_data:" . $self->path;
1545
1329 return if $self->players; 1546 return if $self->players;
1330 return if $self->in_memory != cf::MAP_IN_MEMORY; 1547 return if $self->in_memory != cf::MAP_IN_MEMORY;
1331 return if $self->{deny_save}; 1548 return if $self->{deny_save};
1332 1549
1333 $self->clear; 1550 $self->clear;
1351 my ($self) = @_; 1568 my ($self) = @_;
1352 1569
1353 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1354} 1571}
1355 1572
1356sub unlink_save {
1357 my ($self) = @_;
1358
1359 utf8::encode (my $save = $self->{path}->save_path);
1360 aioreq_pri 3; IO::AIO::aio_unlink $save;
1361 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1362}
1363
1364sub rename { 1573sub rename {
1365 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1366 1575
1367 $self->unlink_save; 1576 $self->{path}->unlink_save;
1368 1577
1369 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1370 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1371 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1372 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1375} 1584}
1376 1585
1377sub reset { 1586sub reset {
1378 my ($self) = @_; 1587 my ($self) = @_;
1379 1588
1589 my $lock = cf::lock_acquire "map_data:" . $self->path;
1590
1380 return if $self->players; 1591 return if $self->players;
1381 return if $self->{path}{user_rel};#d# 1592 return if $self->{path}{user_rel};#d#
1382 1593
1383 warn "resetting map ", $self->path;#d# 1594 warn "resetting map ", $self->path;#d#
1384 1595
1385 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1386 1597
1387 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1388 1599
1389 $self->unlink_save; 1600 $self->{path}->unlink_save;
1390 $self->destroy; 1601 $self->destroy;
1391} 1602}
1392 1603
1393my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1394 1605
1399 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1400 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1401 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1402} 1613}
1403 1614
1404sub customise_for { 1615=item cf::map::unique_maps
1405 my ($map, $ob) = @_;
1406 1616
1407 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1408 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1409 }
1410 1619
1411 $map 1620=cut
1412}
1413 1621
1414sub emergency_save { 1622sub unique_maps() {
1415 local $cf::FREEZE = 1; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1416 1625
1417 warn "enter emergency map save\n"; 1626 my @paths;
1418 1627
1419 cf::sync_job { 1628 for (@$files) {
1420 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1421 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1422 }; 1634 }
1423 1635
1424 warn "end emergency map save\n"; 1636 \@paths
1425} 1637}
1426 1638
1427package cf; 1639package cf;
1428 1640
1429=back 1641=back
1430 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
1431 1669
1432=head3 cf::object::player 1670=head3 cf::object::player
1433 1671
1434=over 4 1672=over 4
1435 1673
1510 my $link_pos = delete $self->{_link_pos}; 1748 my $link_pos = delete $self->{_link_pos};
1511 1749
1512 unless ($map) { 1750 unless ($map) {
1513 # restore original map position 1751 # restore original map position
1514 ($map, $x, $y) = @{ $link_pos || [] }; 1752 ($map, $x, $y) = @{ $link_pos || [] };
1515 $map = cf::map::find_map $map; 1753 $map = cf::map::find $map;
1516 1754
1517 unless ($map) { 1755 unless ($map) {
1518 ($map, $x, $y) = @$EMERGENCY_POSITION; 1756 ($map, $x, $y) = @$EMERGENCY_POSITION;
1519 $map = cf::map::find_map $map 1757 $map = cf::map::find $map
1520 or die "FATAL: cannot load emergency map\n"; 1758 or die "FATAL: cannot load emergency map\n";
1521 } 1759 }
1522 } 1760 }
1523 1761
1524 ($x, $y) = (-1, -1) 1762 ($x, $y) = (-1, -1)
1527 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1528 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1529 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1530 1768
1531 $map->load; 1769 $map->load;
1770 $map->load_diag;
1532 1771
1772 return unless $self->contr->active;
1533 $self->activate_recursive; 1773 $self->activate_recursive;
1534 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1535} 1775}
1536 1776
1537cf::player->attach ( 1777cf::player->attach (
1550 1790
1551 # try to abort aborted map switching on player login :) 1791 # try to abort aborted map switching on player login :)
1552 # should happen only on crashes 1792 # should happen only on crashes
1553 if ($pl->ob->{_link_pos}) { 1793 if ($pl->ob->{_link_pos}) {
1554 $pl->ob->enter_link; 1794 $pl->ob->enter_link;
1555 cf::async { 1795 (async {
1556 # 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
1557 # 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);
1558 Coro::Timer::sleep 1; 1802 Coro::Timer::sleep 1;
1559 $pl->ob->leave_link; 1803 $pl->ob->leave_link;
1560 }; 1804 })->prio (2);
1561 } 1805 }
1562 }, 1806 },
1563); 1807);
1564 1808
1565=item $player_object->goto_map ($path, $x, $y) 1809=item $player_object->goto ($path, $x, $y)
1566 1810
1567=cut 1811=cut
1568 1812
1569sub cf::object::player::goto_map { 1813sub cf::object::player::goto {
1570 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1571 1815
1816 $path = new cf::path $path;
1817
1572 $self->enter_link; 1818 $self->enter_link;
1573 1819
1574 (cf::async { 1820 (async {
1575 $path = new cf::path $path;
1576
1577 my $map = cf::map::find_map $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1578 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1579 1823
1580# warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1581# if $map; 1825# if $map;
1582 1826
1583 $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);
1584 1828
1585 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1586 })->prio (1); 1830 })->prio (1);
1587} 1831}
1588 1832
1641 1885
1642 return unless $self->type == cf::PLAYER; 1886 return unless $self->type == cf::PLAYER;
1643 1887
1644 $self->enter_link; 1888 $self->enter_link;
1645 1889
1646 (cf::async { 1890 (async {
1891 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1892 unless (eval {
1648 prepare_random_map $exit 1893 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1894 if $exit->slaying eq "/!";
1650 1895
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1896 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1898
1654 1; 1899 1;
1655 }) { 1900 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "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. "
1658 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1659 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1660 1905
1661 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1662 $self->leave_link; 1907 $self->leave_link;
1663 } 1908 }
1731 } 1976 }
1732 } 1977 }
1733 }, 1978 },
1734); 1979);
1735 1980
1736=item $client->coro (\&cb) 1981=item $client->async (\&cb)
1737 1982
1738Create a new coroutine, running the specified callback. The coroutine will 1983Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1984be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1985or loss of connection).
1741 1986
1742=cut 1987=cut
1743 1988
1744sub cf::client::coro { 1989sub cf::client::async {
1745 my ($self, $cb) = @_; 1990 my ($self, $cb) = @_;
1746 1991
1747 my $coro = &cf::async ($cb); 1992 my $coro = &Coro::async ($cb);
1748 1993
1749 $coro->on_destroy (sub { 1994 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1995 delete $self->{_coro}{$coro+0};
1751 }); 1996 });
1752 1997
1990 local $/; 2235 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2236 *CFG = YAML::Syck::Load <$fh>;
1992 2237
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2238 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 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
1995 if (exists $CFG{mlockall}) { 2243 if (exists $CFG{mlockall}) {
1996 eval { 2244 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2245 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2246 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2247 };
2000 warn $@ if $@; 2248 warn $@ if $@;
2001 } 2249 }
2002} 2250}
2003 2251
2004sub main { 2252sub main {
2005 # we must not ever block the main coroutine 2253 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2254 local $Coro::idle = sub {
2007 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#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2256 async { Event::one_event };
2010 })->();
2011 }; 2257 };
2012 2258
2013 cfg_load; 2259 cfg_load;
2014 db_load; 2260 db_load;
2015 load_extensions; 2261 load_extensions;
2016 Event::loop; 2262 Event::loop;
2017} 2263}
2018 2264
2019############################################################################# 2265#############################################################################
2020# 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}
2021 2309
2022sub reload() { 2310sub reload() {
2023 # can/must only be called in main 2311 # can/must only be called in main
2024 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
2025 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
2026 return; 2314 return;
2027 } 2315 }
2028 2316
2029 warn "reloading..."; 2317 warn "reloading...";
2030 2318
2031 local $FREEZE = 1; 2319 warn "freezing server";
2320 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2321 cf::emergency_save;
2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2033 2326
2034 eval { 2327 eval {
2035 # 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
2036 2329
2037 # cancel all watchers 2330 warn "cancel all watchers";
2038 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
2039 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
2040 } 2333 }
2041 2334
2042 # cancel all extension coros 2335 warn "cancel all extension coros";
2043 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
2044 %EXT_CORO = (); 2337 %EXT_CORO = ();
2045 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
2046 # unload all extensions 2345 warn "unload/nuke all extensions";
2047 for (@exts) { 2346 for my $pkg (@EXTS) {
2048 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
2049 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: $@";
2050 } 2354 }
2051 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
2052 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
2053 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
2054 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2055 2363
2056 warn "removing <$k>"; 2364 warn "removing <$k>";
2057 delete $INC{$k}; 2365 delete $INC{$k};
2064 } 2372 }
2065 2373
2066 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
2067 } 2375 }
2068 2376
2069 # sync database to disk
2070 cf::db_sync;
2071 IO::AIO::flush;
2072
2073 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
2074 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
2075 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);
2076 2380
2077 # remove register_script_function callbacks
2078 # TODO
2079
2080 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
2081 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
2082 2383
2083 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
2084 # and global variables created in xs 2385 # and global variables created in xs
2085 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
2086 2387
2087 # reload cf.pm
2088 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
2089 require cf; 2389 require cf;
2090 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2091 2391
2092 # load config and database again 2392 warn "load config and database again";
2093 cf::cfg_load; 2393 cf::cfg_load;
2094 cf::db_load; 2394 cf::db_load;
2095 2395
2096 # load extensions
2097 warn "load extensions"; 2396 warn "load extensions";
2098 cf::load_extensions; 2397 cf::load_extensions;
2099 2398
2100 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
2101 warn "reattach";
2102 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
2103 }; 2403 };
2104 2404
2105 if ($@) { 2405 if ($@) {
2106 warn $@; 2406 warn $@;
2107 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
2108 exit 1; 2408 exit 1;
2109 } 2409 }
2110 2410
2111 warn "reloaded successfully"; 2411 warn "reloaded";
2112}; 2412};
2113 2413
2114############################################################################# 2414#############################################################################
2115 2415
2116unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2425
2126 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2427 Event->timer (
2128 after => 2, 2428 after => 10,
2129 cb => sub { 2429 cb => sub {
2130 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2131 2431
2132 # provide some exits "home" 2432 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2152 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2153 2453
2154 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2155} 2455}
2156 2456
2157register "<global>", __PACKAGE__;
2158
2159register_command "reload" => sub { 2457register_command "reload" => sub {
2160 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2161 2459
2162 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2163 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2172 reentrant => 0, 2470 reentrant => 0,
2173 prio => 0, 2471 prio => 0,
2174 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2175 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2176 cb => sub { 2474 cb => sub {
2177 unless ($FREEZE) { 2475 $NOW = Event::time;
2476
2178 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2179 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2180 }
2181
2182 $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;
2183 2483
2184 # 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
2185 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2186 2486
2187 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines