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.132 by root, Thu Jan 4 01:35:56 2007 UTC vs.
Revision 1.164 by root, Thu Jan 11 01:24:25 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}
459 ? undef
460 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path 501 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
461}
462
463# return random map parameters, or undef
464sub random_map_params {
465 my ($self) = @_;
466
467 $self->{random}
468} 502}
469 503
470# this is somewhat ugly, but style maps do need special treatment 504# this is somewhat ugly, but style maps do need special treatment
471sub is_style_map { 505sub is_style_map {
472 $_[0]{path} =~ m{^/styles/} 506 $_[0]{path} =~ m{^/styles/}
507}
508
509sub load_orig {
510 my ($self) = @_;
511
512 &cf::map::load_map_header ($self->load_path)
513}
514
515sub load_temp {
516 my ($self) = @_;
517
518 &cf::map::load_map_header ($self->save_path)
519}
520
521sub unlink_save {
522 my ($self) = @_;
523
524 utf8::encode (my $save = $self->save_path);
525 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save;
526 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst";
473} 527}
474 528
475package cf; 529package cf;
476 530
477############################################################################# 531#############################################################################
927=cut 981=cut
928 982
929sub register_extcmd { 983sub register_extcmd {
930 my ($name, $cb) = @_; 984 my ($name, $cb) = @_;
931 985
932 my $caller = caller;
933 #warn "registering extcmd '$name' to '$caller'";
934
935 $EXTCMD{$name} = [$cb, $caller]; 986 $EXTCMD{$name} = $cb;
936} 987}
937 988
938cf::player->attach ( 989cf::player->attach (
939 on_command => sub { 990 on_command => sub {
940 my ($pl, $name, $params) = @_; 991 my ($pl, $name, $params) = @_;
953 1004
954 my $msg = eval { from_json $buf }; 1005 my $msg = eval { from_json $buf };
955 1006
956 if (ref $msg) { 1007 if (ref $msg) {
957 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1008 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
958 if (my %reply = $cb->[0]->($pl, $msg)) { 1009 if (my %reply = $cb->($pl, $msg)) {
959 $pl->ext_reply ($msg->{msgid}, %reply); 1010 $pl->ext_reply ($msg->{msgid}, %reply);
960 } 1011 }
961 } 1012 }
962 } else { 1013 } else {
963 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1014 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
965 1016
966 cf::override; 1017 cf::override;
967 }, 1018 },
968); 1019);
969 1020
970sub register {
971 my ($base, $pkg) = @_;
972
973 #TODO
974}
975
976sub load_extension { 1021sub load_extension {
977 my ($path) = @_; 1022 my ($path) = @_;
978 1023
979 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1024 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
980 my $base = $1; 1025 my $base = $1;
981 my $pkg = $1; 1026 my $pkg = $1;
982 $pkg =~ s/[^[:word:]]/_/g; 1027 $pkg =~ s/[^[:word:]]/_/g;
983 $pkg = "ext::$pkg"; 1028 $pkg = "ext::$pkg";
984 1029
985 warn "loading '$path' into '$pkg'\n"; 1030 warn "... loading '$path' into '$pkg'\n";
986 1031
987 open my $fh, "<:utf8", $path 1032 open my $fh, "<:utf8", $path
988 or die "$path: $!"; 1033 or die "$path: $!";
989 1034
990 my $source = 1035 my $source =
995 1040
996 eval $source 1041 eval $source
997 or die $@ ? "$path: $@\n" 1042 or die $@ ? "$path: $@\n"
998 : "extension disabled.\n"; 1043 : "extension disabled.\n";
999 1044
1000 push @exts, $pkg; 1045 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} 1046}
1045 1047
1046sub load_extensions { 1048sub load_extensions {
1047 for my $ext (<$LIBDIR/*.ext>) { 1049 for my $ext (<$LIBDIR/*.ext>) {
1048 next unless -r $ext; 1050 next unless -r $ext;
1066}; 1068};
1067 1069
1068cf::map->attach (prio => -10000, package => cf::mapsupport::); 1070cf::map->attach (prio => -10000, package => cf::mapsupport::);
1069 1071
1070############################################################################# 1072#############################################################################
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 1073
1094=head2 CORE EXTENSIONS 1074=head2 CORE EXTENSIONS
1095 1075
1096Functions and methods that extend core crossfire objects. 1076Functions and methods that extend core crossfire objects.
1097 1077
1078=cut
1079
1080package cf::player;
1081
1082use Coro::AIO;
1083
1098=head3 cf::player 1084=head3 cf::player
1099 1085
1100=over 4 1086=over 4
1101 1087
1102=item cf::player::exists $login 1088=item cf::player::find $login
1103 1089
1104Returns true when the given account exists. 1090Returns the given player object, loading it if necessary (might block).
1105 1091
1106=cut 1092=cut
1107 1093
1108sub cf::player::exists($) { 1094sub playerdir($) {
1109 cf::player::find $_[0] 1095 cf::localdir
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1096 . "/"
1097 . cf::playerdir
1098 . "/"
1099 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1100}
1101
1102sub path($) {
1103 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1104
1105 (playerdir $login) . "/$login.pl"
1106}
1107
1108sub find_active($) {
1109 $cf::PLAYER{$_[0]}
1110 and $cf::PLAYER{$_[0]}->active
1111 and $cf::PLAYER{$_[0]}
1112}
1113
1114sub exists($) {
1115 my ($login) = @_;
1116
1117 $cf::PLAYER{$login}
1118 or cf::sync_job { !aio_stat $login }
1119}
1120
1121sub find($) {
1122 return $cf::PLAYER{$_[0]} || do {
1123 my $login = $_[0];
1124
1125 my $guard = cf::lock_acquire "user_find:$login";
1126
1127 $cf::PLAYER{$_[0]} || do {
1128 my $pl = load_pl path $login
1129 or return;
1130 $cf::PLAYER{$login} = $pl
1131 }
1132 }
1133}
1134
1135sub save($) {
1136 my ($pl) = @_;
1137
1138 return if $pl->{deny_save};
1139
1140 my $path = path $pl;
1141 my $guard = cf::lock_acquire "user_save:$path";
1142
1143 return if $pl->{deny_save};
1144
1145 aio_mkdir playerdir $pl, 0770;
1146 $pl->{last_save} = $cf::RUNTIME;
1147
1148 $pl->save_pl ($path);
1149 Coro::cede;
1150}
1151
1152sub new($) {
1153 my ($login) = @_;
1154
1155 my $self = create;
1156
1157 $self->ob->name ($login);
1158 $self->{deny_save} = 1;
1159
1160 $cf::PLAYER{$login} = $self;
1161
1162 $self
1163}
1164
1165=item $pl->quit_character
1166
1167Nukes the player without looking back. If logged in, the connection will
1168be destroyed. May block for a long time.
1169
1170=cut
1171
1172sub quit_character {
1173 my ($pl) = @_;
1174
1175 $pl->{deny_save} = 1;
1176 $pl->password ("*"); # this should lock out the player until we nuked the dir
1177
1178 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1179 $pl->deactivate;
1180 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1181 $pl->ns->destroy if $pl->ns;
1182
1183 my $path = playerdir $pl;
1184 my $temp = "$path~$cf::RUNTIME~deleting~";
1185 aio_rename $path, $temp;
1186 delete $cf::PLAYER{$pl->ob->name};
1187 $pl->destroy;
1188 IO::AIO::aio_rmtree $temp;
1189}
1190
1191=item cf::player::list_logins
1192
1193Returns am arrayref of all valid playernames in the system, can take a
1194while and may block, so not sync_job-capable, ever.
1195
1196=cut
1197
1198sub list_logins {
1199 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1200 or return [];
1201
1202 my @logins;
1203
1204 for my $login (@$dirs) {
1205 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1206 aio_read $fh, 0, 512, my $buf, 0 or next;
1207 $buf !~ /^password -------------$/m or next; # official not-valid tag
1208
1209 utf8::decode $login;
1210 push @logins, $login;
1211 }
1212
1213 \@logins
1214}
1215
1216=item $player->maps
1217
1218Returns an arrayref of cf::path's of all maps that are private for this
1219player. May block.
1220
1221=cut
1222
1223sub maps($) {
1224 my ($pl) = @_;
1225
1226 my $files = aio_readdir playerdir $pl
1227 or return;
1228
1229 my @paths;
1230
1231 for (@$files) {
1232 utf8::decode $_;
1233 next if /\.(?:pl|pst)$/;
1234 next unless /^$PATH_SEP/o;
1235
1236 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1237 }
1238
1239 \@paths
1111} 1240}
1112 1241
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1242=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1243
1115Sends an ext reply to the player. 1244Sends an ext reply to the player.
1116 1245
1117=cut 1246=cut
1118 1247
1119sub cf::player::ext_reply($$$%) { 1248sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1249 my ($self, $id, %msg) = @_;
1121 1250
1122 $msg{msgid} = $id; 1251 $msg{msgid} = $id;
1123 1252
1124 $self->send ("ext " . to_json \%msg); 1253 $self->send ("ext " . cf::to_json \%msg);
1125} 1254}
1255
1256package cf;
1126 1257
1127=back 1258=back
1128 1259
1129 1260
1130=head3 cf::map 1261=head3 cf::map
1136package cf::map; 1267package cf::map;
1137 1268
1138use Fcntl; 1269use Fcntl;
1139use Coro::AIO; 1270use Coro::AIO;
1140 1271
1141our $MAX_RESET = 7200; 1272our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1273our $DEFAULT_RESET = 3000;
1143 1274
1144sub generate_random_map { 1275sub generate_random_map {
1145 my ($path, $rmp) = @_; 1276 my ($path, $rmp) = @_;
1146 1277
1147 # mit "rum" bekleckern, nicht 1278 # mit "rum" bekleckern, nicht
1148 cf::map::_create_random_map 1279 cf::map::_create_random_map (
1149 $path, 1280 $path,
1150 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1281 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1151 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1282 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1152 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1283 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1153 $rmp->{exit_on_final_map}, 1284 $rmp->{exit_on_final_map},
1155 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1286 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1156 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1287 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1157 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1288 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1158 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1289 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1159 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1290 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1160 (cf::region::find $rmp->{region}) 1291 (cf::region::find $rmp->{region}), $rmp->{custom}
1292 )
1161} 1293}
1162 1294
1163# and all this just because we cannot iterate over 1295# and all this just because we cannot iterate over
1164# all maps in C++... 1296# all maps in C++...
1165sub change_all_map_light { 1297sub change_all_map_light {
1167 1299
1168 $_->change_map_light ($change) 1300 $_->change_map_light ($change)
1169 for grep $_->outdoor, values %cf::MAP; 1301 for grep $_->outdoor, values %cf::MAP;
1170} 1302}
1171 1303
1172sub try_load_header($) { 1304sub load_map_header($) {
1173 my ($path) = @_; 1305 my ($path) = @_;
1174 1306
1175 utf8::encode $path; 1307 utf8::encode $path;
1176 aio_open $path, O_RDONLY, 0 1308 aio_open $path, O_RDONLY, 0
1177 or return; 1309 or return;
1178 1310
1179 my $map = cf::map::new 1311 my $map = cf::map::new
1180 or return; 1312 or return;
1181 1313
1314 # for better error messages only, will be overwritten later
1315 $map->path ($path);
1316
1182 $map->load_header ($path) 1317 $map->load_header ($path)
1183 or return; 1318 or return;
1184 1319
1185 $map->{load_path} = $path; 1320 $map->{load_path} = $path;
1186 1321
1187 $map 1322 $map
1188} 1323}
1189 1324
1190sub find_map; 1325sub find;
1191sub find_map { 1326sub find {
1192 my ($path, $origin) = @_; 1327 my ($path, $origin) = @_;
1193 1328
1194 #warn "find_map<$path,$origin>\n";#d# 1329 #warn "find<$path,$origin>\n";#d#
1195 1330
1196 $path = new cf::path $path, $origin && $origin->path; 1331 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1332 my $key = $path->as_string;
1198 1333
1199 cf::lock_wait "map_find:$key"; 1334 cf::lock_wait "map_find:$key";
1200 1335
1201 $cf::MAP{$key} || do { 1336 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1337 my $guard = cf::lock_acquire "map_find:$key";
1203 1338
1204 # do it the slow way 1339 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1340 my $map = $path->load_temp;
1341
1342 Coro::cede;
1206 1343
1207 if ($map) { 1344 if ($map) {
1208 $map->last_access ((delete $map->{last_access}) 1345 $map->last_access ((delete $map->{last_access})
1209 || $cf::RUNTIME); #d# 1346 || $cf::RUNTIME); #d#
1210 # safety 1347 # safety
1211 $map->{instantiate_time} = $cf::RUNTIME 1348 $map->{instantiate_time} = $cf::RUNTIME
1212 if $map->{instantiate_time} > $cf::RUNTIME; 1349 if $map->{instantiate_time} > $cf::RUNTIME;
1213 } else { 1350 } else {
1214 if (my $rmp = $path->random_map_params) { 1351 $map = $path->load_orig
1215 $map = generate_random_map $key, $rmp;
1216 } else {
1217 $map = try_load_header $path->load_path;
1218 }
1219
1220 $map or return; 1352 or return;
1221 1353
1222 $map->{load_original} = 1; 1354 $map->{load_original} = 1;
1223 $map->{instantiate_time} = $cf::RUNTIME; 1355 $map->{instantiate_time} = $cf::RUNTIME;
1224 $map->last_access ($cf::RUNTIME); 1356 $map->last_access ($cf::RUNTIME);
1225 $map->instantiate; 1357 $map->instantiate;
1230 1362
1231 $map->path ($key); 1363 $map->path ($key);
1232 $map->{path} = $path; 1364 $map->{path} = $path;
1233 $map->{last_save} = $cf::RUNTIME; 1365 $map->{last_save} = $cf::RUNTIME;
1234 1366
1367 Coro::cede;
1368
1235 if ($map->should_reset) { 1369 if ($map->should_reset) {
1236 $map->reset; 1370 $map->reset;
1237 undef $guard; 1371 undef $guard;
1238 $map = find_map $path 1372 $map = find $path
1239 or return; 1373 or return;
1240 } 1374 }
1241 1375
1242 $cf::MAP{$key} = $map 1376 $cf::MAP{$key} = $map
1243 } 1377 }
1266 $self->clear_unique_items; 1400 $self->clear_unique_items;
1267 $self->load_objects ($uniq, 0); 1401 $self->load_objects ($uniq, 0);
1268 } 1402 }
1269 } 1403 }
1270 1404
1405 Coro::cede;
1406
1271 # now do the right thing for maps 1407 # now do the right thing for maps
1272 $self->link_multipart_objects; 1408 $self->link_multipart_objects;
1273 1409
1274 if ($self->{path}->is_style_map) { 1410 if ($self->{path}->is_style_map) {
1275 $self->{deny_save} = 1; 1411 $self->{deny_save} = 1;
1276 $self->{deny_reset} = 1; 1412 $self->{deny_reset} = 1;
1277 } else { 1413 } else {
1414 $self->decay_objects;
1278 $self->fix_auto_apply; 1415 $self->fix_auto_apply;
1279 $self->decay_objects;
1280 $self->update_buttons; 1416 $self->update_buttons;
1281 $self->set_darkness_map; 1417 $self->set_darkness_map;
1282 $self->difficulty ($self->estimate_difficulty) 1418 $self->difficulty ($self->estimate_difficulty)
1283 unless $self->difficulty; 1419 unless $self->difficulty;
1284 $self->activate; 1420 $self->activate;
1285 } 1421 }
1286 1422
1423 Coro::cede;
1424
1287 $self->in_memory (cf::MAP_IN_MEMORY); 1425 $self->in_memory (cf::MAP_IN_MEMORY);
1288} 1426}
1289 1427
1290sub load_map_sync { 1428# find and load all maps in the 3x3 area around a map
1429sub load_diag {
1430 my ($map) = @_;
1431
1432 my @diag; # diagonal neighbours
1433
1434 for (0 .. 3) {
1435 my $neigh = $map->tile_path ($_)
1436 or next;
1437 $neigh = find $neigh, $map
1438 or next;
1439 $neigh->load;
1440
1441 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1442 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1443 }
1444
1445 for (@diag) {
1446 my $neigh = find @$_
1447 or next;
1448 $neigh->load;
1449 }
1450}
1451
1452sub find_sync {
1291 my ($path, $origin) = @_; 1453 my ($path, $origin) = @_;
1292 1454
1293 #warn "load_map_sync<$path, $origin>\n";#d# 1455 cf::sync_job { find $path, $origin }
1456}
1294 1457
1295 cf::sync_job { 1458sub do_load_sync {
1296 my $map = cf::map::find_map $path, $origin 1459 my ($map) = @_;
1460
1461 cf::sync_job { $map->load };
1462}
1463
1464our %MAP_PREFETCH;
1465our $MAP_PREFETCHER = Coro::async {
1466 while () {
1467 while (%MAP_PREFETCH) {
1468 my $key = each %MAP_PREFETCH
1297 or return; 1469 or next;
1470 my $path = delete $MAP_PREFETCH{$key};
1471
1472 my $map = find $path
1473 or next;
1298 $map->load; 1474 $map->load;
1299 $map 1475 }
1476 Coro::schedule;
1300 } 1477 }
1478};
1479
1480sub find_async {
1481 my ($path, $origin) = @_;
1482
1483 $path = new cf::path $path, $origin && $origin->path;
1484 my $key = $path->as_string;
1485
1486 if (my $map = $cf::MAP{$key}) {
1487 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1488 }
1489
1490 $MAP_PREFETCH{$key} = $path;
1491 $MAP_PREFETCHER->ready;
1492
1493 ()
1301} 1494}
1302 1495
1303sub save { 1496sub save {
1304 my ($self) = @_; 1497 my ($self) = @_;
1305 1498
1499 my $lock = cf::lock_acquire "map_data:" . $self->path;
1500
1306 $self->{last_save} = $cf::RUNTIME; 1501 $self->{last_save} = $cf::RUNTIME;
1307 1502
1308 return unless $self->dirty; 1503 return unless $self->dirty;
1309 1504
1310 my $save = $self->{path}->save_path; utf8::encode $save; 1505 my $save = $self->{path}->save_path; utf8::encode $save;
1313 $self->{load_path} = $save; 1508 $self->{load_path} = $save;
1314 1509
1315 return if $self->{deny_save}; 1510 return if $self->{deny_save};
1316 1511
1317 local $self->{last_access} = $self->last_access;#d# 1512 local $self->{last_access} = $self->last_access;#d#
1513
1514 cf::async {
1515 $_->contr->save for $self->players;
1516 };
1318 1517
1319 if ($uniq) { 1518 if ($uniq) {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1519 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1321 $self->save_objects ($uniq, cf::IO_UNIQUES); 1520 $self->save_objects ($uniq, cf::IO_UNIQUES);
1322 } else { 1521 } else {
1328 my ($self) = @_; 1527 my ($self) = @_;
1329 1528
1330 # save first because save cedes 1529 # save first because save cedes
1331 $self->save; 1530 $self->save;
1332 1531
1532 my $lock = cf::lock_acquire "map_data:" . $self->path;
1533
1333 return if $self->players; 1534 return if $self->players;
1334 return if $self->in_memory != cf::MAP_IN_MEMORY; 1535 return if $self->in_memory != cf::MAP_IN_MEMORY;
1335 return if $self->{deny_save}; 1536 return if $self->{deny_save};
1336 1537
1337 $self->clear; 1538 $self->clear;
1355 my ($self) = @_; 1556 my ($self) = @_;
1356 1557
1357 $self->reset_at <= $cf::RUNTIME 1558 $self->reset_at <= $cf::RUNTIME
1358} 1559}
1359 1560
1360sub unlink_save {
1361 my ($self) = @_;
1362
1363 utf8::encode (my $save = $self->{path}->save_path);
1364 aioreq_pri 3; IO::AIO::aio_unlink $save;
1365 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1366}
1367
1368sub rename { 1561sub rename {
1369 my ($self, $new_path) = @_; 1562 my ($self, $new_path) = @_;
1370 1563
1371 $self->unlink_save; 1564 $self->{path}->unlink_save;
1372 1565
1373 delete $cf::MAP{$self->path}; 1566 delete $cf::MAP{$self->path};
1374 $self->{path} = new cf::path $new_path; 1567 $self->{path} = new cf::path $new_path;
1375 $self->path ($self->{path}->as_string); 1568 $self->path ($self->{path}->as_string);
1376 $cf::MAP{$self->path} = $self; 1569 $cf::MAP{$self->path} = $self;
1379} 1572}
1380 1573
1381sub reset { 1574sub reset {
1382 my ($self) = @_; 1575 my ($self) = @_;
1383 1576
1577 my $lock = cf::lock_acquire "map_data:" . $self->path;
1578
1384 return if $self->players; 1579 return if $self->players;
1385 return if $self->{path}{user_rel};#d# 1580 return if $self->{path}{user_rel};#d#
1386 1581
1387 warn "resetting map ", $self->path;#d# 1582 warn "resetting map ", $self->path;#d#
1388 1583
1389 delete $cf::MAP{$self->path}; 1584 delete $cf::MAP{$self->path};
1390 1585
1391 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1392 1587
1393 $self->unlink_save; 1588 $self->{path}->unlink_save;
1394 $self->destroy; 1589 $self->destroy;
1395} 1590}
1396 1591
1397my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1398 1593
1407 1602
1408sub customise_for { 1603sub customise_for {
1409 my ($map, $ob) = @_; 1604 my ($map, $ob) = @_;
1410 1605
1411 if ($map->per_player) { 1606 if ($map->per_player) {
1412 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1607 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1413 } 1608 }
1414 1609
1415 $map 1610 $map
1416} 1611}
1417 1612
1418sub emergency_save { 1613=item cf::map::unique_maps
1419 local $cf::FREEZE = 1;
1420 1614
1421 warn "enter emergency map save\n"; 1615Returns an arrayref of cf::path's of all shared maps that have
1616instantiated unique items. May block.
1422 1617
1423 cf::sync_job { 1618=cut
1424 warn "begin emergency map save\n"; 1619
1425 $_->save for values %cf::MAP; 1620sub unique_maps() {
1621 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1622 or return;
1623
1624 my @paths;
1625
1626 for (@$files) {
1627 utf8::decode $_;
1628 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o;
1630
1631 push @paths, new cf::path $_;
1426 }; 1632 }
1427 1633
1428 warn "end emergency map save\n"; 1634 \@paths
1429} 1635}
1430 1636
1431package cf; 1637package cf;
1432 1638
1433=back 1639=back
1434 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1435 1667
1436=head3 cf::object::player 1668=head3 cf::object::player
1437 1669
1438=over 4 1670=over 4
1439 1671
1514 my $link_pos = delete $self->{_link_pos}; 1746 my $link_pos = delete $self->{_link_pos};
1515 1747
1516 unless ($map) { 1748 unless ($map) {
1517 # restore original map position 1749 # restore original map position
1518 ($map, $x, $y) = @{ $link_pos || [] }; 1750 ($map, $x, $y) = @{ $link_pos || [] };
1519 $map = cf::map::find_map $map; 1751 $map = cf::map::find $map;
1520 1752
1521 unless ($map) { 1753 unless ($map) {
1522 ($map, $x, $y) = @$EMERGENCY_POSITION; 1754 ($map, $x, $y) = @$EMERGENCY_POSITION;
1523 $map = cf::map::find_map $map 1755 $map = cf::map::find $map
1524 or die "FATAL: cannot load emergency map\n"; 1756 or die "FATAL: cannot load emergency map\n";
1525 } 1757 }
1526 } 1758 }
1527 1759
1528 ($x, $y) = (-1, -1) 1760 ($x, $y) = (-1, -1)
1531 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1532 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1533 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1534 1766
1535 $map->load; 1767 $map->load;
1768 $map->load_diag;
1536 1769
1770 return unless $self->contr->active;
1537 $self->activate_recursive; 1771 $self->activate_recursive;
1538 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1539} 1773}
1540 1774
1541cf::player->attach ( 1775cf::player->attach (
1554 1788
1555 # try to abort aborted map switching on player login :) 1789 # try to abort aborted map switching on player login :)
1556 # should happen only on crashes 1790 # should happen only on crashes
1557 if ($pl->ob->{_link_pos}) { 1791 if ($pl->ob->{_link_pos}) {
1558 $pl->ob->enter_link; 1792 $pl->ob->enter_link;
1559 cf::async { 1793 (async {
1560 # we need this sleep as the login has a concurrent enter_exit running 1794 # we need this sleep as the login has a concurrent enter_exit running
1561 # and this sleep increases chances of the player not ending up in scorn 1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED);
1562 Coro::Timer::sleep 1; 1800 Coro::Timer::sleep 1;
1563 $pl->ob->leave_link; 1801 $pl->ob->leave_link;
1564 }; 1802 })->prio (2);
1565 } 1803 }
1566 }, 1804 },
1567); 1805);
1568 1806
1569=item $player_object->goto_map ($path, $x, $y) 1807=item $player_object->goto ($path, $x, $y)
1570 1808
1571=cut 1809=cut
1572 1810
1573sub cf::object::player::goto_map { 1811sub cf::object::player::goto {
1574 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1575 1813
1814 $path = new cf::path $path;
1815
1576 $self->enter_link; 1816 $self->enter_link;
1577 1817
1578 (cf::async { 1818 (async {
1579 $path = new cf::path $path;
1580
1581 my $map = cf::map::find_map $path->as_string; 1819 my $map = cf::map::find $path->as_string;
1582 $map = $map->customise_for ($self) if $map; 1820 $map = $map->customise_for ($self) if $map;
1583 1821
1584# warn "entering ", $map->path, " at ($x, $y)\n" 1822# warn "entering ", $map->path, " at ($x, $y)\n"
1585# if $map; 1823# if $map;
1586 1824
1587 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1825 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1588 1826
1589 $self->leave_link ($map, $x, $y); 1827 $self->leave_link ($map, $x, $y);
1590 })->prio (1); 1828 })->prio (1);
1591} 1829}
1592 1830
1645 1883
1646 return unless $self->type == cf::PLAYER; 1884 return unless $self->type == cf::PLAYER;
1647 1885
1648 $self->enter_link; 1886 $self->enter_link;
1649 1887
1650 (cf::async { 1888 (async {
1889 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1890 unless (eval {
1652 prepare_random_map $exit 1891 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1892 if $exit->slaying eq "/!";
1654 1893
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1894 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1895 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1896
1658 1; 1897 1;
1659 }) { 1898 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1899 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1900 . "I'll try to bring you back to the map you were before. "
1662 . "Please report this to the dungeon master", 1901 . "Please report this to the dungeon master!",
1663 cf::NDI_UNIQUE | cf::NDI_RED); 1902 cf::NDI_UNIQUE | cf::NDI_RED);
1664 1903
1665 warn "ERROR in enter_exit: $@"; 1904 warn "ERROR in enter_exit: $@";
1666 $self->leave_link; 1905 $self->leave_link;
1667 } 1906 }
1735 } 1974 }
1736 } 1975 }
1737 }, 1976 },
1738); 1977);
1739 1978
1740=item $client->coro (\&cb) 1979=item $client->async (\&cb)
1741 1980
1742Create a new coroutine, running the specified callback. The coroutine will 1981Create a new coroutine, running the specified callback. The coroutine will
1743be automatically cancelled when the client gets destroyed (e.g. on logout, 1982be automatically cancelled when the client gets destroyed (e.g. on logout,
1744or loss of connection). 1983or loss of connection).
1745 1984
1746=cut 1985=cut
1747 1986
1748sub cf::client::coro { 1987sub cf::client::async {
1749 my ($self, $cb) = @_; 1988 my ($self, $cb) = @_;
1750 1989
1751 my $coro = &cf::async ($cb); 1990 my $coro = &Coro::async ($cb);
1752 1991
1753 $coro->on_destroy (sub { 1992 $coro->on_destroy (sub {
1754 delete $self->{_coro}{$coro+0}; 1993 delete $self->{_coro}{$coro+0};
1755 }); 1994 });
1756 1995
1994 local $/; 2233 local $/;
1995 *CFG = YAML::Syck::Load <$fh>; 2234 *CFG = YAML::Syck::Load <$fh>;
1996 2235
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2236 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998 2237
2238 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2239 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2240
1999 if (exists $CFG{mlockall}) { 2241 if (exists $CFG{mlockall}) {
2000 eval { 2242 eval {
2001 $CFG{mlockall} ? &mlockall : &munlockall 2243 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2002 and die "WARNING: m(un)lockall failed: $!\n"; 2244 and die "WARNING: m(un)lockall failed: $!\n";
2003 }; 2245 };
2004 warn $@ if $@; 2246 warn $@ if $@;
2005 } 2247 }
2006} 2248}
2007 2249
2008sub main { 2250sub main {
2009 # we must not ever block the main coroutine 2251 # we must not ever block the main coroutine
2010 local $Coro::idle = sub { 2252 local $Coro::idle = sub {
2011 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2253 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2012 (Coro::unblock_sub {
2013 Event::one_event; 2254 async { Event::one_event };
2014 })->();
2015 }; 2255 };
2016 2256
2017 cfg_load; 2257 cfg_load;
2018 db_load; 2258 db_load;
2019 load_extensions; 2259 load_extensions;
2020 Event::loop; 2260 Event::loop;
2021} 2261}
2022 2262
2023############################################################################# 2263#############################################################################
2024# initialisation 2264# initialisation and cleanup
2265
2266# install some emergency cleanup handlers
2267BEGIN {
2268 for my $signal (qw(INT HUP TERM)) {
2269 Event->signal (
2270 data => WF_AUTOCANCEL,
2271 signal => $signal,
2272 cb => sub {
2273 cf::cleanup "SIG$signal";
2274 },
2275 );
2276 }
2277}
2278
2279sub emergency_save() {
2280 my $freeze_guard = cf::freeze_mainloop;
2281
2282 warn "enter emergency perl save\n";
2283
2284 cf::sync_job {
2285 # use a peculiar iteration method to avoid tripping on perl
2286 # refcount bugs in for. also avoids problems with players
2287 # and maps saved/Destroyed asynchronously.
2288 warn "begin emergency player save\n";
2289 for my $login (keys %cf::PLAYER) {
2290 my $pl = $cf::PLAYER{$login} or next;
2291 $pl->valid or next;
2292 $pl->save;
2293 }
2294 warn "end emergency player save\n";
2295
2296 warn "begin emergency map save\n";
2297 for my $path (keys %cf::MAP) {
2298 my $map = $cf::MAP{$path} or next;
2299 $map->valid or next;
2300 $map->save;
2301 }
2302 warn "end emergency map save\n";
2303 };
2304
2305 warn "leave emergency perl save\n";
2306}
2025 2307
2026sub reload() { 2308sub reload() {
2027 # can/must only be called in main 2309 # can/must only be called in main
2028 if ($Coro::current != $Coro::main) { 2310 if ($Coro::current != $Coro::main) {
2029 warn "can only reload from main coroutine\n"; 2311 warn "can only reload from main coroutine\n";
2030 return; 2312 return;
2031 } 2313 }
2032 2314
2033 warn "reloading..."; 2315 warn "reloading...";
2034 2316
2035 local $FREEZE = 1; 2317 warn "freezing server";
2318 my $guard = freeze_mainloop;
2036 cf::emergency_save; 2319 cf::emergency_save;
2320
2321 warn "sync database to disk";
2322 cf::db_sync;
2323 IO::AIO::flush;
2037 2324
2038 eval { 2325 eval {
2039 # if anything goes wrong in here, we should simply crash as we already saved 2326 # if anything goes wrong in here, we should simply crash as we already saved
2040 2327
2041 # cancel all watchers 2328 warn "cancel all watchers";
2042 for (Event::all_watchers) { 2329 for (Event::all_watchers) {
2043 $_->cancel if $_->data & WF_AUTOCANCEL; 2330 $_->cancel if $_->data & WF_AUTOCANCEL;
2044 } 2331 }
2045 2332
2046 # cancel all extension coros 2333 warn "cancel all extension coros";
2047 $_->cancel for values %EXT_CORO; 2334 $_->cancel for values %EXT_CORO;
2048 %EXT_CORO = (); 2335 %EXT_CORO = ();
2049 2336
2337 warn "remove commands";
2338 %COMMAND = ();
2339
2340 warn "remove ext commands";
2341 %EXTCMD = ();
2342
2050 # unload all extensions 2343 warn "unload/nuke all extensions";
2051 for (@exts) { 2344 for my $pkg (@EXTS) {
2052 warn "unloading <$_>"; 2345 warn "... unloading $pkg";
2053 unload_extension $_; 2346
2347 if (my $cb = $pkg->can ("unload")) {
2348 eval {
2349 $cb->($pkg);
2350 1
2351 } or warn "$pkg unloaded, but with errors: $@";
2054 } 2352 }
2055 2353
2354 warn "... nuking $pkg";
2355 Symbol::delete_package $pkg;
2356 }
2357
2056 # unload all modules loaded from $LIBDIR 2358 warn "unload all perl modules loaded from $LIBDIR";
2057 while (my ($k, $v) = each %INC) { 2359 while (my ($k, $v) = each %INC) {
2058 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2360 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2059 2361
2060 warn "removing <$k>"; 2362 warn "removing <$k>";
2061 delete $INC{$k}; 2363 delete $INC{$k};
2068 } 2370 }
2069 2371
2070 Symbol::delete_package $k; 2372 Symbol::delete_package $k;
2071 } 2373 }
2072 2374
2073 # sync database to disk
2074 cf::db_sync;
2075 IO::AIO::flush;
2076
2077 # get rid of safe::, as good as possible 2375 warn "get rid of safe::, as good as possible";
2078 Symbol::delete_package "safe::$_" 2376 Symbol::delete_package "safe::$_"
2079 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2377 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2080 2378
2081 # remove register_script_function callbacks
2082 # TODO
2083
2084 # unload cf.pm "a bit" 2379 warn "unload cf.pm \"a bit\"";
2085 delete $INC{"cf.pm"}; 2380 delete $INC{"cf.pm"};
2086 2381
2087 # don't, removes xs symbols, too, 2382 # don't, removes xs symbols, too,
2088 # and global variables created in xs 2383 # and global variables created in xs
2089 #Symbol::delete_package __PACKAGE__; 2384 #Symbol::delete_package __PACKAGE__;
2090 2385
2091 # reload cf.pm
2092 warn "reloading cf.pm"; 2386 warn "reloading cf.pm";
2093 require cf; 2387 require cf;
2094 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2388 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2095 2389
2096 # load config and database again 2390 warn "load config and database again";
2097 cf::cfg_load; 2391 cf::cfg_load;
2098 cf::db_load; 2392 cf::db_load;
2099 2393
2100 # load extensions
2101 warn "load extensions"; 2394 warn "load extensions";
2102 cf::load_extensions; 2395 cf::load_extensions;
2103 2396
2104 # reattach attachments to objects 2397 warn "reattach attachments to objects/players";
2105 warn "reattach";
2106 _global_reattach; 2398 _global_reattach;
2399 warn "reattach attachments to maps";
2400 reattach $_ for values %MAP;
2107 }; 2401 };
2108 2402
2109 if ($@) { 2403 if ($@) {
2110 warn $@; 2404 warn $@;
2111 warn "error while reloading, exiting."; 2405 warn "error while reloading, exiting.";
2112 exit 1; 2406 exit 1;
2113 } 2407 }
2114 2408
2115 warn "reloaded successfully"; 2409 warn "reloaded";
2116}; 2410};
2117 2411
2118############################################################################# 2412#############################################################################
2119 2413
2120unless ($LINK_MAP) { 2414unless ($LINK_MAP) {
2127 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2421 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2128 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2422 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2129 2423
2130 # dirty hack because... archetypes are not yet loaded 2424 # dirty hack because... archetypes are not yet loaded
2131 Event->timer ( 2425 Event->timer (
2132 after => 2, 2426 after => 10,
2133 cb => sub { 2427 cb => sub {
2134 $_[0]->w->cancel; 2428 $_[0]->w->cancel;
2135 2429
2136 # provide some exits "home" 2430 # provide some exits "home"
2137 my $exit = cf::object::new "exit"; 2431 my $exit = cf::object::new "exit";
2156 $LINK_MAP->{deny_reset} = 1; 2450 $LINK_MAP->{deny_reset} = 1;
2157 2451
2158 $cf::MAP{$LINK_MAP->path} = $LINK_MAP; 2452 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2159} 2453}
2160 2454
2161register "<global>", __PACKAGE__;
2162
2163register_command "reload" => sub { 2455register_command "reload" => sub {
2164 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2165 2457
2166 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2167 $who->message ("start of reload."); 2459 $who->message ("start of reload.");
2176 reentrant => 0, 2468 reentrant => 0,
2177 prio => 0, 2469 prio => 0,
2178 at => $NEXT_TICK || $TICK, 2470 at => $NEXT_TICK || $TICK,
2179 data => WF_AUTOCANCEL, 2471 data => WF_AUTOCANCEL,
2180 cb => sub { 2472 cb => sub {
2181 unless ($FREEZE) { 2473 $NOW = Event::time;
2474
2182 cf::server_tick; # one server iteration 2475 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2476 $RUNTIME += $TICK;
2184 }
2185
2186 $NEXT_TICK += $TICK; 2477 $NEXT_TICK += $TICK;
2478
2479 $WAIT_FOR_TICK->broadcast;
2480 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2187 2481
2188 # if we are delayed by four ticks or more, skip them all 2482 # if we are delayed by four ticks or more, skip them all
2189 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2483 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2190 2484
2191 $TICK_WATCHER->at ($NEXT_TICK); 2485 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines