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.342 by root, Sun Aug 26 15:31:02 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
1257 1343
1258=head3 cf::player 1344=head3 cf::player
1259 1345
1260=over 4 1346=over 4
1261 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
1262=item cf::player::find $login 1362=item cf::player::find $login
1263 1363
1264Returns the given player object, loading it if necessary (might block). 1364Returns the given player object, loading it if necessary (might block).
1265 1365
1266=cut 1366=cut
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1401 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1402 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1403 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1404 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1405
1306 my $pl = load_pl path $login 1406 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1413 $cf::PLAYER{$login} = $pl
1309 } 1414 }
1310 } 1415 }
1311} 1416}
1312 1417
1322 1427
1323 aio_mkdir playerdir $pl, 0770; 1428 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1429 $pl->{last_save} = $cf::RUNTIME;
1325 1430
1326 $pl->save_pl ($path); 1431 $pl->save_pl ($path);
1327 Coro::cede; 1432 cf::cede_to_tick;
1328} 1433}
1329 1434
1330sub new($) { 1435sub new($) {
1331 my ($login) = @_; 1436 my ($login) = @_;
1332 1437
1410 or return []; 1515 or return [];
1411 1516
1412 my @logins; 1517 my @logins;
1413 1518
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1525 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1526 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 }
1418 1528
1419 utf8::decode $login; 1529 utf8::decode $login;
1420 push @logins, $login; 1530 push @logins, $login;
1421 } 1531 }
1422 1532
1455 1565
1456Expand crossfire pod fragments into protocol xml. 1566Expand crossfire pod fragments into protocol xml.
1457 1567
1458=cut 1568=cut
1459 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
1460sub expand_cfpod { 1581sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1582 my ($self, $pod) = @_;
1462 1583
1463 # escape & and < 1584 my $xml;
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1585
1467 # this is buggy, it needs to properly take care of nested <'s 1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1468 1589
1469 1 while 1590 $group =~ s/&/&amp;/g;
1470 # replace B<>, I<>, U<> etc. 1591 $group =~ s/</&lt;/g;
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1592
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1593 $xml .= $group;
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1594 } elsif ($pod =~ m%\G
1474 # replace G<male|female> tags 1595 ([BCGHITU])
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1596 <
1476 $self->gender ? $2 : $1 1597 (?:
1477 }ge 1598 ([^<>]*) (?{ $group = $^N })
1478 # replace H<hint text> 1599 | < $interior >
1479 || s{H<([^\>]*)>} 1600 )
1601 >
1602 %gcsx
1480 { 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") {
1481 ("<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>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1623 "")
1484 [$self->{hintmode}] 1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1485 }ge; 1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1486 1635
1636 for ($xml) {
1487 # create single paragraphs (very hackish) 1637 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g; 1638 s/(?<=\S)\n(?=\w)/ /g;
1489 1639
1490 # compress some whitespace 1640 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends 1641 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines 1642 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines 1643 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines 1644 s/\n+$//; # ending lines
1645 }
1495 1646
1496 $_ 1647 $xml
1497} 1648}
1649
1650no re 'eval';
1498 1651
1499sub hintmode { 1652sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1654 $_[0]{hintmode}
1502} 1655}
1746 1899
1747sub load_header_from($) { 1900sub load_header_from($) {
1748 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1749 1902
1750 utf8::encode $path; 1903 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 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;
1756 1912
1757 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1758 1914
1759 1 1915 1
1760} 1916}
1814sub find { 1970sub find {
1815 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1816 1972
1817 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1818 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1820 1977
1821 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1824 or return; 1983 or return;
1825 1984
1826 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1827 1986
1829 or return; 1988 or return;
1830 1989
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard1;
1994 undef $guard2;
1834 $map->reset; 1995 $map->reset;
1835 undef $guard;
1836 return find $path; 1996 return find $path;
1837 } 1997 }
1838 1998
1839 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1840 } 2000 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1850 2010
1851 my $path = $self->{path}; 2011 my $path = $self->{path};
1852 2012
1853 { 2013 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1855 2015
2016 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2018
1858 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1859 2020
1860 $self->alloc; 2021 $self->alloc;
1861 2022
1862 $self->pre_load; 2023 $self->pre_load;
1863 Coro::cede; 2024 cf::cede_to_tick;
1864 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1866 or return; 2029 or return;
1867 2030
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1870 2033
1871 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2035 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2038 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1876 } 2042 }
1877 } 2043 }
1878 2044
1879 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1880 # now do the right thing for maps 2048 # now do the right thing for maps
1881 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2051 unless $self->difficulty;
1884 Coro::cede; 2052 cf::cede_to_tick;
1885 2053
1886 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2055 $self->decay_objects;
1888 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1889 $self->update_buttons; 2057 $self->update_buttons;
1890 Coro::cede; 2058 cf::cede_to_tick;
1891 $self->set_darkness_map; 2059 $self->set_darkness_map;
1892 Coro::cede; 2060 cf::cede_to_tick;
1893 $self->activate; 2061 $self->activate;
1894 } 2062 }
1895 2063
1896 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
1968 } 2136 }
1969 2137
1970 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
1971 2139
1972 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1973 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2145 if (my $map = find $k) {
1976 $map->load if $v; 2146 $map->load if $v;
1977 } 2147 }
1987} 2157}
1988 2158
1989sub save { 2159sub save {
1990 my ($self) = @_; 2160 my ($self) = @_;
1991 2161
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2163
1994 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1995 2165
1996 return unless $self->dirty; 2166 return unless $self->dirty;
1997 2167
2003 return if $self->{deny_save}; 2173 return if $self->{deny_save};
2004 2174
2005 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
2006 2176
2007 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2009 }; 2180 };
2010 2181
2011 if ($uniq) { 2182 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2020 my ($self) = @_; 2191 my ($self) = @_;
2021 2192
2022 # save first because save cedes 2193 # save first because save cedes
2023 $self->save; 2194 $self->save;
2024 2195
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2196 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2197
2027 return if $self->players; 2198 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2200 return if $self->{deny_save};
2030 2201
2202 $self->in_memory (cf::MAP_SWAPPED);
2203
2204 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2206 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2207}
2034 2208
2035sub reset_at { 2209sub reset_at {
2036 my ($self) = @_; 2210 my ($self) = @_;
2037 2211
2069 if $uniq; 2243 if $uniq;
2070 } 2244 }
2071 2245
2072 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2073 2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2250 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2251
2078 $self->unlink_save; 2252 $self->unlink_save;
2079 $self->destroy; 2253 $self->destroy;
2080} 2254}
2081 2255
2082my $nuke_counter = "aaaa"; 2256my $nuke_counter = "aaaa";
2083 2257
2084sub nuke { 2258sub nuke {
2085 my ($self) = @_; 2259 my ($self) = @_;
2086 2260
2261 {
2262 my $lock = cf::lock_acquire "map_data:$self->{path}";
2263
2087 delete $cf::MAP{$self->path}; 2264 delete $cf::MAP{$self->path};
2088 2265
2089 $self->unlink_save; 2266 $self->unlink_save;
2090 2267
2091 bless $self, "cf::map"; 2268 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2269 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2270 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2271 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2273
2097 $cf::MAP{$self->path} = $self; 2274 $cf::MAP{$self->path} = $self;
2275 }
2098 2276
2099 $self->reset; # polite request, might not happen 2277 $self->reset; # polite request, might not happen
2100} 2278}
2101 2279
2102=item $maps = cf::map::tmp_maps 2280=item $maps = cf::map::tmp_maps
2178 2356
2179sub inv_recursive { 2357sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2358 inv_recursive_ inv $_[0]
2181} 2359}
2182 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
2183package cf; 2389package cf;
2184 2390
2185=back 2391=back
2186 2392
2187=head3 cf::object::player 2393=head3 cf::object::player
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2552
2347 $self->enter_link; 2553 $self->enter_link;
2348 2554
2349 (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
2350 my $map = eval { 2577 my $map = eval {
2351 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2352 2579
2353 if ($map) { 2580 if ($map) {
2354 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2356 } else { 2583 } else {
2357 $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);
2358 } 2585 }
2359 2586
2360 $map 2587 $map
2361 }; 2588 };
2362 2589
2415 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2416 } 2643 }
2417 2644
2418 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2419 2646
2420 my $data = cf::to_json $rmp; 2647 my $data = cf::encode_json $rmp;
2421 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2423 2650
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2452 # if exit is damned, update players death & WoR home-position 2679 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2680 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2681 if $exit->flag (FLAG_DAMNED);
2455 2682
2456 (async { 2683 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2685
2457 $self->deactivate_recursive; # just to be sure 2686 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2687 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2688 $self->goto ($slaying, $hp, $sp);
2460 2689
2461 1; 2690 1;
2496the 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
2497the message unless the client supports the msg packet. 2726the message unless the client supports the msg packet.
2498 2727
2499=cut 2728=cut
2500 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
2501sub cf::client::send_msg { 2782sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2783 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2784
2504 $msg = $self->pl->expand_cfpod ($msg); 2785 $msg = $self->pl->expand_cfpod ($msg);
2505 2786
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2787 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 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
2508 if (ref $channel) { 2798 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2799 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2800 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2801 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2802 $self->ext_msg (channel_info => $channel)
2803 if $self->can_msg;
2513 } 2804 }
2514 2805
2515 $channel = $channel->{id}; 2806 $channel = $channel->{id};
2516 } 2807 }
2517 2808
2558=cut 2849=cut
2559 2850
2560sub cf::client::ext_msg($$@) { 2851sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2852 my ($self, $type, @msg) = @_;
2562 2853
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2854 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2856 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2857 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2859 }
2571} 2860}
2572 2861
2579sub cf::client::ext_reply($$@) { 2868sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2869 my ($self, $id, @msg) = @_;
2581 2870
2582 if ($self->extcmd == 2) { 2871 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2873 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2874 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2875 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2877 }
2589} 2878}
2731=pod 3020=pod
2732 3021
2733The following functions and methods are available within a safe environment: 3022The following functions and methods are available within a safe environment:
2734 3023
2735 cf::object 3024 cf::object
2736 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
2737 insert remove name archname title slaying race decrease_ob_nr 3026 insert remove name archname title slaying race decrease_ob_nr
2738 3027
2739 cf::object::player 3028 cf::object::player
2740 player 3029 player
2741 3030
2748=cut 3037=cut
2749 3038
2750for ( 3039for (
2751 ["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
2752 insert remove inv name archname title slaying race 3041 insert remove inv name archname title slaying race
2753 decrease_ob_nr)], 3042 decrease_ob_nr destroy)],
2754 ["cf::object::player" => qw(player)], 3043 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3044 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 3045 ["cf::map" => qw(trigger)],
2757) { 3046) {
2758 no strict 'refs'; 3047 no strict 'refs';
2834# the server's init and main functions 3123# the server's init and main functions
2835 3124
2836sub load_facedata($) { 3125sub load_facedata($) {
2837 my ($path) = @_; 3126 my ($path) = @_;
2838 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
2839 my $enc = JSON::XS->new->utf8->canonical; 3132 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3133
2841 warn "loading facedata from $path\n"; 3134 warn "loading facedata from $path\n";
2842 3135
2843 my $facedata; 3136 my $facedata;
2844 0 < aio_load $path, $facedata 3137 0 < aio_load $path, $facedata
2859 { 3152 {
2860 my $faces = $facedata->{faceinfo}; 3153 my $faces = $facedata->{faceinfo};
2861 3154
2862 while (my ($face, $info) = each %$faces) { 3155 while (my ($face, $info) = each %$faces) {
2863 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3156 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157
2864 cf::face::set_visibility $idx, $info->{visibility}; 3158 cf::face::set_visibility $idx, $info->{visibility};
2865 cf::face::set_magicmap $idx, $info->{magicmap}; 3159 cf::face::set_magicmap $idx, $info->{magicmap};
2866 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};
2867 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};
2868 3162
2869 cf::cede_to_tick; 3163 cf::cede_to_tick;
2870 } 3164 }
2871 3165
2872 while (my ($face, $info) = each %$faces) { 3166 while (my ($face, $info) = each %$faces) {
2873 next unless $info->{smooth}; 3167 next unless $info->{smooth};
3168
2874 my $idx = cf::face::find $face 3169 my $idx = cf::face::find $face
2875 or next; 3170 or next;
3171
2876 if (my $smooth = cf::face::find $info->{smooth}) { 3172 if (my $smooth = cf::face::find $info->{smooth}) {
2877 cf::face::set_smooth $idx, $smooth; 3173 cf::face::set_smooth $idx, $smooth;
2878 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2879 } else { 3175 } else {
2880 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3176 warn "smooth face '$info->{smooth}' not found for face '$face'";
2898 { 3194 {
2899 # TODO: for gcfclient pleasure, we should give resources 3195 # TODO: for gcfclient pleasure, we should give resources
2900 # that gcfclient doesn't grok a >10000 face index. 3196 # that gcfclient doesn't grok a >10000 face index.
2901 my $res = $facedata->{resource}; 3197 my $res = $facedata->{resource};
2902 3198
2903 my $soundconf = delete $res->{"res/sound.conf"};
2904
2905 while (my ($name, $info) = each %$res) { 3199 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) {
2906 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3201 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2907 my $data; 3202 my $data;
2908 3203
2909 if ($info->{type} & 1) { 3204 if ($info->{type} & 1) {
2910 # prepend meta info 3205 # prepend meta info
2911 3206
2912 my $meta = $enc->encode ({ 3207 my $meta = $enc->encode ({
2913 name => $name, 3208 name => $name,
2914 %{ $info->{meta} || {} }, 3209 %{ $info->{meta} || {} },
2915 }); 3210 });
2916 3211
2917 $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};
2918 } else { 3219 } else {
2919 $data = $info->{data}; 3220 $RESOURCE{$name} = $info;
2920 } 3221 }
2921 3222
2922 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2923 cf::face::set_type $idx, $info->{type};
2924
2925 cf::cede_to_tick; 3223 cf::cede_to_tick;
2926 } 3224 }
2927
2928 if ($soundconf) {
2929 $soundconf = $enc->decode (delete $soundconf->{data});
2930
2931 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2932 my $sound = $soundconf->{compat}[$_]
2933 or next;
2934
2935 my $face = cf::face::find "sound/$sound->[1]";
2936 cf::sound::set $sound->[0] => $face;
2937 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2938 }
2939
2940 while (my ($k, $v) = each %{$soundconf->{event}}) {
2941 my $face = cf::face::find "sound/$v";
2942 cf::sound::set $k => $face;
2943 }
2944 }
2945 } 3225 }
3226
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2946 3228
2947 1 3229 1
2948} 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});
2949 3251
2950register_exticmd fx_want => sub { 3252register_exticmd fx_want => sub {
2951 my ($ns, $want) = @_; 3253 my ($ns, $want) = @_;
2952 3254
2953 while (my ($k, $v) = each %$want) { 3255 while (my ($k, $v) = each %$want) {
2954 $ns->fx_want ($k, $v); 3256 $ns->fx_want ($k, $v);
2955 } 3257 }
2956}; 3258};
2957 3259
2958sub 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
2959 load_resource_file "$MAPDIR/regions" 3265 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3266 or die "unable to load regions file\n";
2961 3267
2962 for (cf::region::list) { 3268 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3269 $_->{match} = qr/$_->{match}/
2999 3305
3000sub init { 3306sub init {
3001 reload_resources; 3307 reload_resources;
3002} 3308}
3003 3309
3004sub cfg_load { 3310sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3311 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3312 or return;
3007 3313
3008 local $/; 3314 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3315 *CFG = YAML::Load <$fh>;
3010 3316
3011 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3012 3318
3013 $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};
3014 $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};
3025sub main { 3331sub main {
3026 # we must not ever block the main coroutine 3332 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3333 local $Coro::idle = sub {
3028 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#
3029 (async { 3335 (async {
3030 Event::one_event; 3336 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3338 })->prio (Coro::PRIO_MAX);
3032 }; 3339 };
3033 3340
3034 cfg_load; 3341 reload_config;
3035 db_init; 3342 db_init;
3036 load_extensions; 3343 load_extensions;
3037 3344
3038 $TICK_WATCHER->start; 3345 $TICK_WATCHER->start;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3039 Event::loop; 3347 EV::loop;
3040} 3348}
3041 3349
3042############################################################################# 3350#############################################################################
3043# initialisation and cleanup 3351# initialisation and cleanup
3044 3352
3045# install some emergency cleanup handlers 3353# install some emergency cleanup handlers
3046BEGIN { 3354BEGIN {
3355 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3356 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3357 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3358 cf::cleanup "SIG$signal";
3055 },
3056 ); 3359 };
3057 } 3360 }
3058} 3361}
3059 3362
3060sub write_runtime { 3363sub write_runtime {
3061 my $runtime = "$LOCALDIR/runtime"; 3364 my $runtime = "$LOCALDIR/runtime";
3106 # and maps saved/destroyed asynchronously. 3409 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3410 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3411 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3412 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3413 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3415 $pl->save;
3112 } 3416 }
3113 warn "end emergency player save\n"; 3417 warn "end emergency player save\n";
3114 3418
3115 warn "begin emergency map save\n"; 3419 warn "begin emergency map save\n";
3154 warn "syncing database to disk"; 3458 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV; 3459 BDB::db_env_txn_checkpoint $DB_ENV;
3156 3460
3157 # 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
3158 3462
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests"; 3463 warn "flushing outstanding aio requests";
3165 for (;;) { 3464 for (;;) {
3166 BDB::flush; 3465 BDB::flush;
3167 IO::AIO::flush; 3466 IO::AIO::flush;
3168 Coro::cede; 3467 Coro::cede_notself;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3468 last unless IO::AIO::nreqs || BDB::nreqs;
3170 warn "iterate..."; 3469 warn "iterate...";
3171 } 3470 }
3172 3471
3173 ++$RELOAD; 3472 ++$RELOAD;
3232 warn "reloading cf.pm"; 3531 warn "reloading cf.pm";
3233 require cf; 3532 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3534
3236 warn "loading config and database again"; 3535 warn "loading config and database again";
3237 cf::cfg_load; 3536 cf::reload_config;
3238 3537
3239 warn "loading extensions"; 3538 warn "loading extensions";
3240 cf::load_extensions; 3539 cf::load_extensions;
3241 3540
3242 warn "reattaching attachments to objects/players"; 3541 warn "reattaching attachments to objects/players";
3262 3561
3263sub reload_perl() { 3562sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3563 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3564 # coro crashes during coro_state_free->destroy here.
3266 3565
3267 $RELOAD_WATCHER ||= Event->timer ( 3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3268 reentrant => 0,
3269 after => 0,
3270 data => WF_AUTOCANCEL,
3271 cb => sub {
3272 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3567 undef $RELOAD_WATCHER;
3274 }, 3568 do_reload_perl;
3275 ); 3569 };
3276} 3570}
3277 3571
3278register_command "reload" => sub { 3572register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3573 my ($who, $arg) = @_;
3280 3574
3281 if ($who->flag (FLAG_WIZ)) { 3575 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3576 $who->message ("reloading server.");
3577 async {
3578 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3579 reload_perl;
3580 };
3284 } 3581 }
3285}; 3582};
3286 3583
3287unshift @INC, $LIBDIR; 3584unshift @INC, $LIBDIR;
3288 3585
3307 my $signal = new Coro::Signal; 3604 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3605 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3606 $signal->wait;
3310} 3607}
3311 3608
3312 my $min = 1e6;#d# 3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 3610 if ($Coro::current != $Coro::main) {
3322 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"
3323 unless ++$bug_warning > 10; 3612 unless ++$bug_warning > 10;
3324 return; 3613 return;
3325 } 3614 }
3326 3615
3327 $NOW = $tick_start = Event::time; 3616 $NOW = $tick_start = EV::now;
3328 3617
3329 cf::server_tick; # one server iteration 3618 cf::server_tick; # one server iteration
3330 3619
3331 0 && sync_job {#d# 3620 $RUNTIME += $TICK;
3332 for(1..10) { 3621 $NEXT_TICK = $_[0]->at;
3333 my $t = Event::time;
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3335 or die;
3336 3622
3337 $map->width (50); 3623 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3338 $map->height (50); 3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3339 $map->alloc; 3625 Coro::async_pool {
3340 $map->_load_objects ("/tmp/x.map", 1); 3626 $Coro::current->{desc} = "runtime saver";
3341 my $t = Event::time - $t; 3627 write_runtime
3342 3628 or warn "ERROR: unable to write runtime file: $!";
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 3629 };
3630 }
3353 3631
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3633 $sig->send;
3370 } 3634 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3635 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3636 $sig->send;
3373 } 3637 }
3374 3638
3375 $NOW = Event::time;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK; 3639 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3641
3386 _post_tick; 3642 _post_tick;
3387 3643};
3388 3644$TICK_WATCHER->priority (EV::MAXPRI);
3389 },
3390);
3391 3645
3392{ 3646{
3393 BDB::max_poll_time $TICK * 0.1; 3647 # configure BDB
3394 $BDB_POLL_WATCHER = Event->io ( 3648
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8; 3649 BDB::min_parallel 8;
3403 3650 BDB::max_poll_reqs $TICK * 0.1;
3404 BDB::set_sync_prepare { 3651 $Coro::BDB::WATCHER->priority (1);
3405 my $status;
3406 my $current = $Coro::current;
3407 (
3408 sub {
3409 $status = $!;
3410 $current->ready; undef $current;
3411 },
3412 sub {
3413 Coro::schedule while defined $current;
3414 $! = $status;
3415 },
3416 )
3417 };
3418 3652
3419 unless ($DB_ENV) { 3653 unless ($DB_ENV) {
3420 $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);
3421 3659
3422 cf::sync_job { 3660 cf::sync_job {
3423 eval { 3661 eval {
3424 BDB::db_env_open 3662 BDB::db_env_open
3425 $DB_ENV, 3663 $DB_ENV,
3427 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
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3666 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3667 0666;
3430 3668
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3669 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3670 };
3436 3671
3437 cf::cleanup "db_env_open(db): $@" if $@; 3672 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3673 };
3439 } 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 };
3440} 3685}
3441 3686
3442{ 3687{
3688 # configure IO::AIO
3689
3443 IO::AIO::min_parallel 8; 3690 IO::AIO::min_parallel 8;
3444
3445 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 3691 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 3692 $Coro::AIO::WATCHER->priority (1);
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 3693}
3456 3694
3457my $_log_backtrace; 3695my $_log_backtrace;
3458 3696
3459sub _log_backtrace { 3697sub _log_backtrace {
3463 3701
3464 # limit the # of concurrent backtraces 3702 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3703 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3704 ++$_log_backtrace;
3467 async { 3705 async {
3706 $Coro::current->{desc} = "abt $msg";
3707
3468 my @bt = fork_call { 3708 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3709 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3710 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 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 |"
3472 or die "addr2line: $!"; 3712 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines