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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.403 by root, Mon Dec 17 07:09:18 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
25use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
26use BDB (); 28use BDB ();
27use Data::Dumper; 29use Data::Dumper;
28use Digest::MD5; 30use Digest::MD5;
29use Fcntl; 31use Fcntl;
30use YAML::Syck (); 32use YAML::Syck ();
31use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
32use Time::HiRes; 34use Time::HiRes;
33use Compress::LZF; 35use Compress::LZF;
34use Digest::MD5 (); 36use Digest::MD5 ();
35 37
36# configure various modules to our taste 38# configure various modules to our taste
37# 39#
38$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43 43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
46 46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER; 76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 79our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
82 81
83our $BDB_POLL_WATCHER; 82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 86our $DB_ENV;
85 87
86our %CFG; 88our %CFG;
87 89
88our $UPTIME; $UPTIME ||= time; 90our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 91our $RUNTIME;
92our $NOW;
90 93
91our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
94 97
95# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 100
158 161
159The raw value load value from the last tick. 162The raw value load value from the last tick.
160 163
161=item %cf::CFG 164=item %cf::CFG
162 165
163Configuration for the server, loaded from C</etc/crossfire/config>, or 166Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 167from wherever your confdir points to.
165 168
166=item cf::wait_for_tick, cf::wait_for_tick_begin 169=item cf::wait_for_tick, cf::wait_for_tick_begin
167 170
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 189 $msg .= "\n"
187 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
188 191
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 193
191 utf8::encode $msg;
192 LOG llevError, $msg; 194 LOG llevError, $msg;
193 }; 195 };
194} 196}
195 197
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212)) { 214)) {
213 no strict 'refs'; 215 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 217}
216 218
217$Event::DIED = sub { 219$EV::DIED = sub {
218 warn "error in event callback: @_"; 220 warn "error in event callback: @_";
219}; 221};
220 222
221############################################################################# 223#############################################################################
222 224
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 248 $d
247 } || "[unable to dump $_[0]: '$@']"; 249 } || "[unable to dump $_[0]: '$@']";
248} 250}
249 251
250=item $ref = cf::from_json $json 252=item $ref = cf::decode_json $json
251 253
252Converts a JSON string into the corresponding perl data structure. 254Converts a JSON string into the corresponding perl data structure.
253 255
254=item $json = cf::to_json $ref 256=item $json = cf::encode_json $ref
255 257
256Converts a perl data structure into its JSON representation. 258Converts a perl data structure into its JSON representation.
257 259
258=cut 260=cut
259 261
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 263
262sub to_json ($) { $json_coder->encode ($_[0]) } 264sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 265sub decode_json($) { $json_coder->decode ($_[0]) }
264 266
265=item cf::lock_wait $string 267=item cf::lock_wait $string
266 268
267Wait until the given lock is available. See cf::lock_acquire. 269Wait until the given lock is available. See cf::lock_acquire.
268 270
271Wait until the given lock is available and then acquires it and returns 273Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
274returned. 276returned.
275 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
276Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
278 283
279=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
280 285
281Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
282 287
283=cut 288=cut
284 289
285our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
286 292
287sub lock_wait($) { 293sub lock_wait($) {
288 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
289 300
290 # wait for lock, if any 301 # wait for lock, if any
291 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 304 Coro::schedule;
299 310
300 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
301 lock_wait $key; 312 lock_wait $key;
302 313
303 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
304 316
305 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
308 } 321 }
309} 322}
310 323
322 }; 335 };
323 $TICK_WATCHER->stop; 336 $TICK_WATCHER->stop;
324 $guard 337 $guard
325} 338}
326 339
340=item cf::periodic $interval, $cb
341
342Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer.
344
345=cut
346
347sub periodic($$) {
348 my ($interval, $cb) = @_;
349
350 my $start = rand List::Util::min 180, $interval;
351
352 EV::periodic $start, $interval, 0, $cb
353}
354
327=item cf::get_slot $time[, $priority[, $name]] 355=item cf::get_slot $time[, $priority[, $name]]
328 356
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 357Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 358This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 359of cpu time till the next tick. The slot is only valid till the next cede.
340our @SLOT_QUEUE; 368our @SLOT_QUEUE;
341our $SLOT_QUEUE; 369our $SLOT_QUEUE;
342 370
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 371$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 372$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager");
374
345 my $signal = new Coro::Signal; 375 my $signal = new Coro::Signal;
346 376
347 while () { 377 while () {
348 next_job: 378 next_job:
349 my $avail = cf::till_tick; 379 my $avail = cf::till_tick;
357 } 387 }
358 } 388 }
359 } 389 }
360 390
361 if (@SLOT_QUEUE) { 391 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 392 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 393 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 394 $signal->wait;
365 } else { 395 } else {
366 Coro::schedule; 396 Coro::schedule;
367 } 397 }
390 420
391BEGIN { *async = \&Coro::async_pool } 421BEGIN { *async = \&Coro::async_pool }
392 422
393=item cf::sync_job { BLOCK } 423=item cf::sync_job { BLOCK }
394 424
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 425The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 426is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 427partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 428acceptable.
399 429
400If it must be done, put the blocking parts into C<sync_job>. This will run 430If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 431the given BLOCK in another coroutine while waiting for the result. The
406 436
407sub sync_job(&) { 437sub sync_job(&) {
408 my ($job) = @_; 438 my ($job) = @_;
409 439
410 if ($Coro::current == $Coro::main) { 440 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 441 my $time = EV::time;
412 442
413 # this is the main coro, too bad, we have to block 443 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 444 # till the operation succeeds, freezing the server :/
415 445
446 LOG llevError, Carp::longmess "sync job";#d#
447
416 # TODO: use suspend/resume instead 448 # TODO: use suspend/resume instead
417 # (but this is cancel-safe) 449 # (but this is cancel-safe)
418 my $freeze_guard = freeze_mainloop; 450 my $freeze_guard = freeze_mainloop;
419 451
420 my $busy = 1; 452 my $busy = 1;
421 my @res; 453 my @res;
422 454
423 (async { 455 (async {
456 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 457 @res = eval { $job->() };
425 warn $@ if $@; 458 warn $@ if $@;
426 undef $busy; 459 undef $busy;
427 })->prio (Coro::PRIO_MAX); 460 })->prio (Coro::PRIO_MAX);
428 461
429 while ($busy) { 462 while ($busy) {
430 Coro::cede or Event::one_event; 463 if (Coro::nready) {
464 Coro::cede_notself;
465 } else {
466 EV::loop EV::LOOP_ONESHOT;
431 } 467 }
468 }
432 469
433 $time = Event::time - $time; 470 $time = EV::time - $time;
434 471
435 LOG llevError | logBacktrace, Carp::longmess "long sync job" 472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437 474
438 $tick_start += $time; # do not account sync jobs to server load 475 $tick_start += $time; # do not account sync jobs to server load
468=item fork_call { }, $args 505=item fork_call { }, $args
469 506
470Executes the given code block with the given arguments in a seperate 507Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 508process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 509Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 510never block itself or use any form of event handling.
474 511
475=cut 512=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 513
486sub fork_call(&@) { 514sub fork_call(&@) {
487 my ($cb, @args) = @_; 515 my ($cb, @args) = @_;
488 516
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 517 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 518 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 519 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 520
494 if (my $pid = fork) { 521 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 522 reset_signals;
508 local $SIG{__WARN__}; 523 &$cb
509 local $SIG{__DIE__}; 524 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 525
516 eval { 526 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 527}
529 528
530=item $value = cf::db_get $family => $key 529=item $value = cf::db_get $family => $key
531 530
532Returns a single value from the environment database. 531Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 533=item cf::db_put $family => $key => $value
535 534
536Stores the given C<$value> in the family. It can currently store binary 535Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 536data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 537
538=item $db = cf::db_table "name"
539
540Create and/or open a new database table. The string must not be "db" and must be unique
541within each server.
542
539=cut 543=cut
544
545sub db_table($) {
546 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV;
548
549 eval {
550 $db->set_flags (BDB::CHKSUM);
551
552 utf8::encode $name;
553 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
554 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
555 cf::cleanup "db_open(db): $!" if $!;
556 };
557 cf::cleanup "db_open(db): $@" if $@;
558
559 $db
560}
540 561
541our $DB; 562our $DB;
542 563
543sub db_init { 564sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 565 cf::sync_job {
548 eval { 566 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 567 };
558} 568}
559 569
560sub db_get($$) { 570sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 571 my $key = "$_[0]/$_[1]";
562 572
612 if (1) { 622 if (1) {
613 $md5 = 623 $md5 =
614 join "\x00", 624 join "\x00",
615 $processversion, 625 $processversion,
616 map { 626 map {
617 Coro::cede; 627 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 628 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 629 } 0.. $#$src;
620 630
621 631
622 my $dbmd5 = db_get cache => "$id/md5"; 632 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 676attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 677to it. All such attachable objects support the following methods.
668 678
669In the following description, CLASS can be any of C<global>, C<object> 679In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 680C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 681Deliantra).
672 682
673=over 4 683=over 4
674 684
675=item $attachable->attach ($attachment, key => $value...) 685=item $attachable->attach ($attachment, key => $value...)
676 686
974 984
975=cut 985=cut
976 986
977############################################################################# 987#############################################################################
978# object support 988# object support
979#
980 989
990sub _object_equal($$);
991sub _object_equal($$) {
992 my ($a, $b) = @_;
993
994 return 0 unless (ref $a) eq (ref $b);
995
996 if ("HASH" eq ref $a) {
997 my @ka = keys %$a;
998 my @kb = keys %$b;
999
1000 return 0 if @ka != @kb;
1001
1002 for (0 .. $#ka) {
1003 return 0 unless $ka[$_] eq $kb[$_];
1004 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1005 }
1006
1007 } elsif ("ARRAY" eq ref $a) {
1008
1009 return 0 if @$a != @$b;
1010
1011 for (0 .. $#$a) {
1012 return 0 unless _object_equal $a->[$_], $b->[$_];
1013 }
1014
1015 } elsif ($a ne $b) {
1016 return 0;
1017 }
1018
1019 1
1020}
1021
1022our $SLOW_MERGES;#d#
981sub _can_merge { 1023sub _can_merge {
982 my ($ob1, $ob2) = @_; 1024 my ($ob1, $ob2) = @_;
983 1025
984 local $Storable::canonical = 1; 1026 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1027
988 $fob1 eq $fob2 1028 # we do the slow way here
1029 return _object_equal $ob1, $ob2
989} 1030}
990 1031
991sub reattach { 1032sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1033 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1034 my ($obj) = @_;
1015cf::attachable->attach ( 1056cf::attachable->attach (
1016 prio => -1000000, 1057 prio => -1000000,
1017 on_instantiate => sub { 1058 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1059 my ($obj, $data) = @_;
1019 1060
1020 $data = from_json $data; 1061 $data = decode_json $data;
1021 1062
1022 for (@$data) { 1063 for (@$data) {
1023 my ($name, $args) = @$_; 1064 my ($name, $args) = @$_;
1024 1065
1025 $obj->attach ($name, %{$args || {} }); 1066 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1082sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1083 my ($filename, $rdata, $objs) = @_;
1043 1084
1044 sync_job { 1085 sync_job {
1045 if (length $$rdata) { 1086 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1088 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1089 $decname, length $$rdata, scalar @$objs;
1048 1090
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1092 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1094 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1095 close $fh;
1054 1096
1055 if (@$objs) { 1097 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1098 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1099 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1101 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1102 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1103 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1104 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1105 }
1071 } 1113 }
1072 } else { 1114 } else {
1073 aio_unlink $filename; 1115 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1116 aio_unlink "$filename.pst";
1075 } 1117 }
1076 } 1118 };
1077} 1119}
1078 1120
1079sub object_freezer_as_string { 1121sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1122 my ($rdata, $objs) = @_;
1081 1123
1093 or return; 1135 or return;
1094 1136
1095 unless (aio_stat "$filename.pst") { 1137 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1138 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1139 or return;
1140
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1141 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs};
1099 } 1143 }
1100 1144
1145 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1146 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1147 $decname, length $data, scalar @{$av || []};
1148
1103 return ($data, $av); 1149 ($data, $av)
1104} 1150}
1105 1151
1106=head2 COMMAND CALLBACKS 1152=head2 COMMAND CALLBACKS
1107 1153
1108=over 4 1154=over 4
1186 my ($type, $reply, @payload) = 1232 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1233 "ARRAY" eq ref $msg
1188 ? @$msg 1234 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1235 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1236
1237 my @reply;
1238
1191 if (my $cb = $EXTCMD{$type}) { 1239 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1240 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1241 }
1242
1243 $pl->ext_reply ($reply, @reply)
1244 if $reply;
1245
1197 } else { 1246 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1248 }
1200 1249
1201 cf::override; 1250 cf::override;
1291 1340
1292=head3 cf::player 1341=head3 cf::player
1293 1342
1294=over 4 1343=over 4
1295 1344
1345=item cf::player::num_playing
1346
1347Returns the official number of playing players, as per the Crossfire metaserver rules.
1348
1349=cut
1350
1351sub num_playing {
1352 scalar grep
1353 $_->ob->map
1354 && !$_->hidden
1355 && !$_->ob->flag (cf::FLAG_WIZ),
1356 cf::player::list
1357}
1358
1296=item cf::player::find $login 1359=item cf::player::find $login
1297 1360
1298Returns the given player object, loading it if necessary (might block). 1361Returns the given player object, loading it if necessary (might block).
1299 1362
1300=cut 1363=cut
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1398 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1399 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1400 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1401 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1402
1340 my $pl = load_pl path $login 1403 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1404 or return;
1405
1406 my $pl = cf::player::load_pl $f
1407 or return;
1408 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1410 $cf::PLAYER{$login} = $pl
1343 } 1411 }
1344 } 1412 }
1345} 1413}
1346 1414
1356 1424
1357 aio_mkdir playerdir $pl, 0770; 1425 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1426 $pl->{last_save} = $cf::RUNTIME;
1359 1427
1360 $pl->save_pl ($path); 1428 $pl->save_pl ($path);
1361 Coro::cede; 1429 cf::cede_to_tick;
1362} 1430}
1363 1431
1364sub new($) { 1432sub new($) {
1365 my ($login) = @_; 1433 my ($login) = @_;
1366 1434
1444 or return []; 1512 or return [];
1445 1513
1446 my @logins; 1514 my @logins;
1447 1515
1448 for my $login (@$dirs) { 1516 for my $login (@$dirs) {
1517 my $path = path $login;
1518
1519 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1522 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1523 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 }
1452 1525
1453 utf8::decode $login; 1526 utf8::decode $login;
1454 push @logins, $login; 1527 push @logins, $login;
1455 } 1528 }
1456 1529
1489 1562
1490Expand crossfire pod fragments into protocol xml. 1563Expand crossfire pod fragments into protocol xml.
1491 1564
1492=cut 1565=cut
1493 1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1494sub expand_cfpod { 1578sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1579 my ($self, $pod) = @_;
1496 1580
1497 # escape & and < 1581 my $xml;
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500 1582
1501 # this is buggy, it needs to properly take care of nested <'s 1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1502 1586
1503 1 while 1587 $group =~ s/&/&amp;/g;
1504 # replace B<>, I<>, U<> etc. 1588 $group =~ s/</&lt;/g;
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1589
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1590 $xml .= $group;
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1591 } elsif ($pod =~ m%\G
1508 # replace G<male|female> tags 1592 ([BCGHITU])
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1593 <
1510 $self->gender ? $2 : $1 1594 (?:
1511 }ge 1595 ([^<>]*) (?{ $group = $^N })
1512 # replace H<hint text> 1596 | < $interior >
1513 || s{H<([^\>]*)>} 1597 )
1598 >
1599 %gcsx
1514 { 1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "") 1620 "")
1518 [$self->{hintmode}] 1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1519 }ge; 1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1520 1632
1633 for ($xml) {
1521 # create single paragraphs (very hackish) 1634 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g; 1635 s/(?<=\S)\n(?=\w)/ /g;
1523 1636
1524 # compress some whitespace 1637 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends 1638 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines 1639 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines 1640 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines 1641 s/\n+$//; # ending lines
1642 }
1529 1643
1530 $_ 1644 $xml
1531} 1645}
1646
1647no re 'eval';
1532 1648
1533sub hintmode { 1649sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1; 1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode} 1651 $_[0]{hintmode}
1536} 1652}
1542=cut 1658=cut
1543 1659
1544sub ext_reply($$@) { 1660sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1661 my ($self, $id, @msg) = @_;
1546 1662
1547 if ($self->ns->extcmd == 2) { 1663 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1664}
1555 1665
1556=item $player->ext_msg ($type, @msg) 1666=item $player->ext_msg ($type, @msg)
1557 1667
1558Sends an ext event to the client. 1668Sends an ext event to the client.
1786 1896
1787sub load_header_from($) { 1897sub load_header_from($) {
1788 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1789 1899
1790 utf8::encode $path; 1900 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1796 1909
1797 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1798 1911
1799 1 1912 1
1800} 1913}
1854sub find { 1967sub find {
1855 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1856 1969
1857 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1858 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1860 1974
1861 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1863 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1864 or return; 1980 or return;
1865 1981
1866 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1867 1983
1869 or return; 1985 or return;
1870 1986
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard1;
1991 undef $guard2;
1874 $map->reset; 1992 $map->reset;
1875 undef $guard;
1876 return find $path; 1993 return find $path;
1877 } 1994 }
1878 1995
1879 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1880 } 1997 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1890 2007
1891 my $path = $self->{path}; 2008 my $path = $self->{path};
1892 2009
1893 { 2010 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1895 2012
2013 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2015
1898 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1899 2017
1900 $self->alloc; 2018 $self->alloc;
1901 2019
1902 $self->pre_load; 2020 $self->pre_load;
1903 Coro::cede; 2021 cf::cede_to_tick;
1904 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1906 or return; 2026 or return;
1907 2027
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1910 2030
1911 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2032 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2035 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1916 } 2039 }
1917 } 2040 }
1918 2041
1919 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1920 # now do the right thing for maps 2045 # now do the right thing for maps
1921 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2048 unless $self->difficulty;
1924 Coro::cede; 2049 cf::cede_to_tick;
1925 2050
1926 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2052 $self->decay_objects;
1928 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1929 $self->update_buttons; 2054 $self->update_buttons;
1930 Coro::cede; 2055 cf::cede_to_tick;
1931 $self->set_darkness_map; 2056 $self->set_darkness_map;
1932 Coro::cede; 2057 cf::cede_to_tick;
1933 $self->activate; 2058 $self->activate;
1934 } 2059 }
1935 2060
1936 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
1953 2078
1954 $self 2079 $self
1955} 2080}
1956 2081
1957# find and load all maps in the 3x3 area around a map 2082# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2083sub load_neighbours {
1959 my ($map) = @_; 2084 my ($map) = @_;
1960 2085
1961 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1962 2087
1963 for (0 .. 3) { 2088 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1965 or next; 2090 or next;
1966 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1967 or next; 2092 or next;
1968 $neigh->load; 2093 $neigh->load;
1969 2094
2095 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2098 }
1973 2099
1974 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1976 or next; 2103 or next;
1977 $neigh->load; 2104 $neigh->load;
1978 } 2105 }
1979} 2106}
1980 2107
1985} 2112}
1986 2113
1987sub do_load_sync { 2114sub do_load_sync {
1988 my ($map) = @_; 2115 my ($map) = @_;
1989 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1990 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1991} 2121}
1992 2122
1993our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1995 2125
1996sub find_async { 2126sub find_async {
1997 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1998 2128
1999 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2000 2130
2001 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2133 }
2004 2134
2005 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
2006 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2007 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2142 if (my $map = find $k) {
2010 $map->load; 2143 $map->load if $v;
2011 } 2144 }
2012 2145
2013 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
2014 } 2147 }
2015 } 2148 }
2016 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
2017 }; 2150 };
2018 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
2021} 2154}
2022 2155
2023sub save { 2156sub save {
2024 my ($self) = @_; 2157 my ($self) = @_;
2025 2158
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2160
2028 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
2029 2162
2030 return unless $self->dirty; 2163 return unless $self->dirty;
2031 2164
2037 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2038 2171
2039 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2040 2173
2041 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2043 }; 2177 };
2044 2178
2045 if ($uniq) { 2179 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2054 my ($self) = @_; 2188 my ($self) = @_;
2055 2189
2056 # save first because save cedes 2190 # save first because save cedes
2057 $self->save; 2191 $self->save;
2058 2192
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2193 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2194
2061 return if $self->players; 2195 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2196 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2197 return if $self->{deny_save};
2064 2198
2199 $self->in_memory (cf::MAP_SWAPPED);
2200
2201 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2203 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2204}
2068 2205
2069sub reset_at { 2206sub reset_at {
2070 my ($self) = @_; 2207 my ($self) = @_;
2071 2208
2103 if $uniq; 2240 if $uniq;
2104 } 2241 }
2105 2242
2106 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2107 2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2247 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2248
2112 $self->unlink_save; 2249 $self->unlink_save;
2113 $self->destroy; 2250 $self->destroy;
2114} 2251}
2115 2252
2116my $nuke_counter = "aaaa"; 2253my $nuke_counter = "aaaa";
2117 2254
2118sub nuke { 2255sub nuke {
2119 my ($self) = @_; 2256 my ($self) = @_;
2120 2257
2258 {
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2121 delete $cf::MAP{$self->path}; 2261 delete $cf::MAP{$self->path};
2122 2262
2123 $self->unlink_save; 2263 $self->unlink_save;
2124 2264
2125 bless $self, "cf::map"; 2265 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2266 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2267 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2268 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2270
2131 $cf::MAP{$self->path} = $self; 2271 $cf::MAP{$self->path} = $self;
2272 }
2132 2273
2133 $self->reset; # polite request, might not happen 2274 $self->reset; # polite request, might not happen
2134} 2275}
2135 2276
2136=item $maps = cf::map::tmp_maps 2277=item $maps = cf::map::tmp_maps
2212 2353
2213sub inv_recursive { 2354sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2355 inv_recursive_ inv $_[0]
2215} 2356}
2216 2357
2358=item $ref = $ob->ref
2359
2360creates and returns a persistent reference to an objetc that can be stored as a string.
2361
2362=item $ob = cf::object::deref ($refstring)
2363
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block.
2366
2367=cut
2368
2369sub deref {
2370 my ($ref) = @_;
2371
2372 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2373 my ($uuid, $name) = ($1, $2);
2374 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2375 or return;
2376 $pl->ob->uuid eq $uuid
2377 or return;
2378
2379 $pl->ob
2380 } else {
2381 warn "$ref: cannot resolve object reference\n";
2382 undef
2383 }
2384}
2385
2217package cf; 2386package cf;
2218 2387
2219=back 2388=back
2220 2389
2221=head3 cf::object::player 2390=head3 cf::object::player
2349 # use -1 or undef as default coordinates, not 0, 0 2518 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2519 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2520 if $x <=0 && $y <= 0;
2352 2521
2353 $map->load; 2522 $map->load;
2354 $map->load_diag; 2523 $map->load_neighbours;
2355 2524
2356 return unless $self->contr->active; 2525 return unless $self->contr->active;
2357 $self->activate_recursive; 2526 $self->activate_recursive;
2358 2527
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2549
2381 $self->enter_link; 2550 $self->enter_link;
2382 2551
2383 (async { 2552 (async {
2553 $Coro::current->{desc} = "player::goto $path $x $y";
2554
2555 # *tag paths override both path and x|y
2556 if ($path =~ /^\*(.*)$/) {
2557 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2558 my $ob = $obs[rand @obs];
2559
2560 # see if we actually can go there
2561 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2562 $ob = $obs[rand @obs];
2563 } else {
2564 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566 # else put us there anyways for now #d#
2567
2568 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2569 } else {
2570 ($path, $x, $y) = (undef, undef, undef);
2571 }
2572 }
2573
2384 my $map = eval { 2574 my $map = eval {
2385 my $map = cf::map::find $path; 2575 my $map = defined $path ? cf::map::find $path : undef;
2386 2576
2387 if ($map) { 2577 if ($map) {
2388 $map = $map->customise_for ($self); 2578 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2579 $map = $check->($map) if $check && $map;
2390 } else { 2580 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2582 }
2393 2583
2394 $map 2584 $map
2395 }; 2585 };
2396 2586
2449 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2450 } 2640 }
2451 2641
2452 $rmp->{random_seed} ||= $exit->random_seed; 2642 $rmp->{random_seed} ||= $exit->random_seed;
2453 2643
2454 my $data = cf::to_json $rmp; 2644 my $data = cf::encode_json $rmp;
2455 my $md5 = Digest::MD5::md5_hex $data; 2645 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2646 my $meta = "$RANDOMDIR/$md5.meta";
2457 2647
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2649 aio_write $fh, 0, (length $data), $data, 0;
2486 # if exit is damned, update players death & WoR home-position 2676 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp) 2677 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED); 2678 if $exit->flag (FLAG_DAMNED);
2489 2679
2490 (async { 2680 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2682
2491 $self->deactivate_recursive; # just to be sure 2683 $self->deactivate_recursive; # just to be sure
2492 unless (eval { 2684 unless (eval {
2493 $self->goto ($slaying, $hp, $sp); 2685 $self->goto ($slaying, $hp, $sp);
2494 2686
2495 1; 2687 1;
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2722the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2723the message unless the client supports the msg packet.
2532 2724
2533=cut 2725=cut
2534 2726
2727# non-persistent channels (usually the info channel)
2728our %CHANNEL = (
2729 "c/identify" => {
2730 id => "infobox",
2731 title => "Identify",
2732 reply => undef,
2733 tooltip => "Items recently identified",
2734 },
2735 "c/examine" => {
2736 id => "infobox",
2737 title => "Examine",
2738 reply => undef,
2739 tooltip => "Signs and other items you examined",
2740 },
2741 "c/book" => {
2742 id => "infobox",
2743 title => "Book",
2744 reply => undef,
2745 tooltip => "The contents of a note or book",
2746 },
2747 "c/lookat" => {
2748 id => "infobox",
2749 title => "Look",
2750 reply => undef,
2751 tooltip => "What you saw there",
2752 },
2753 "c/who" => {
2754 id => "infobox",
2755 title => "Players",
2756 reply => undef,
2757 tooltip => "Shows players who are currently online",
2758 },
2759 "c/body" => {
2760 id => "infobox",
2761 title => "Body Parts",
2762 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available",
2764 },
2765 "c/uptime" => {
2766 id => "infobox",
2767 title => "Uptime",
2768 reply => undef,
2769 tooltip => "How long the server has been running since last restart",
2770 },
2771 "c/mapinfo" => {
2772 id => "infobox",
2773 title => "Map Info",
2774 reply => undef,
2775 tooltip => "Information related to the maps",
2776 },
2777);
2778
2535sub cf::client::send_msg { 2779sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2780 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2781
2538 $msg = $self->pl->expand_cfpod ($msg); 2782 $msg = $self->pl->expand_cfpod ($msg);
2539 2783
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2784 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2785
2786 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel};
2789
2790 $self->ext_msg (channel_info => $channel)
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id};
2794
2542 if (ref $channel) { 2795 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2796 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2797 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2798 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2799 $self->ext_msg (channel_info => $channel)
2800 if $self->can_msg;
2547 } 2801 }
2548 2802
2549 $channel = $channel->{id}; 2803 $channel = $channel->{id};
2550 } 2804 }
2551 2805
2592=cut 2846=cut
2593 2847
2594sub cf::client::ext_msg($$@) { 2848sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2849 my ($self, $type, @msg) = @_;
2596 2850
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2851 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2853 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2854 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 }
2857}
2858
2859=item $client->ext_reply ($msgid, @msg)
2860
2861Sends an ext reply to the client.
2862
2863=cut
2864
2865sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_;
2867
2868 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2874 }
2605} 2875}
2606 2876
2607=item $success = $client->query ($flags, "text", \&cb) 2877=item $success = $client->query ($flags, "text", \&cb)
2669 my ($type, $reply, @payload) = 2939 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2940 "ARRAY" eq ref $msg
2671 ? @$msg 2941 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2942 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2943
2944 my @reply;
2945
2674 if (my $cb = $EXTICMD{$type}) { 2946 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2947 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2948 }
2949
2950 $ns->ext_reply ($reply, @reply)
2951 if $reply;
2952
2680 } else { 2953 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2955 }
2683 2956
2684 cf::override; 2957 cf::override;
2744=pod 3017=pod
2745 3018
2746The following functions and methods are available within a safe environment: 3019The following functions and methods are available within a safe environment:
2747 3020
2748 cf::object 3021 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 3022 contr pay_amount pay_player map x y force_find force_add destroy
2750 insert remove name archname title slaying race 3023 insert remove name archname title slaying race decrease_ob_nr
2751 3024
2752 cf::object::player 3025 cf::object::player
2753 player 3026 player
2754 3027
2755 cf::player 3028 cf::player
2760 3033
2761=cut 3034=cut
2762 3035
2763for ( 3036for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 3038 insert remove inv name archname title slaying race
3039 decrease_ob_nr destroy)],
2766 ["cf::object::player" => qw(player)], 3040 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 3041 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 3042 ["cf::map" => qw(trigger)],
2769) { 3043) {
2770 no strict 'refs'; 3044 no strict 'refs';
2846# the server's init and main functions 3120# the server's init and main functions
2847 3121
2848sub load_facedata($) { 3122sub load_facedata($) {
2849 my ($path) = @_; 3123 my ($path) = @_;
2850 3124
3125 # HACK to clear player env face cache, we need some signal framework
3126 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = ();
3128
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3130
2851 warn "loading facedata from $path\n"; 3131 warn "loading facedata from $path\n";
2852 3132
2853 my $facedata; 3133 my $facedata;
2854 0 < aio_load $path, $facedata 3134 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 3135 or die "$path: $!";
2856 3136
2857 $facedata = Coro::Storable::thaw $facedata; 3137 $facedata = Coro::Storable::thaw $facedata;
2858 3138
2859 $facedata->{version} == 2 3139 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3140 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141
3142 # patch in the exptable
3143 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3146 };
3147 cf::cede_to_tick;
2861 3148
2862 { 3149 {
2863 my $faces = $facedata->{faceinfo}; 3150 my $faces = $facedata->{faceinfo};
2864 3151
2865 while (my ($face, $info) = each %$faces) { 3152 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3153 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 3154 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3155 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3158
2872 cf::cede_to_tick; 3159 cf::cede_to_tick;
2873 } 3160 }
2874 3161
2875 while (my ($face, $info) = each %$faces) { 3162 while (my ($face, $info) = each %$faces) {
2900 3187
2901 { 3188 {
2902 # TODO: for gcfclient pleasure, we should give resources 3189 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3190 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3191 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 3192
2907 my $soundconf = delete $res->{"res/sound.conf"}; 3193 my $soundconf = delete $res->{"res/sound.conf"};
2908 3194
2909 while (my ($name, $info) = each %$res) { 3195 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3196 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
2916 3198
2917 if ($info->{type} & 1) { 3199 if ($info->{type} & 1) {
2918 # prepend meta info 3200 # prepend meta info
2919 3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3207 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 3208 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3209 $data = $info->{data};
2926 } 3210 }
2927 3211
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 3213 cf::face::set_type $idx, $info->{type};
2929 3214
2930 cf::cede_to_tick; 3215 cf::cede_to_tick;
2931 } 3216 }
2932 3217
2959 $ns->fx_want ($k, $v); 3244 $ns->fx_want ($k, $v);
2960 } 3245 }
2961}; 3246};
2962 3247
2963sub reload_regions { 3248sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
2964 load_resource_file "$MAPDIR/regions" 3253 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3254 or die "unable to load regions file\n";
2966 3255
2967 for (cf::region::list) { 3256 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3257 $_->{match} = qr/$_->{match}/
3004 3293
3005sub init { 3294sub init {
3006 reload_resources; 3295 reload_resources;
3007} 3296}
3008 3297
3009sub cfg_load { 3298sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3299 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3300 or return;
3012 3301
3013 local $/; 3302 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3303 *CFG = YAML::Syck::Load <$fh>;
3030sub main { 3319sub main {
3031 # we must not ever block the main coroutine 3320 # we must not ever block the main coroutine
3032 local $Coro::idle = sub { 3321 local $Coro::idle = sub {
3033 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3034 (async { 3323 (async {
3035 Event::one_event; 3324 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT;
3036 })->prio (Coro::PRIO_MAX); 3326 })->prio (Coro::PRIO_MAX);
3037 }; 3327 };
3038 3328
3039 cfg_load; 3329 reload_config;
3040 db_init; 3330 db_init;
3041 load_extensions; 3331 load_extensions;
3042 3332
3043 $TICK_WATCHER->start; 3333 $TICK_WATCHER->start;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3044 Event::loop; 3335 EV::loop;
3045} 3336}
3046 3337
3047############################################################################# 3338#############################################################################
3048# initialisation and cleanup 3339# initialisation and cleanup
3049 3340
3050# install some emergency cleanup handlers 3341# install some emergency cleanup handlers
3051BEGIN { 3342BEGIN {
3343 our %SIGWATCHER = ();
3052 for my $signal (qw(INT HUP TERM)) { 3344 for my $signal (qw(INT HUP TERM)) {
3053 Event->signal ( 3345 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3054 reentrant => 0,
3055 data => WF_AUTOCANCEL,
3056 signal => $signal,
3057 prio => 0,
3058 cb => sub {
3059 cf::cleanup "SIG$signal"; 3346 cf::cleanup "SIG$signal";
3060 },
3061 ); 3347 };
3062 } 3348 }
3063} 3349}
3064 3350
3065sub write_runtime { 3351sub write_runtime {
3066 my $runtime = "$LOCALDIR/runtime"; 3352 my $runtime = "$LOCALDIR/runtime";
3111 # and maps saved/destroyed asynchronously. 3397 # and maps saved/destroyed asynchronously.
3112 warn "begin emergency player save\n"; 3398 warn "begin emergency player save\n";
3113 for my $login (keys %cf::PLAYER) { 3399 for my $login (keys %cf::PLAYER) {
3114 my $pl = $cf::PLAYER{$login} or next; 3400 my $pl = $cf::PLAYER{$login} or next;
3115 $pl->valid or next; 3401 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3116 $pl->save; 3403 $pl->save;
3117 } 3404 }
3118 warn "end emergency player save\n"; 3405 warn "end emergency player save\n";
3119 3406
3120 warn "begin emergency map save\n"; 3407 warn "begin emergency map save\n";
3159 warn "syncing database to disk"; 3446 warn "syncing database to disk";
3160 BDB::db_env_txn_checkpoint $DB_ENV; 3447 BDB::db_env_txn_checkpoint $DB_ENV;
3161 3448
3162 # if anything goes wrong in here, we should simply crash as we already saved 3449 # if anything goes wrong in here, we should simply crash as we already saved
3163 3450
3164 warn "cancelling all WF_AUTOCANCEL watchers";
3165 for (Event::all_watchers) {
3166 $_->cancel if $_->data & WF_AUTOCANCEL;
3167 }
3168
3169 warn "flushing outstanding aio requests"; 3451 warn "flushing outstanding aio requests";
3170 for (;;) { 3452 for (;;) {
3171 BDB::flush; 3453 BDB::flush;
3172 IO::AIO::flush; 3454 IO::AIO::flush;
3173 Coro::cede; 3455 Coro::cede_notself;
3174 last unless IO::AIO::nreqs || BDB::nreqs; 3456 last unless IO::AIO::nreqs || BDB::nreqs;
3175 warn "iterate..."; 3457 warn "iterate...";
3176 } 3458 }
3177 3459
3178 ++$RELOAD; 3460 ++$RELOAD;
3237 warn "reloading cf.pm"; 3519 warn "reloading cf.pm";
3238 require cf; 3520 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3522
3241 warn "loading config and database again"; 3523 warn "loading config and database again";
3242 cf::cfg_load; 3524 cf::reload_config;
3243 3525
3244 warn "loading extensions"; 3526 warn "loading extensions";
3245 cf::load_extensions; 3527 cf::load_extensions;
3246 3528
3247 warn "reattaching attachments to objects/players"; 3529 warn "reattaching attachments to objects/players";
3267 3549
3268sub reload_perl() { 3550sub reload_perl() {
3269 # doing reload synchronously and two reloads happen back-to-back, 3551 # doing reload synchronously and two reloads happen back-to-back,
3270 # coro crashes during coro_state_free->destroy here. 3552 # coro crashes during coro_state_free->destroy here.
3271 3553
3272 $RELOAD_WATCHER ||= Event->timer ( 3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3273 reentrant => 0,
3274 after => 0,
3275 data => WF_AUTOCANCEL,
3276 cb => sub {
3277 do_reload_perl;
3278 undef $RELOAD_WATCHER; 3555 undef $RELOAD_WATCHER;
3279 }, 3556 do_reload_perl;
3280 ); 3557 };
3281} 3558}
3282 3559
3283register_command "reload" => sub { 3560register_command "reload" => sub {
3284 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3285 3562
3286 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3287 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3288 async { reload_perl }; 3567 reload_perl;
3568 };
3289 } 3569 }
3290}; 3570};
3291 3571
3292unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3293 3573
3312 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3594 $signal->wait;
3315} 3595}
3316 3596
3317 my $min = 1e6;#d# 3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer (
3320 reentrant => 0,
3321 parked => 1,
3322 prio => 0,
3323 at => $NEXT_TICK || $TICK,
3324 data => WF_AUTOCANCEL,
3325 cb => sub {
3326 if ($Coro::current != $Coro::main) { 3598 if ($Coro::current != $Coro::main) {
3327 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3328 unless ++$bug_warning > 10; 3600 unless ++$bug_warning > 10;
3329 return; 3601 return;
3330 } 3602 }
3331 3603
3332 $NOW = $tick_start = Event::time; 3604 $NOW = $tick_start = EV::now;
3333 3605
3334 cf::server_tick; # one server iteration 3606 cf::server_tick; # one server iteration
3335 3607
3336 0 && sync_job {#d# 3608 $RUNTIME += $TICK;
3337 for(1..10) { 3609 $NEXT_TICK += $TICK;
3338 my $t = Event::time;
3339 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3340 or die;
3341 3610
3342 $map->width (50); 3611 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3343 $map->height (50); 3612 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3344 $map->alloc; 3613 Coro::async_pool {
3345 $map->_load_objects ("/tmp/x.map", 1); 3614 $Coro::current->{desc} = "runtime saver";
3346 my $t = Event::time - $t; 3615 write_runtime
3347 3616 or warn "ERROR: unable to write runtime file: $!";
3348 #next unless $t < 0.0013;#d#
3349 if ($t < $min) {
3350 $min = $t;
3351 }
3352 $avg = $avg * 0.99 + $t * 0.01;
3353 }
3354 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3355 exit 0;
3356 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3357 }; 3617 };
3618 }
3358 3619
3359 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK;
3361
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10;
3364 Coro::async_pool {
3365 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!";
3367 };
3368 }
3369
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3621 $sig->send;
3375 } 3622 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3623 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3624 $sig->send;
3378 } 3625 }
3379 3626
3380 $NOW = Event::time;
3381
3382 # if we are delayed by four ticks or more, skip them all
3383 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3384
3385 $TICK_WATCHER->at ($NEXT_TICK);
3386 $TICK_WATCHER->start;
3387
3388 $LOAD = ($NOW - $tick_start) / $TICK; 3627 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3629
3391 _post_tick; 3630 _post_tick;
3392 3631};
3393 3632$TICK_WATCHER->priority (EV::MAXPRI);
3394 },
3395);
3396 3633
3397{ 3634{
3398 BDB::max_poll_time $TICK * 0.1; 3635 # configure BDB
3399 $BDB_POLL_WATCHER = Event->io ( 3636
3400 reentrant => 0,
3401 fd => BDB::poll_fileno,
3402 poll => 'r',
3403 prio => 0,
3404 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb,
3406 );
3407 BDB::min_parallel 8; 3637 BDB::min_parallel 8;
3408 3638 BDB::max_poll_reqs $TICK * 0.1;
3409 BDB::set_sync_prepare { 3639 $Coro::BDB::WATCHER->priority (1);
3410 my $status;
3411 my $current = $Coro::current;
3412 (
3413 sub {
3414 $status = $!;
3415 $current->ready; undef $current;
3416 },
3417 sub {
3418 Coro::schedule while defined $current;
3419 $! = $status;
3420 },
3421 )
3422 };
3423 3640
3424 unless ($DB_ENV) { 3641 unless ($DB_ENV) {
3425 $DB_ENV = BDB::db_env_create; 3642 $DB_ENV = BDB::db_env_create;
3643 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3644 | BDB::LOG_AUTOREMOVE, 1);
3645 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3646 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3426 3647
3427 cf::sync_job { 3648 cf::sync_job {
3428 eval { 3649 eval {
3429 BDB::db_env_open 3650 BDB::db_env_open
3430 $DB_ENV, 3651 $DB_ENV,
3432 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3653 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3654 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3655 0666;
3435 3656
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3657 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3439 $DB_ENV->set_lk_detect;
3440 }; 3658 };
3441 3659
3442 cf::cleanup "db_env_open(db): $@" if $@; 3660 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3661 };
3444 } 3662 }
3663
3664 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3665 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3666 };
3667 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3668 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3669 };
3670 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3671 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3672 };
3445} 3673}
3446 3674
3447{ 3675{
3676 # configure IO::AIO
3677
3448 IO::AIO::min_parallel 8; 3678 IO::AIO::min_parallel 8;
3449
3450 undef $Coro::AIO::WATCHER;
3451 IO::AIO::max_poll_time $TICK * 0.1; 3679 IO::AIO::max_poll_time $TICK * 0.1;
3452 $AIO_POLL_WATCHER = Event->io ( 3680 $Coro::AIO::WATCHER->priority (1);
3453 reentrant => 0,
3454 data => WF_AUTOCANCEL,
3455 fd => IO::AIO::poll_fileno,
3456 poll => 'r',
3457 prio => 6,
3458 cb => \&IO::AIO::poll_cb,
3459 );
3460} 3681}
3461 3682
3462my $_log_backtrace; 3683my $_log_backtrace;
3463 3684
3464sub _log_backtrace { 3685sub _log_backtrace {
3468 3689
3469 # limit the # of concurrent backtraces 3690 # limit the # of concurrent backtraces
3470 if ($_log_backtrace < 2) { 3691 if ($_log_backtrace < 2) {
3471 ++$_log_backtrace; 3692 ++$_log_backtrace;
3472 async { 3693 async {
3694 $Coro::current->{desc} = "abt $msg";
3695
3473 my @bt = fork_call { 3696 my @bt = fork_call {
3474 @addr = map { sprintf "%x", $_ } @addr; 3697 @addr = map { sprintf "%x", $_ } @addr;
3475 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3698 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3476 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3699 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3477 or die "addr2line: $!"; 3700 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines