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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.408 by root, Mon Jan 14 10:12:12 2008 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 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.64 (); 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;
24use Coro::Util (); 25use Coro::Util ();
25 26
26use JSON::XS 1.4 (); 27use JSON::XS 2.01 ();
27use BDB (); 28use BDB ();
28use Data::Dumper; 29use Data::Dumper;
29use Digest::MD5; 30use Digest::MD5;
30use Fcntl; 31use Fcntl;
31use YAML::Syck (); 32use YAML ();
32use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
33use Time::HiRes; 34use Time::HiRes;
34use Compress::LZF; 35use Compress::LZF;
35use Digest::MD5 (); 36use Digest::MD5 ();
36 37
37# configure various modules to our taste 38# configure various modules to our taste
38# 39#
39$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 43
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 45
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 47
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
75 72
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER; 74our $TICK_WATCHER;
78our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 77our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
83 79
84our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 84our $DB_ENV;
86 85
87our %CFG; 86our %CFG;
88 87
89our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 89our $RUNTIME;
90our $NOW;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
159 159
160The raw value load value from the last tick. 160The raw value load value from the last tick.
161 161
162=item %cf::CFG 162=item %cf::CFG
163 163
164Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 165from wherever your confdir points to.
166 166
167=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
168 168
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
195
196$Coro::State::DIEHOOK = sub {
197 warn Carp::longmess $_[0];
198 Coro::terminate;
199};
196 200
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 204@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 217)) {
214 no strict 'refs'; 218 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 220}
217 221
218$Event::DIED = sub { 222$EV::DIED = sub {
219 warn "error in event callback: @_"; 223 warn "error in event callback: @_";
220}; 224};
221 225
222############################################################################# 226#############################################################################
223 227
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 250 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 251 $d
248 } || "[unable to dump $_[0]: '$@']"; 252 } || "[unable to dump $_[0]: '$@']";
249} 253}
250 254
251=item $ref = cf::from_json $json 255=item $ref = cf::decode_json $json
252 256
253Converts a JSON string into the corresponding perl data structure. 257Converts a JSON string into the corresponding perl data structure.
254 258
255=item $json = cf::to_json $ref 259=item $json = cf::encode_json $ref
256 260
257Converts a perl data structure into its JSON representation. 261Converts a perl data structure into its JSON representation.
258 262
259=cut 263=cut
260 264
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 265our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 266
263sub to_json ($) { $json_coder->encode ($_[0]) } 267sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 268sub decode_json($) { $json_coder->decode ($_[0]) }
265 269
266=item cf::lock_wait $string 270=item cf::lock_wait $string
267 271
268Wait until the given lock is available. See cf::lock_acquire. 272Wait until the given lock is available. See cf::lock_acquire.
269 273
272Wait until the given lock is available and then acquires it and returns 276Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 277a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 278for example when the coroutine gets canceled), the lock is automatically
275returned. 279returned.
276 280
281Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro.
283
277Lock names should begin with a unique identifier (for example, cf::map::find 284Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 285uses map_find and cf::map::load uses map_load).
279 286
280=item $locked = cf::lock_active $string 287=item $locked = cf::lock_active $string
281 288
282Return true if the lock is currently active, i.e. somebody has locked it. 289Return true if the lock is currently active, i.e. somebody has locked it.
283 290
284=cut 291=cut
285 292
286our %LOCK; 293our %LOCK;
294our %LOCKER;#d#
287 295
288sub lock_wait($) { 296sub lock_wait($) {
289 my ($key) = @_; 297 my ($key) = @_;
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
290 303
291 # wait for lock, if any 304 # wait for lock, if any
292 while ($LOCK{$key}) { 305 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 306 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 307 Coro::schedule;
300 313
301 # wait, to be sure we are not locked 314 # wait, to be sure we are not locked
302 lock_wait $key; 315 lock_wait $key;
303 316
304 $LOCK{$key} = []; 317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
305 319
306 Coro::guard { 320 Coro::guard {
321 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 322 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 323 $_->ready for @{ delete $LOCK{$key} };
309 } 324 }
310} 325}
311 326
323 }; 338 };
324 $TICK_WATCHER->stop; 339 $TICK_WATCHER->stop;
325 $guard 340 $guard
326} 341}
327 342
343=item cf::periodic $interval, $cb
344
345Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer.
347
348=cut
349
350sub periodic($$) {
351 my ($interval, $cb) = @_;
352
353 my $start = rand List::Util::min 180, $interval;
354
355 EV::periodic $start, $interval, 0, $cb
356}
357
328=item cf::get_slot $time[, $priority[, $name]] 358=item cf::get_slot $time[, $priority[, $name]]
329 359
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 360Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds 361This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede. 362of cpu time till the next tick. The slot is only valid till the next cede.
341our @SLOT_QUEUE; 371our @SLOT_QUEUE;
342our $SLOT_QUEUE; 372our $SLOT_QUEUE;
343 373
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 374$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 375$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager");
377
346 my $signal = new Coro::Signal; 378 my $signal = new Coro::Signal;
347 379
348 while () { 380 while () {
349 next_job: 381 next_job:
350 my $avail = cf::till_tick; 382 my $avail = cf::till_tick;
358 } 390 }
359 } 391 }
360 } 392 }
361 393
362 if (@SLOT_QUEUE) { 394 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 395 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 396 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 397 $signal->wait;
366 } else { 398 } else {
367 Coro::schedule; 399 Coro::schedule;
368 } 400 }
391 423
392BEGIN { *async = \&Coro::async_pool } 424BEGIN { *async = \&Coro::async_pool }
393 425
394=item cf::sync_job { BLOCK } 426=item cf::sync_job { BLOCK }
395 427
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 428The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 429is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 430partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 431acceptable.
400 432
401If it must be done, put the blocking parts into C<sync_job>. This will run 433If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 434the given BLOCK in another coroutine while waiting for the result. The
407 439
408sub sync_job(&) { 440sub sync_job(&) {
409 my ($job) = @_; 441 my ($job) = @_;
410 442
411 if ($Coro::current == $Coro::main) { 443 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 444 my $time = EV::time;
413 445
414 # this is the main coro, too bad, we have to block 446 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 447 # till the operation succeeds, freezing the server :/
416 448
449 LOG llevError, Carp::longmess "sync job";#d#
450
417 # TODO: use suspend/resume instead 451 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 452 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 453 my $freeze_guard = freeze_mainloop;
420 454
421 my $busy = 1; 455 my $busy = 1;
422 my @res; 456 my @res;
423 457
424 (async { 458 (async {
459 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 460 @res = eval { $job->() };
426 warn $@ if $@; 461 warn $@ if $@;
427 undef $busy; 462 undef $busy;
428 })->prio (Coro::PRIO_MAX); 463 })->prio (Coro::PRIO_MAX);
429 464
430 while ($busy) { 465 while ($busy) {
431 Coro::cede or Event::one_event; 466 if (Coro::nready) {
467 Coro::cede_notself;
468 } else {
469 EV::loop EV::LOOP_ONESHOT;
432 } 470 }
471 }
433 472
434 $time = Event::time - $time; 473 $time = EV::time - $time;
435 474
436 LOG llevError | logBacktrace, Carp::longmess "long sync job" 475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438 477
439 $tick_start += $time; # do not account sync jobs to server load 478 $tick_start += $time; # do not account sync jobs to server load
469=item fork_call { }, $args 508=item fork_call { }, $args
470 509
471Executes the given code block with the given arguments in a seperate 510Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 511process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 512Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 513never block itself or use any form of event handling.
475 514
476=cut 515=cut
477 516
478sub fork_call(&@) { 517sub fork_call(&@) {
479 my ($cb, @args) = @_; 518 my ($cb, @args) = @_;
480 519
481 # we seemingly have to make a local copy of the whole thing, 520 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 521 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 522 # TODO: investigate and fix (likely this will be rather laborious)
484 523
485 my @res = Coro::Util::fork_eval { 524 my @res = Coro::Util::fork_eval {
486 reset_signals; 525 reset_signals;
487 &$cb 526 &$cb
488 }, @args; 527 }, @args;
497=item cf::db_put $family => $key => $value 536=item cf::db_put $family => $key => $value
498 537
499Stores the given C<$value> in the family. It can currently store binary 538Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 539data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 540
541=item $db = cf::db_table "name"
542
543Create and/or open a new database table. The string must not be "db" and must be unique
544within each server.
545
502=cut 546=cut
547
548sub db_table($) {
549 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV;
551
552 eval {
553 $db->set_flags (BDB::CHKSUM);
554
555 utf8::encode $name;
556 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
557 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
558 cf::cleanup "db_open(db): $!" if $!;
559 };
560 cf::cleanup "db_open(db): $@" if $@;
561
562 $db
563}
503 564
504our $DB; 565our $DB;
505 566
506sub db_init { 567sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 568 cf::sync_job {
511 eval { 569 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 570 };
521} 571}
522 572
523sub db_get($$) { 573sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 574 my $key = "$_[0]/$_[1]";
525 575
575 if (1) { 625 if (1) {
576 $md5 = 626 $md5 =
577 join "\x00", 627 join "\x00",
578 $processversion, 628 $processversion,
579 map { 629 map {
580 Coro::cede; 630 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 631 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 632 } 0.. $#$src;
583 633
584 634
585 my $dbmd5 = db_get cache => "$id/md5"; 635 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 679attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 680to it. All such attachable objects support the following methods.
631 681
632In the following description, CLASS can be any of C<global>, C<object> 682In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 683C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 684Deliantra).
635 685
636=over 4 686=over 4
637 687
638=item $attachable->attach ($attachment, key => $value...) 688=item $attachable->attach ($attachment, key => $value...)
639 689
921 } 971 }
922 972
923 0 973 0
924} 974}
925 975
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 976=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 977
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 978=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 979
930Generate an object-specific event with the given arguments. 980Generate an object-specific event with the given arguments.
931 981
937 987
938=cut 988=cut
939 989
940############################################################################# 990#############################################################################
941# object support 991# object support
942#
943 992
993sub _object_equal($$);
994sub _object_equal($$) {
995 my ($a, $b) = @_;
996
997 return 0 unless (ref $a) eq (ref $b);
998
999 if ("HASH" eq ref $a) {
1000 my @ka = keys %$a;
1001 my @kb = keys %$b;
1002
1003 return 0 if @ka != @kb;
1004
1005 for (0 .. $#ka) {
1006 return 0 unless $ka[$_] eq $kb[$_];
1007 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1008 }
1009
1010 } elsif ("ARRAY" eq ref $a) {
1011
1012 return 0 if @$a != @$b;
1013
1014 for (0 .. $#$a) {
1015 return 0 unless _object_equal $a->[$_], $b->[$_];
1016 }
1017
1018 } elsif ($a ne $b) {
1019 return 0;
1020 }
1021
1022 1
1023}
1024
1025our $SLOW_MERGES;#d#
944sub _can_merge { 1026sub _can_merge {
945 my ($ob1, $ob2) = @_; 1027 my ($ob1, $ob2) = @_;
946 1028
947 local $Storable::canonical = 1; 1029 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1030
951 $fob1 eq $fob2 1031 # we do the slow way here
1032 return _object_equal $ob1, $ob2
952} 1033}
953 1034
954sub reattach { 1035sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1036 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1037 my ($obj) = @_;
978cf::attachable->attach ( 1059cf::attachable->attach (
979 prio => -1000000, 1060 prio => -1000000,
980 on_instantiate => sub { 1061 on_instantiate => sub {
981 my ($obj, $data) = @_; 1062 my ($obj, $data) = @_;
982 1063
983 $data = from_json $data; 1064 $data = decode_json $data;
984 1065
985 for (@$data) { 1066 for (@$data) {
986 my ($name, $args) = @$_; 1067 my ($name, $args) = @$_;
987 1068
988 $obj->attach ($name, %{$args || {} }); 1069 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1085sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1086 my ($filename, $rdata, $objs) = @_;
1006 1087
1007 sync_job { 1088 sync_job {
1008 if (length $$rdata) { 1089 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1091 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1092 $decname, length $$rdata, scalar @$objs;
1011 1093
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1095 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1097 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1098 close $fh;
1017 1099
1018 if (@$objs) { 1100 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1101 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1102 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1104 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1105 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1106 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1107 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1108 }
1034 } 1116 }
1035 } else { 1117 } else {
1036 aio_unlink $filename; 1118 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1119 aio_unlink "$filename.pst";
1038 } 1120 }
1039 } 1121 };
1040} 1122}
1041 1123
1042sub object_freezer_as_string { 1124sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1125 my ($rdata, $objs) = @_;
1044 1126
1056 or return; 1138 or return;
1057 1139
1058 unless (aio_stat "$filename.pst") { 1140 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1141 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1142 or return;
1143
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1144 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs};
1062 } 1146 }
1063 1147
1148 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1149 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1150 $decname, length $data, scalar @{$av || []};
1151
1066 return ($data, $av); 1152 ($data, $av)
1067} 1153}
1068 1154
1069=head2 COMMAND CALLBACKS 1155=head2 COMMAND CALLBACKS
1070 1156
1071=over 4 1157=over 4
1149 my ($type, $reply, @payload) = 1235 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1236 "ARRAY" eq ref $msg
1151 ? @$msg 1237 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1238 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1239
1240 my @reply;
1241
1154 if (my $cb = $EXTCMD{$type}) { 1242 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1243 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1244 }
1245
1246 $pl->ext_reply ($reply, @reply)
1247 if $reply;
1248
1160 } else { 1249 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1251 }
1163 1252
1164 cf::override; 1253 cf::override;
1254 1343
1255=head3 cf::player 1344=head3 cf::player
1256 1345
1257=over 4 1346=over 4
1258 1347
1348=item cf::player::num_playing
1349
1350Returns the official number of playing players, as per the Crossfire metaserver rules.
1351
1352=cut
1353
1354sub num_playing {
1355 scalar grep
1356 $_->ob->map
1357 && !$_->hidden
1358 && !$_->ob->flag (cf::FLAG_WIZ),
1359 cf::player::list
1360}
1361
1259=item cf::player::find $login 1362=item cf::player::find $login
1260 1363
1261Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1262 1365
1263=cut 1366=cut
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1405
1303 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1407 or return;
1408
1409 my $pl = cf::player::load_pl $f
1410 or return;
1411 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1306 } 1414 }
1307 } 1415 }
1308} 1416}
1309 1417
1319 1427
1320 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1322 1430
1323 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1324 Coro::cede; 1432 cf::cede_to_tick;
1325} 1433}
1326 1434
1327sub new($) { 1435sub new($) {
1328 my ($login) = @_; 1436 my ($login) = @_;
1329 1437
1407 or return []; 1515 or return [];
1408 1516
1409 my @logins; 1517 my @logins;
1410 1518
1411 for my $login (@$dirs) { 1519 for my $login (@$dirs) {
1520 my $path = path $login;
1521
1522 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1415 1528
1416 utf8::decode $login; 1529 utf8::decode $login;
1417 push @logins, $login; 1530 push @logins, $login;
1418 } 1531 }
1419 1532
1452 1565
1453Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1454 1567
1455=cut 1568=cut
1456 1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1457sub expand_cfpod { 1581sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1459 1583
1460 # escape & and < 1584 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1585
1464 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1465 1589
1466 1 while 1590 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1595 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1596 <
1473 $self->gender ? $2 : $1 1597 (?:
1474 }ge 1598 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1599 | < $interior >
1476 || s{H<([^\>]*)>} 1600 )
1601 >
1602 %gcsx
1477 { 1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1623 "")
1481 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1483 1635
1636 for ($xml) {
1484 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1486 1639
1487 # compress some whitespace 1640 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1492 1646
1493 $_ 1647 $xml
1494} 1648}
1649
1650no re 'eval';
1495 1651
1496sub hintmode { 1652sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1654 $_[0]{hintmode}
1499} 1655}
1743 1899
1744sub load_header_from($) { 1900sub load_header_from($) {
1745 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1746 1902
1747 utf8::encode $path; 1903 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1905 or return;
1906
1907 $self->_load_header ($f)
1908 or return;
1909
1910 local $MAP_LOADING{$self->{path}} = $self;
1911 $f->resolve_delayed_derefs;
1753 1912
1754 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1755 1914
1756 1 1915 1
1757} 1916}
1811sub find { 1970sub find {
1812 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1813 1972
1814 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1815 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1817 1977
1818 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1820 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1821 or return; 1983 or return;
1822 1984
1823 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1824 1986
1826 or return; 1988 or return;
1827 1989
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1831 $map->reset; 1995 $map->reset;
1832 undef $guard;
1833 return find $path; 1996 return find $path;
1834 } 1997 }
1835 1998
1836 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1837 } 2000 }
1846 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1847 2010
1848 my $path = $self->{path}; 2011 my $path = $self->{path};
1849 2012
1850 { 2013 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1852 2015
2016 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 2018
1855 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1856 2020
1857 $self->alloc; 2021 $self->alloc;
1858 2022
1859 $self->pre_load; 2023 $self->pre_load;
1860 Coro::cede; 2024 cf::cede_to_tick;
1861 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1863 or return; 2029 or return;
1864 2030
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1867 2033
1868 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2035 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2038 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1873 } 2042 }
1874 } 2043 }
1875 2044
1876 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1877 # now do the right thing for maps 2048 # now do the right thing for maps
1878 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2051 unless $self->difficulty;
1881 Coro::cede; 2052 cf::cede_to_tick;
1882 2053
1883 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2055 $self->decay_objects;
1885 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1886 $self->update_buttons; 2057 $self->update_buttons;
1887 Coro::cede; 2058 cf::cede_to_tick;
1888 $self->set_darkness_map; 2059 $self->set_darkness_map;
1889 Coro::cede; 2060 cf::cede_to_tick;
1890 $self->activate; 2061 $self->activate;
1891 } 2062 }
1892 2063
1893 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
1944} 2115}
1945 2116
1946sub do_load_sync { 2117sub do_load_sync {
1947 my ($map) = @_; 2118 my ($map) = @_;
1948 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1949 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1950} 2124}
1951 2125
1952our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1954 2128
1955sub find_async { 2129sub find_async {
1956 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1957 2131
1958 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1959 2133
1960 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2136 }
1963 2137
1964 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1965 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1966 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2145 if (my $map = find $k) {
1969 $map->load; 2146 $map->load if $v;
1970 } 2147 }
1971 2148
1972 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1973 } 2150 }
1974 } 2151 }
1975 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1976 }; 2153 };
1977 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
1980} 2157}
1981 2158
1982sub save { 2159sub save {
1983 my ($self) = @_; 2160 my ($self) = @_;
1984 2161
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2163
1987 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1988 2165
1989 return unless $self->dirty; 2166 return unless $self->dirty;
1990 2167
1996 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1997 2174
1998 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1999 2176
2000 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2002 }; 2180 };
2003 2181
2004 if ($uniq) { 2182 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 my ($self) = @_; 2191 my ($self) = @_;
2014 2192
2015 # save first because save cedes 2193 # save first because save cedes
2016 $self->save; 2194 $self->save;
2017 2195
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2197
2020 return if $self->players; 2198 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2200 return if $self->{deny_save};
2023 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2206 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2207}
2027 2208
2028sub reset_at { 2209sub reset_at {
2029 my ($self) = @_; 2210 my ($self) = @_;
2030 2211
2062 if $uniq; 2243 if $uniq;
2063 } 2244 }
2064 2245
2065 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2066 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2250 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2251
2071 $self->unlink_save; 2252 $self->unlink_save;
2072 $self->destroy; 2253 $self->destroy;
2073} 2254}
2074 2255
2075my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
2076 2257
2077sub nuke { 2258sub nuke {
2078 my ($self) = @_; 2259 my ($self) = @_;
2079 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
2080 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
2081 2265
2082 $self->unlink_save; 2266 $self->unlink_save;
2083 2267
2084 bless $self, "cf::map"; 2268 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2273
2090 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
2091 2276
2092 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2093} 2278}
2094 2279
2095=item $maps = cf::map::tmp_maps 2280=item $maps = cf::map::tmp_maps
2171 2356
2172sub inv_recursive { 2357sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2174} 2359}
2175 2360
2361=item $ref = $ob->ref
2362
2363creates and returns a persistent reference to an objetc that can be stored as a string.
2364
2365=item $ob = cf::object::deref ($refstring)
2366
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block.
2369
2370=cut
2371
2372sub deref {
2373 my ($ref) = @_;
2374
2375 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2376 my ($uuid, $name) = ($1, $2);
2377 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2378 or return;
2379 $pl->ob->uuid eq $uuid
2380 or return;
2381
2382 $pl->ob
2383 } else {
2384 warn "$ref: cannot resolve object reference\n";
2385 undef
2386 }
2387}
2388
2176package cf; 2389package cf;
2177 2390
2178=back 2391=back
2179 2392
2180=head3 cf::object::player 2393=head3 cf::object::player
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2552
2340 $self->enter_link; 2553 $self->enter_link;
2341 2554
2342 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2343 my $map = eval { 2577 my $map = eval {
2344 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2345 2579
2346 if ($map) { 2580 if ($map) {
2347 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2349 } else { 2583 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2585 }
2352 2586
2353 $map 2587 $map
2354 }; 2588 };
2355 2589
2408 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2409 } 2643 }
2410 2644
2411 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2412 2646
2413 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2414 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2415 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2416 2650
2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2445 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2448 2682
2449 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2450 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2687 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2453 2689
2454 1; 2690 1;
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2725the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2491 2727
2492=cut 2728=cut
2493 2729
2730# non-persistent channels (usually the info channel)
2731our %CHANNEL = (
2732 "c/identify" => {
2733 id => "infobox",
2734 title => "Identify",
2735 reply => undef,
2736 tooltip => "Items recently identified",
2737 },
2738 "c/examine" => {
2739 id => "infobox",
2740 title => "Examine",
2741 reply => undef,
2742 tooltip => "Signs and other items you examined",
2743 },
2744 "c/book" => {
2745 id => "infobox",
2746 title => "Book",
2747 reply => undef,
2748 tooltip => "The contents of a note or book",
2749 },
2750 "c/lookat" => {
2751 id => "infobox",
2752 title => "Look",
2753 reply => undef,
2754 tooltip => "What you saw there",
2755 },
2756 "c/who" => {
2757 id => "infobox",
2758 title => "Players",
2759 reply => undef,
2760 tooltip => "Shows players who are currently online",
2761 },
2762 "c/body" => {
2763 id => "infobox",
2764 title => "Body Parts",
2765 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available",
2767 },
2768 "c/uptime" => {
2769 id => "infobox",
2770 title => "Uptime",
2771 reply => undef,
2772 tooltip => "How long the server has been running since last restart",
2773 },
2774 "c/mapinfo" => {
2775 id => "infobox",
2776 title => "Map Info",
2777 reply => undef,
2778 tooltip => "Information related to the maps",
2779 },
2780);
2781
2494sub cf::client::send_msg { 2782sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2784
2497 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2498 2786
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2788
2789 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel};
2792
2793 $self->ext_msg (channel_info => $channel)
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id};
2797
2501 if (ref $channel) { 2798 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2506 } 2804 }
2507 2805
2508 $channel = $channel->{id}; 2806 $channel = $channel->{id};
2509 } 2807 }
2510 2808
2551=cut 2849=cut
2552 2850
2553sub cf::client::ext_msg($$@) { 2851sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2852 my ($self, $type, @msg) = @_;
2555 2853
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2854 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2856 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2857 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2859 }
2564} 2860}
2565 2861
2572sub cf::client::ext_reply($$@) { 2868sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2869 my ($self, $id, @msg) = @_;
2574 2870
2575 if ($self->extcmd == 2) { 2871 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2873 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2874 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2875 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2877 }
2582} 2878}
2646 my ($type, $reply, @payload) = 2942 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2943 "ARRAY" eq ref $msg
2648 ? @$msg 2944 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2945 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2946
2947 my @reply;
2948
2651 if (my $cb = $EXTICMD{$type}) { 2949 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2950 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2951 }
2952
2953 $ns->ext_reply ($reply, @reply)
2954 if $reply;
2955
2657 } else { 2956 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2958 }
2660 2959
2661 cf::override; 2960 cf::override;
2721=pod 3020=pod
2722 3021
2723The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2724 3023
2725 cf::object 3024 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 3025 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 3026 insert remove name archname title slaying race decrease_ob_nr
2728 3027
2729 cf::object::player 3028 cf::object::player
2730 player 3029 player
2731 3030
2732 cf::player 3031 cf::player
2737 3036
2738=cut 3037=cut
2739 3038
2740for ( 3039for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 3041 insert remove inv name archname title slaying race
3042 decrease_ob_nr destroy)],
2743 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2746) { 3046) {
2747 no strict 'refs'; 3047 no strict 'refs';
2823# the server's init and main functions 3123# the server's init and main functions
2824 3124
2825sub load_facedata($) { 3125sub load_facedata($) {
2826 my ($path) = @_; 3126 my ($path) = @_;
2827 3127
3128 # HACK to clear player env face cache, we need some signal framework
3129 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = ();
3131
2828 my $enc = JSON::XS->new->utf8->canonical; 3132 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3133
2830 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2831 3135
2832 my $facedata; 3136 my $facedata;
2833 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3143 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3144
2841 # patch in the exptable 3145 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 3146 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 3147 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 3149 };
2846 cf::cede_to_tick; 3150 cf::cede_to_tick;
2847 3151
2848 { 3152 {
2849 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2850 3154
2851 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2852 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2853 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2857 3162
2858 cf::cede_to_tick; 3163 cf::cede_to_tick;
2859 } 3164 }
2860 3165
2861 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2862 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2863 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2864 or next; 3170 or next;
3171
2865 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868 } else { 3175 } else {
2869 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 { 3194 {
2888 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
2891 3198
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data; 3202 my $data;
2897 3203
2898 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
2899 # prepend meta info 3205 # prepend meta info
2900 3206
2901 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
2902 name => $name, 3208 name => $name,
2903 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
2904 }); 3210 });
2905 3211
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type};
3219 } else {
3220 $RESOURCE{$name} = $info;
2907 } 3221 }
2908 3222
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type};
2911
2912 cf::cede_to_tick; 3223 cf::cede_to_tick;
2913 } 3224 }
2914
2915 if ($soundconf) {
2916 $soundconf = $enc->decode (delete $soundconf->{data});
2917
2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2919 my $sound = $soundconf->{compat}[$_]
2920 or next;
2921
2922 my $face = cf::face::find "sound/$sound->[1]";
2923 cf::sound::set $sound->[0] => $face;
2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2925 }
2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2930 }
2931 }
2932 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2933 3228
2934 1 3229 1
2935} 3230}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
2936 3251
2937register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
2938 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
2939 3254
2940 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
2941 $ns->fx_want ($k, $v); 3256 $ns->fx_want ($k, $v);
2942 } 3257 }
2943}; 3258};
2944 3259
2945sub reload_regions { 3260sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = ();
3264
2946 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3266 or die "unable to load regions file\n";
2948 3267
2949 for (cf::region::list) { 3268 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3269 $_->{match} = qr/$_->{match}/
2986 3305
2987sub init { 3306sub init {
2988 reload_resources; 3307 reload_resources;
2989} 3308}
2990 3309
2991sub cfg_load { 3310sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3312 or return;
2994 3313
2995 local $/; 3314 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
2997 3316
2998 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2999 3318
3000 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3001 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3012sub main { 3331sub main {
3013 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3014 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3015 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3016 (async { 3335 (async {
3017 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
3018 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3019 }; 3339 };
3020 3340
3021 cfg_load; 3341 reload_config;
3022 db_init; 3342 db_init;
3023 load_extensions; 3343 load_extensions;
3024 3344
3025 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3026 Event::loop; 3347 EV::loop;
3027} 3348}
3028 3349
3029############################################################################# 3350#############################################################################
3030# initialisation and cleanup 3351# initialisation and cleanup
3031 3352
3032# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3033BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3034 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3035 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3036 reentrant => 0,
3037 data => WF_AUTOCANCEL,
3038 signal => $signal,
3039 prio => 0,
3040 cb => sub {
3041 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3042 },
3043 ); 3359 };
3044 } 3360 }
3045} 3361}
3046 3362
3047sub write_runtime { 3363sub write_runtime {
3048 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
3093 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3094 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3095 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3096 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3097 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3098 $pl->save; 3415 $pl->save;
3099 } 3416 }
3100 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3101 3418
3102 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
3141 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3142 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3143 3460
3144 # if anything goes wrong in here, we should simply crash as we already saved 3461 # if anything goes wrong in here, we should simply crash as we already saved
3145 3462
3146 warn "cancelling all WF_AUTOCANCEL watchers";
3147 for (Event::all_watchers) {
3148 $_->cancel if $_->data & WF_AUTOCANCEL;
3149 }
3150
3151 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3152 for (;;) { 3464 for (;;) {
3153 BDB::flush; 3465 BDB::flush;
3154 IO::AIO::flush; 3466 IO::AIO::flush;
3155 Coro::cede; 3467 Coro::cede_notself;
3156 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3157 warn "iterate..."; 3469 warn "iterate...";
3158 } 3470 }
3159 3471
3160 ++$RELOAD; 3472 ++$RELOAD;
3219 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
3220 require cf; 3532 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3534
3223 warn "loading config and database again"; 3535 warn "loading config and database again";
3224 cf::cfg_load; 3536 cf::reload_config;
3225 3537
3226 warn "loading extensions"; 3538 warn "loading extensions";
3227 cf::load_extensions; 3539 cf::load_extensions;
3228 3540
3229 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
3249 3561
3250sub reload_perl() { 3562sub reload_perl() {
3251 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3252 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3253 3565
3254 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3255 reentrant => 0,
3256 after => 0,
3257 data => WF_AUTOCANCEL,
3258 cb => sub {
3259 do_reload_perl;
3260 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3261 }, 3568 do_reload_perl;
3262 ); 3569 };
3263} 3570}
3264 3571
3265register_command "reload" => sub { 3572register_command "reload" => sub {
3266 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3267 3574
3268 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3269 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3270 async { reload_perl }; 3579 reload_perl;
3580 };
3271 } 3581 }
3272}; 3582};
3273 3583
3274unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3275 3585
3294 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 3606 $signal->wait;
3297} 3607}
3298 3608
3299 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3300 my $avg = 10;
3301$TICK_WATCHER = Event->timer (
3302 reentrant => 0,
3303 parked => 1,
3304 prio => 0,
3305 at => $NEXT_TICK || $TICK,
3306 data => WF_AUTOCANCEL,
3307 cb => sub {
3308 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3309 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3310 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3311 return; 3613 return;
3312 } 3614 }
3313 3615
3314 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3315 3617
3316 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3317 3619
3318 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
3319 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323 3622
3324 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3325 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3326 $map->alloc; 3625 Coro::async_pool {
3327 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
3328 my $t = Event::time - $t; 3627 write_runtime
3329 3628 or warn "ERROR: unable to write runtime file: $!";
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 }; 3629 };
3630 }
3340 3631
3341 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK;
3343
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345 $NEXT_RUNTIME_WRITE = $NOW + 10;
3346 Coro::async_pool {
3347 write_runtime
3348 or warn "ERROR: unable to write runtime file: $!";
3349 };
3350 }
3351
3352# my $AFTER = Event::time;
3353# warn $AFTER - $NOW;#d#
3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send; 3633 $sig->send;
3357 } 3634 }
3358 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send; 3636 $sig->send;
3360 } 3637 }
3361 3638
3362 $NOW = Event::time;
3363
3364 # if we are delayed by four ticks or more, skip them all
3365 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3366
3367 $TICK_WATCHER->at ($NEXT_TICK);
3368 $TICK_WATCHER->start;
3369
3370 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 3641
3373 _post_tick; 3642 _post_tick;
3374 3643};
3375 3644$TICK_WATCHER->priority (EV::MAXPRI);
3376 },
3377);
3378 3645
3379{ 3646{
3380 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
3381 $BDB_POLL_WATCHER = Event->io ( 3648
3382 reentrant => 0,
3383 fd => BDB::poll_fileno,
3384 poll => 'r',
3385 prio => 0,
3386 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb,
3388 );
3389 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3390 3650 BDB::max_poll_reqs $TICK * 0.1;
3391 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3392 my $status;
3393 my $current = $Coro::current;
3394 (
3395 sub {
3396 $status = $!;
3397 $current->ready; undef $current;
3398 },
3399 sub {
3400 Coro::schedule while defined $current;
3401 $! = $status;
3402 },
3403 )
3404 };
3405 3652
3406 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3407 $DB_ENV = BDB::db_env_create; 3654 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3656 | BDB::LOG_AUTOREMOVE, 1);
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3408 3659
3409 cf::sync_job { 3660 cf::sync_job {
3410 eval { 3661 eval {
3411 BDB::db_env_open 3662 BDB::db_env_open
3412 $DB_ENV, 3663 $DB_ENV,
3414 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3665 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 3667 0666;
3417 3668
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3421 $DB_ENV->set_lk_detect;
3422 }; 3670 };
3423 3671
3424 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 3673 };
3426 } 3674 }
3675
3676 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3677 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3678 };
3679 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3680 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3681 };
3682 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 };
3427} 3685}
3428 3686
3429{ 3687{
3688 # configure IO::AIO
3689
3430 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3431
3432 undef $Coro::AIO::WATCHER;
3433 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3434 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3435 reentrant => 0,
3436 data => WF_AUTOCANCEL,
3437 fd => IO::AIO::poll_fileno,
3438 poll => 'r',
3439 prio => 6,
3440 cb => \&IO::AIO::poll_cb,
3441 );
3442} 3693}
3443 3694
3444my $_log_backtrace; 3695my $_log_backtrace;
3445 3696
3446sub _log_backtrace { 3697sub _log_backtrace {
3450 3701
3451 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3452 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3453 ++$_log_backtrace; 3704 ++$_log_backtrace;
3454 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3455 my @bt = fork_call { 3708 my @bt = fork_call {
3456 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3457 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3711 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3459 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines