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.133 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.165 by root, Fri Jan 12 22:09:22 2007 UTC

15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
47our %CFG; 52our %CFG;
48 53
49our $UPTIME; $UPTIME ||= time; 54our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 55our $RUNTIME;
51 56
57our %PLAYER; # all users
52our %MAP; # all maps 58our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 59our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 60our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 64
57binmode STDOUT; 65binmode STDOUT;
58binmode STDERR; 66binmode STDERR;
59 67
60# read virtual server time, if available 68# read virtual server time, if available
105=item %cf::CFG 113=item %cf::CFG
106 114
107Configuration for the server, loaded from C</etc/crossfire/config>, or 115Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 116from wherever your confdir points to.
109 117
118=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
119
120These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
121or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
122processing has been done. Call C<< ->wait >> on them to maximise the
123window of cpu time available, or simply to synchronise to the server tick.
124
110=back 125=back
111 126
112=cut 127=cut
113 128
114BEGIN { 129BEGIN {
117 utf8::encode $msg; 132 utf8::encode $msg;
118 133
119 $msg .= "\n" 134 $msg .= "\n"
120 unless $msg =~ /\n$/; 135 unless $msg =~ /\n$/;
121 136
122 LOG llevError, "cfperl: $msg"; 137 LOG llevError, $msg;
123 }; 138 };
124} 139}
125 140
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 141@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 142@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
145 160
146$Event::DIED = sub { 161$Event::DIED = sub {
147 warn "error in event callback: @_"; 162 warn "error in event callback: @_";
148}; 163};
149 164
150my %ext_pkg;
151my @exts;
152my @hook;
153
154=head2 UTILITY FUNCTIONS 165=head2 UTILITY FUNCTIONS
155 166
156=over 4 167=over 4
157 168
169=item dumpval $ref
170
158=cut 171=cut
172
173sub dumpval {
174 eval {
175 local $SIG{__DIE__};
176 my $d;
177 if (1) {
178 $d = new Data::Dumper([$_[0]], ["*var"]);
179 $d->Terse(1);
180 $d->Indent(2);
181 $d->Quotekeys(0);
182 $d->Useqq(1);
183 #$d->Bless(...);
184 $d->Seen($_[1]) if @_ > 1;
185 $d = $d->Dump();
186 }
187 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
188 $d
189 } || "[unable to dump $_[0]: '$@']";
190}
159 191
160use JSON::Syck (); # TODO# replace by JSON::PC once working 192use JSON::Syck (); # TODO# replace by JSON::PC once working
161 193
162=item $ref = cf::from_json $json 194=item $ref = cf::from_json $json
163 195
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;
477
442 $path 478 $path
443} 479}
444 480
445# the original (read-only) location 481# the original (read-only) location
446sub load_path { 482sub load_path {
451 487
452# the temporary/swap location 488# the temporary/swap location
453sub save_path { 489sub save_path {
454 my ($self) = @_; 490 my ($self) = @_;
455 491
492 $self->{user_rel}
456 $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
457 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
458 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path 494 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
459} 495}
460 496
461# the unique path, might be eq to save_path 497# the unique path, undef == no special unique path
462sub uniq_path { 498sub uniq_path {
463 my ($self) = @_; 499 my ($self) = @_;
464 500
465 $self->{user_rel} || $self->{random} 501 $self->{user_rel} || $self->{ext}
466 ? undef 502 ? undef
467 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 503 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
468} 504}
469 505
470# return random map parameters, or undef 506sub customise_for {
471sub random_map_params {
472 my ($self) = @_; 507 my ($self, $map, $ob) = @_;
473 508
474 $self->{random} 509 if ($map->per_player) {
510 return cf::map::find ("~" . $ob->name . "/" . $map->{path}{path});
511 }
512
513 $map
475} 514}
476 515
477# this is somewhat ugly, but style maps do need special treatment 516# this is somewhat ugly, but style maps do need special treatment
478sub is_style_map { 517sub is_style_map {
479 $_[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";
480} 539}
481 540
482package cf; 541package cf;
483 542
484############################################################################# 543#############################################################################
934=cut 993=cut
935 994
936sub register_extcmd { 995sub register_extcmd {
937 my ($name, $cb) = @_; 996 my ($name, $cb) = @_;
938 997
939 my $caller = caller;
940 #warn "registering extcmd '$name' to '$caller'";
941
942 $EXTCMD{$name} = [$cb, $caller]; 998 $EXTCMD{$name} = $cb;
943} 999}
944 1000
945cf::player->attach ( 1001cf::player->attach (
946 on_command => sub { 1002 on_command => sub {
947 my ($pl, $name, $params) = @_; 1003 my ($pl, $name, $params) = @_;
960 1016
961 my $msg = eval { from_json $buf }; 1017 my $msg = eval { from_json $buf };
962 1018
963 if (ref $msg) { 1019 if (ref $msg) {
964 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1020 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
965 if (my %reply = $cb->[0]->($pl, $msg)) { 1021 if (my %reply = $cb->($pl, $msg)) {
966 $pl->ext_reply ($msg->{msgid}, %reply); 1022 $pl->ext_reply ($msg->{msgid}, %reply);
967 } 1023 }
968 } 1024 }
969 } else { 1025 } else {
970 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1026 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
972 1028
973 cf::override; 1029 cf::override;
974 }, 1030 },
975); 1031);
976 1032
977sub register {
978 my ($base, $pkg) = @_;
979
980 #TODO
981}
982
983sub load_extension { 1033sub load_extension {
984 my ($path) = @_; 1034 my ($path) = @_;
985 1035
986 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1036 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
987 my $base = $1; 1037 my $base = $1;
988 my $pkg = $1; 1038 my $pkg = $1;
989 $pkg =~ s/[^[:word:]]/_/g; 1039 $pkg =~ s/[^[:word:]]/_/g;
990 $pkg = "ext::$pkg"; 1040 $pkg = "ext::$pkg";
991 1041
992 warn "loading '$path' into '$pkg'\n"; 1042 warn "... loading '$path' into '$pkg'\n";
993 1043
994 open my $fh, "<:utf8", $path 1044 open my $fh, "<:utf8", $path
995 or die "$path: $!"; 1045 or die "$path: $!";
996 1046
997 my $source = 1047 my $source =
1002 1052
1003 eval $source 1053 eval $source
1004 or die $@ ? "$path: $@\n" 1054 or die $@ ? "$path: $@\n"
1005 : "extension disabled.\n"; 1055 : "extension disabled.\n";
1006 1056
1007 push @exts, $pkg; 1057 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} 1058}
1052 1059
1053sub load_extensions { 1060sub load_extensions {
1054 for my $ext (<$LIBDIR/*.ext>) { 1061 for my $ext (<$LIBDIR/*.ext>) {
1055 next unless -r $ext; 1062 next unless -r $ext;
1073}; 1080};
1074 1081
1075cf::map->attach (prio => -10000, package => cf::mapsupport::); 1082cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076 1083
1077############################################################################# 1084#############################################################################
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 1085
1101=head2 CORE EXTENSIONS 1086=head2 CORE EXTENSIONS
1102 1087
1103Functions and methods that extend core crossfire objects. 1088Functions and methods that extend core crossfire objects.
1104 1089
1090=cut
1091
1092package cf::player;
1093
1094use Coro::AIO;
1095
1105=head3 cf::player 1096=head3 cf::player
1106 1097
1107=over 4 1098=over 4
1108 1099
1109=item cf::player::exists $login 1100=item cf::player::find $login
1110 1101
1111Returns true when the given account exists. 1102Returns the given player object, loading it if necessary (might block).
1112 1103
1113=cut 1104=cut
1114 1105
1115sub cf::player::exists($) { 1106sub playerdir($) {
1116 cf::player::find $_[0] 1107 cf::localdir
1117 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
1118} 1252}
1119 1253
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1255
1122Sends an ext reply to the player. 1256Sends an ext reply to the player.
1123 1257
1124=cut 1258=cut
1125 1259
1126sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1128 1262
1129 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1130 1264
1131 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1132} 1266}
1267
1268package cf;
1133 1269
1134=back 1270=back
1135 1271
1136 1272
1137=head3 cf::map 1273=head3 cf::map
1150 1286
1151sub generate_random_map { 1287sub generate_random_map {
1152 my ($path, $rmp) = @_; 1288 my ($path, $rmp) = @_;
1153 1289
1154 # mit "rum" bekleckern, nicht 1290 # mit "rum" bekleckern, nicht
1155 cf::map::_create_random_map 1291 cf::map::_create_random_map (
1156 $path, 1292 $path,
1157 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1293 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1158 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1294 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1159 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1295 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1160 $rmp->{exit_on_final_map}, 1296 $rmp->{exit_on_final_map},
1162 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1298 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1163 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1299 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1164 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1300 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1165 $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},
1166 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1302 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1167 (cf::region::find $rmp->{region}) 1303 (cf::region::find $rmp->{region}), $rmp->{custom}
1304 )
1168} 1305}
1169 1306
1170# and all this just because we cannot iterate over 1307# and all this just because we cannot iterate over
1171# all maps in C++... 1308# all maps in C++...
1172sub change_all_map_light { 1309sub change_all_map_light {
1174 1311
1175 $_->change_map_light ($change) 1312 $_->change_map_light ($change)
1176 for grep $_->outdoor, values %cf::MAP; 1313 for grep $_->outdoor, values %cf::MAP;
1177} 1314}
1178 1315
1179sub try_load_header($) { 1316sub load_map_header($) {
1180 my ($path) = @_; 1317 my ($path) = @_;
1181 1318
1182 utf8::encode $path; 1319 utf8::encode $path;
1183 aio_open $path, O_RDONLY, 0 1320 aio_open $path, O_RDONLY, 0
1184 or return; 1321 or return;
1185 1322
1186 my $map = cf::map::new 1323 my $map = cf::map::new
1187 or return; 1324 or return;
1188 1325
1326 # for better error messages only, will be overwritten later
1327 $map->path ($path);
1328
1189 $map->load_header ($path) 1329 $map->load_header ($path)
1190 or return; 1330 or return;
1191 1331
1192 $map->{load_path} = $path; 1332 $map->{load_path} = $path;
1193 1333
1207 1347
1208 $cf::MAP{$key} || do { 1348 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key"; 1349 my $guard = cf::lock_acquire "map_find:$key";
1210 1350
1211 # do it the slow way 1351 # do it the slow way
1212 my $map = try_load_header $path->save_path; 1352 my $map = $path->load_temp;
1353
1354 Coro::cede;
1213 1355
1214 if ($map) { 1356 if ($map) {
1215 $map->last_access ((delete $map->{last_access}) 1357 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d# 1358 || $cf::RUNTIME); #d#
1217 # safety 1359 # safety
1218 $map->{instantiate_time} = $cf::RUNTIME 1360 $map->{instantiate_time} = $cf::RUNTIME
1219 if $map->{instantiate_time} > $cf::RUNTIME; 1361 if $map->{instantiate_time} > $cf::RUNTIME;
1220 } else { 1362 } else {
1221 if (my $rmp = $path->random_map_params) { 1363 $map = $path->load_orig
1222 $map = generate_random_map $key, $rmp;
1223 } else {
1224 $map = try_load_header $path->load_path;
1225 }
1226
1227 $map or return; 1364 or return;
1228 1365
1229 $map->{load_original} = 1; 1366 $map->{load_original} = 1;
1230 $map->{instantiate_time} = $cf::RUNTIME; 1367 $map->{instantiate_time} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME); 1368 $map->last_access ($cf::RUNTIME);
1232 $map->instantiate; 1369 $map->instantiate;
1236 } 1373 }
1237 1374
1238 $map->path ($key); 1375 $map->path ($key);
1239 $map->{path} = $path; 1376 $map->{path} = $path;
1240 $map->{last_save} = $cf::RUNTIME; 1377 $map->{last_save} = $cf::RUNTIME;
1378
1379 Coro::cede;
1241 1380
1242 if ($map->should_reset) { 1381 if ($map->should_reset) {
1243 $map->reset; 1382 $map->reset;
1244 undef $guard; 1383 undef $guard;
1245 $map = find $path 1384 $map = find $path
1273 $self->clear_unique_items; 1412 $self->clear_unique_items;
1274 $self->load_objects ($uniq, 0); 1413 $self->load_objects ($uniq, 0);
1275 } 1414 }
1276 } 1415 }
1277 1416
1417 Coro::cede;
1418
1278 # now do the right thing for maps 1419 # now do the right thing for maps
1279 $self->link_multipart_objects; 1420 $self->link_multipart_objects;
1280 1421
1281 if ($self->{path}->is_style_map) { 1422 if ($self->{path}->is_style_map) {
1282 $self->{deny_save} = 1; 1423 $self->{deny_save} = 1;
1283 $self->{deny_reset} = 1; 1424 $self->{deny_reset} = 1;
1284 } else { 1425 } else {
1426 $self->decay_objects;
1285 $self->fix_auto_apply; 1427 $self->fix_auto_apply;
1286 $self->decay_objects;
1287 $self->update_buttons; 1428 $self->update_buttons;
1288 $self->set_darkness_map; 1429 $self->set_darkness_map;
1289 $self->difficulty ($self->estimate_difficulty) 1430 $self->difficulty ($self->estimate_difficulty)
1290 unless $self->difficulty; 1431 unless $self->difficulty;
1291 $self->activate; 1432 $self->activate;
1292 } 1433 }
1293 1434
1435 Coro::cede;
1436
1294 $self->in_memory (cf::MAP_IN_MEMORY); 1437 $self->in_memory (cf::MAP_IN_MEMORY);
1438}
1439
1440# find and load all maps in the 3x3 area around a map
1441sub load_diag {
1442 my ($map) = @_;
1443
1444 my @diag; # diagonal neighbours
1445
1446 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_)
1448 or next;
1449 $neigh = find $neigh, $map
1450 or next;
1451 $neigh->load;
1452
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 }
1456
1457 for (@diag) {
1458 my $neigh = find @$_
1459 or next;
1460 $neigh->load;
1461 }
1295} 1462}
1296 1463
1297sub find_sync { 1464sub find_sync {
1298 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1299 1466
1300 cf::sync_job { cf::map::find $path, $origin } 1467 cf::sync_job { find $path, $origin }
1301} 1468}
1302 1469
1303sub do_load_sync { 1470sub do_load_sync {
1304 my ($map) = @_; 1471 my ($map) = @_;
1305 1472
1306 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1307} 1474}
1308 1475
1476our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = Coro::async {
1478 while () {
1479 while (%MAP_PREFETCH) {
1480 my $key = each %MAP_PREFETCH
1481 or next;
1482 my $path = delete $MAP_PREFETCH{$key};
1483
1484 my $map = find $path
1485 or next;
1486 $map->load;
1487 }
1488 Coro::schedule;
1489 }
1490};
1491
1492sub find_async {
1493 my ($path, $origin) = @_;
1494
1495 $path = new cf::path $path, $origin && $origin->path;
1496 my $key = $path->as_string;
1497
1498 if (my $map = $cf::MAP{$key}) {
1499 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1500 }
1501
1502 $MAP_PREFETCH{$key} = $path;
1503 $MAP_PREFETCHER->ready;
1504
1505 ()
1506}
1507
1309sub save { 1508sub save {
1310 my ($self) = @_; 1509 my ($self) = @_;
1311 1510
1511 my $lock = cf::lock_acquire "map_data:" . $self->path;
1512
1312 $self->{last_save} = $cf::RUNTIME; 1513 $self->{last_save} = $cf::RUNTIME;
1313 1514
1314 return unless $self->dirty; 1515 return unless $self->dirty;
1315 1516
1316 my $save = $self->{path}->save_path; utf8::encode $save; 1517 my $save = $self->{path}->save_path; utf8::encode $save;
1319 $self->{load_path} = $save; 1520 $self->{load_path} = $save;
1320 1521
1321 return if $self->{deny_save}; 1522 return if $self->{deny_save};
1322 1523
1323 local $self->{last_access} = $self->last_access;#d# 1524 local $self->{last_access} = $self->last_access;#d#
1525
1526 cf::async {
1527 $_->contr->save for $self->players;
1528 };
1324 1529
1325 if ($uniq) { 1530 if ($uniq) {
1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1531 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1327 $self->save_objects ($uniq, cf::IO_UNIQUES); 1532 $self->save_objects ($uniq, cf::IO_UNIQUES);
1328 } else { 1533 } else {
1334 my ($self) = @_; 1539 my ($self) = @_;
1335 1540
1336 # save first because save cedes 1541 # save first because save cedes
1337 $self->save; 1542 $self->save;
1338 1543
1544 my $lock = cf::lock_acquire "map_data:" . $self->path;
1545
1339 return if $self->players; 1546 return if $self->players;
1340 return if $self->in_memory != cf::MAP_IN_MEMORY; 1547 return if $self->in_memory != cf::MAP_IN_MEMORY;
1341 return if $self->{deny_save}; 1548 return if $self->{deny_save};
1342 1549
1343 $self->clear; 1550 $self->clear;
1361 my ($self) = @_; 1568 my ($self) = @_;
1362 1569
1363 $self->reset_at <= $cf::RUNTIME 1570 $self->reset_at <= $cf::RUNTIME
1364} 1571}
1365 1572
1366sub unlink_save {
1367 my ($self) = @_;
1368
1369 utf8::encode (my $save = $self->{path}->save_path);
1370 aioreq_pri 3; IO::AIO::aio_unlink $save;
1371 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1372}
1373
1374sub rename { 1573sub rename {
1375 my ($self, $new_path) = @_; 1574 my ($self, $new_path) = @_;
1376 1575
1377 $self->unlink_save; 1576 $self->{path}->unlink_save;
1378 1577
1379 delete $cf::MAP{$self->path}; 1578 delete $cf::MAP{$self->path};
1380 $self->{path} = new cf::path $new_path; 1579 $self->{path} = new cf::path $new_path;
1381 $self->path ($self->{path}->as_string); 1580 $self->path ($self->{path}->as_string);
1382 $cf::MAP{$self->path} = $self; 1581 $cf::MAP{$self->path} = $self;
1385} 1584}
1386 1585
1387sub reset { 1586sub reset {
1388 my ($self) = @_; 1587 my ($self) = @_;
1389 1588
1589 my $lock = cf::lock_acquire "map_data:" . $self->path;
1590
1390 return if $self->players; 1591 return if $self->players;
1391 return if $self->{path}{user_rel};#d# 1592 return if $self->{path}{user_rel};#d#
1392 1593
1393 warn "resetting map ", $self->path;#d# 1594 warn "resetting map ", $self->path;#d#
1394 1595
1395 delete $cf::MAP{$self->path}; 1596 delete $cf::MAP{$self->path};
1396 1597
1397 $_->clear_links_to ($self) for values %cf::MAP; 1598 $_->clear_links_to ($self) for values %cf::MAP;
1398 1599
1399 $self->unlink_save; 1600 $self->{path}->unlink_save;
1400 $self->destroy; 1601 $self->destroy;
1401} 1602}
1402 1603
1403my $nuke_counter = "aaaa"; 1604my $nuke_counter = "aaaa";
1404 1605
1409 $self->reset_timeout (1); 1610 $self->reset_timeout (1);
1410 $self->rename ("{nuke}/" . ($nuke_counter++)); 1611 $self->rename ("{nuke}/" . ($nuke_counter++));
1411 $self->reset; # polite request, might not happen 1612 $self->reset; # polite request, might not happen
1412} 1613}
1413 1614
1414sub customise_for { 1615=item cf::map::unique_maps
1415 my ($map, $ob) = @_;
1416 1616
1417 if ($map->per_player) { 1617Returns an arrayref of cf::path's of all shared maps that have
1418 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1618instantiated unique items. May block.
1419 }
1420 1619
1421 $map 1620=cut
1422}
1423 1621
1424sub emergency_save { 1622sub unique_maps() {
1425 my $freeze_guard = cf::freeze_mainloop; 1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1624 or return;
1426 1625
1427 warn "enter emergency map save\n"; 1626 my @paths;
1428 1627
1429 cf::sync_job { 1628 for (@$files) {
1430 warn "begin emergency map save\n"; 1629 utf8::decode $_;
1431 $_->save for values %cf::MAP; 1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 push @paths, new cf::path $_;
1432 }; 1634 }
1433 1635
1434 warn "end emergency map save\n"; 1636 \@paths
1435} 1637}
1436 1638
1437package cf; 1639package cf;
1438 1640
1439=back 1641=back
1440 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
1441 1669
1442=head3 cf::object::player 1670=head3 cf::object::player
1443 1671
1444=over 4 1672=over 4
1445 1673
1537 # use -1 or undef as default coordinates, not 0, 0 1765 # use -1 or undef as default coordinates, not 0, 0
1538 ($x, $y) = ($map->enter_x, $map->enter_y) 1766 ($x, $y) = ($map->enter_x, $map->enter_y)
1539 if $x <=0 && $y <= 0; 1767 if $x <=0 && $y <= 0;
1540 1768
1541 $map->load; 1769 $map->load;
1770 $map->load_diag;
1542 1771
1772 return unless $self->contr->active;
1543 $self->activate_recursive; 1773 $self->activate_recursive;
1544 $self->enter_map ($map, $x, $y); 1774 $self->enter_map ($map, $x, $y);
1545} 1775}
1546 1776
1547cf::player->attach ( 1777cf::player->attach (
1560 1790
1561 # try to abort aborted map switching on player login :) 1791 # try to abort aborted map switching on player login :)
1562 # should happen only on crashes 1792 # should happen only on crashes
1563 if ($pl->ob->{_link_pos}) { 1793 if ($pl->ob->{_link_pos}) {
1564 $pl->ob->enter_link; 1794 $pl->ob->enter_link;
1565 cf::async { 1795 (async {
1566 # 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
1567 # 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);
1568 Coro::Timer::sleep 1; 1802 Coro::Timer::sleep 1;
1569 $pl->ob->leave_link; 1803 $pl->ob->leave_link;
1570 }; 1804 })->prio (2);
1571 } 1805 }
1572 }, 1806 },
1573); 1807);
1574 1808
1575=item $player_object->goto_map ($path, $x, $y) 1809=item $player_object->goto ($path, $x, $y)
1576 1810
1577=cut 1811=cut
1578 1812
1579sub cf::object::player::goto_map { 1813sub cf::object::player::goto {
1580 my ($self, $path, $x, $y) = @_; 1814 my ($self, $path, $x, $y) = @_;
1581 1815
1816 $path = new cf::path $path;
1817
1582 $self->enter_link; 1818 $self->enter_link;
1583 1819
1584 (cf::async { 1820 (async {
1585 $path = new cf::path $path;
1586
1587 my $map = cf::map::find $path->as_string; 1821 my $map = cf::map::find $path->as_string;
1588 $map = $map->customise_for ($self) if $map; 1822 $map = $map->{path}->customise_for ($map, $self) if $map;
1589 1823
1590# warn "entering ", $map->path, " at ($x, $y)\n" 1824# warn "entering ", $map->path, " at ($x, $y)\n"
1591# if $map; 1825# if $map;
1592 1826
1593 $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);
1594 1828
1595 $self->leave_link ($map, $x, $y); 1829 $self->leave_link ($map, $x, $y);
1596 })->prio (1); 1830 })->prio (1);
1597} 1831}
1598 1832
1651 1885
1652 return unless $self->type == cf::PLAYER; 1886 return unless $self->type == cf::PLAYER;
1653 1887
1654 $self->enter_link; 1888 $self->enter_link;
1655 1889
1656 (cf::async { 1890 (async {
1657 $self->deactivate_recursive; # just to be sure 1891 $self->deactivate_recursive; # just to be sure
1658 unless (eval { 1892 unless (eval {
1659 prepare_random_map $exit 1893 prepare_random_map $exit
1660 if $exit->slaying eq "/!"; 1894 if $exit->slaying eq "/!";
1661 1895
1662 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;
1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1897 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1664 1898
1665 1; 1899 1;
1666 }) { 1900 }) {
1667 $self->message ("Something went wrong deep within the crossfire server. " 1901 $self->message ("Something went wrong deep within the crossfire server. "
1668 . "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. "
1669 . "Please report this to the dungeon master", 1903 . "Please report this to the dungeon master!",
1670 cf::NDI_UNIQUE | cf::NDI_RED); 1904 cf::NDI_UNIQUE | cf::NDI_RED);
1671 1905
1672 warn "ERROR in enter_exit: $@"; 1906 warn "ERROR in enter_exit: $@";
1673 $self->leave_link; 1907 $self->leave_link;
1674 } 1908 }
1742 } 1976 }
1743 } 1977 }
1744 }, 1978 },
1745); 1979);
1746 1980
1747=item $client->coro (\&cb) 1981=item $client->async (\&cb)
1748 1982
1749Create a new coroutine, running the specified callback. The coroutine will 1983Create a new coroutine, running the specified callback. The coroutine will
1750be automatically cancelled when the client gets destroyed (e.g. on logout, 1984be automatically cancelled when the client gets destroyed (e.g. on logout,
1751or loss of connection). 1985or loss of connection).
1752 1986
1753=cut 1987=cut
1754 1988
1755sub cf::client::coro { 1989sub cf::client::async {
1756 my ($self, $cb) = @_; 1990 my ($self, $cb) = @_;
1757 1991
1758 my $coro = &cf::async ($cb); 1992 my $coro = &Coro::async ($cb);
1759 1993
1760 $coro->on_destroy (sub { 1994 $coro->on_destroy (sub {
1761 delete $self->{_coro}{$coro+0}; 1995 delete $self->{_coro}{$coro+0};
1762 }); 1996 });
1763 1997
2001 local $/; 2235 local $/;
2002 *CFG = YAML::Syck::Load <$fh>; 2236 *CFG = YAML::Syck::Load <$fh>;
2003 2237
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2238 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005 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
2006 if (exists $CFG{mlockall}) { 2243 if (exists $CFG{mlockall}) {
2007 eval { 2244 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall 2245 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2009 and die "WARNING: m(un)lockall failed: $!\n"; 2246 and die "WARNING: m(un)lockall failed: $!\n";
2010 }; 2247 };
2011 warn $@ if $@; 2248 warn $@ if $@;
2012 } 2249 }
2013} 2250}
2014 2251
2015sub main { 2252sub main {
2016 # we must not ever block the main coroutine 2253 # we must not ever block the main coroutine
2017 local $Coro::idle = sub { 2254 local $Coro::idle = sub {
2018 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#
2019 (Coro::unblock_sub {
2020 Event::one_event; 2256 async { Event::one_event };
2021 })->();
2022 }; 2257 };
2023 2258
2024 cfg_load; 2259 cfg_load;
2025 db_load; 2260 db_load;
2026 load_extensions; 2261 load_extensions;
2027 Event::loop; 2262 Event::loop;
2028} 2263}
2029 2264
2030############################################################################# 2265#############################################################################
2031# 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}
2032 2309
2033sub reload() { 2310sub reload() {
2034 # can/must only be called in main 2311 # can/must only be called in main
2035 if ($Coro::current != $Coro::main) { 2312 if ($Coro::current != $Coro::main) {
2036 warn "can only reload from main coroutine\n"; 2313 warn "can only reload from main coroutine\n";
2037 return; 2314 return;
2038 } 2315 }
2039 2316
2040 warn "reloading..."; 2317 warn "reloading...";
2041 2318
2319 warn "freezing server";
2042 my $guard = freeze_mainloop; 2320 my $guard = freeze_mainloop;
2043 cf::emergency_save; 2321 cf::emergency_save;
2044 2322
2323 warn "sync database to disk";
2324 cf::db_sync;
2325 IO::AIO::flush;
2326
2045 eval { 2327 eval {
2046 # 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
2047 2329
2048 # cancel all watchers 2330 warn "cancel all watchers";
2049 for (Event::all_watchers) { 2331 for (Event::all_watchers) {
2050 $_->cancel if $_->data & WF_AUTOCANCEL; 2332 $_->cancel if $_->data & WF_AUTOCANCEL;
2051 } 2333 }
2052 2334
2053 # cancel all extension coros 2335 warn "cancel all extension coros";
2054 $_->cancel for values %EXT_CORO; 2336 $_->cancel for values %EXT_CORO;
2055 %EXT_CORO = (); 2337 %EXT_CORO = ();
2056 2338
2339 warn "remove commands";
2340 %COMMAND = ();
2341
2342 warn "remove ext commands";
2343 %EXTCMD = ();
2344
2057 # unload all extensions 2345 warn "unload/nuke all extensions";
2058 for (@exts) { 2346 for my $pkg (@EXTS) {
2059 warn "unloading <$_>"; 2347 warn "... unloading $pkg";
2060 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: $@";
2061 } 2354 }
2062 2355
2356 warn "... nuking $pkg";
2357 Symbol::delete_package $pkg;
2358 }
2359
2063 # unload all modules loaded from $LIBDIR 2360 warn "unload all perl modules loaded from $LIBDIR";
2064 while (my ($k, $v) = each %INC) { 2361 while (my ($k, $v) = each %INC) {
2065 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2362 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2066 2363
2067 warn "removing <$k>"; 2364 warn "removing <$k>";
2068 delete $INC{$k}; 2365 delete $INC{$k};
2075 } 2372 }
2076 2373
2077 Symbol::delete_package $k; 2374 Symbol::delete_package $k;
2078 } 2375 }
2079 2376
2080 # sync database to disk
2081 cf::db_sync;
2082 IO::AIO::flush;
2083
2084 # get rid of safe::, as good as possible 2377 warn "get rid of safe::, as good as possible";
2085 Symbol::delete_package "safe::$_" 2378 Symbol::delete_package "safe::$_"
2086 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);
2087 2380
2088 # remove register_script_function callbacks
2089 # TODO
2090
2091 # unload cf.pm "a bit" 2381 warn "unload cf.pm \"a bit\"";
2092 delete $INC{"cf.pm"}; 2382 delete $INC{"cf.pm"};
2093 2383
2094 # don't, removes xs symbols, too, 2384 # don't, removes xs symbols, too,
2095 # and global variables created in xs 2385 # and global variables created in xs
2096 #Symbol::delete_package __PACKAGE__; 2386 #Symbol::delete_package __PACKAGE__;
2097 2387
2098 # reload cf.pm
2099 warn "reloading cf.pm"; 2388 warn "reloading cf.pm";
2100 require cf; 2389 require cf;
2101 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2390 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2102 2391
2103 # load config and database again 2392 warn "load config and database again";
2104 cf::cfg_load; 2393 cf::cfg_load;
2105 cf::db_load; 2394 cf::db_load;
2106 2395
2107 # load extensions
2108 warn "load extensions"; 2396 warn "load extensions";
2109 cf::load_extensions; 2397 cf::load_extensions;
2110 2398
2111 # reattach attachments to objects 2399 warn "reattach attachments to objects/players";
2112 warn "reattach";
2113 _global_reattach; 2400 _global_reattach;
2401 warn "reattach attachments to maps";
2402 reattach $_ for values %MAP;
2114 }; 2403 };
2115 2404
2116 if ($@) { 2405 if ($@) {
2117 warn $@; 2406 warn $@;
2118 warn "error while reloading, exiting."; 2407 warn "error while reloading, exiting.";
2119 exit 1; 2408 exit 1;
2120 } 2409 }
2121 2410
2122 warn "reloaded successfully"; 2411 warn "reloaded";
2123}; 2412};
2124 2413
2125############################################################################# 2414#############################################################################
2126 2415
2127unless ($LINK_MAP) { 2416unless ($LINK_MAP) {
2134 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2423 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2135 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2424 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2136 2425
2137 # dirty hack because... archetypes are not yet loaded 2426 # dirty hack because... archetypes are not yet loaded
2138 Event->timer ( 2427 Event->timer (
2139 after => 2, 2428 after => 10,
2140 cb => sub { 2429 cb => sub {
2141 $_[0]->w->cancel; 2430 $_[0]->w->cancel;
2142 2431
2143 # provide some exits "home" 2432 # provide some exits "home"
2144 my $exit = cf::object::new "exit"; 2433 my $exit = cf::object::new "exit";
2163 $LINK_MAP->{deny_reset} = 1; 2452 $LINK_MAP->{deny_reset} = 1;
2164 2453
2165 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2454 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2166} 2455}
2167 2456
2168register "<global>", __PACKAGE__;
2169
2170register_command "reload" => sub { 2457register_command "reload" => sub {
2171 my ($who, $arg) = @_; 2458 my ($who, $arg) = @_;
2172 2459
2173 if ($who->flag (FLAG_WIZ)) { 2460 if ($who->flag (FLAG_WIZ)) {
2174 $who->message ("start of reload."); 2461 $who->message ("start of reload.");
2183 reentrant => 0, 2470 reentrant => 0,
2184 prio => 0, 2471 prio => 0,
2185 at => $NEXT_TICK || $TICK, 2472 at => $NEXT_TICK || $TICK,
2186 data => WF_AUTOCANCEL, 2473 data => WF_AUTOCANCEL,
2187 cb => sub { 2474 cb => sub {
2475 $NOW = Event::time;
2476
2188 cf::server_tick; # one server iteration 2477 cf::server_tick; # one server iteration
2189 $RUNTIME += $TICK; 2478 $RUNTIME += $TICK;
2190 $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;
2191 2483
2192 # 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
2193 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2485 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2194 2486
2195 $TICK_WATCHER->at ($NEXT_TICK); 2487 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines