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.347 by root, Thu Aug 30 05:16:09 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 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 (); 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 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
196 210
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
213)) { 227)) {
214 no strict 'refs'; 228 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 230}
217 231
218$Event::DIED = sub { 232$EV::DIED = sub {
219 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
220}; 234};
221 235
222############################################################################# 236#############################################################################
223 237
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 261 $d
248 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
249} 263}
250 264
251=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
252 266
253Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
254 268
255=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
256 270
257Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
258 272
259=cut 273=cut
260 274
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 276
263sub to_json ($) { $json_coder->encode ($_[0]) } 277sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 278sub decode_json($) { $json_coder->decode ($_[0]) }
265 279
266=item cf::lock_wait $string 280=item cf::lock_wait $string
267 281
268Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
269 283
285Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
286 300
287=cut 301=cut
288 302
289our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
290 305
291sub lock_wait($) { 306sub lock_wait($) {
292 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
293 313
294 # wait for lock, if any 314 # wait for lock, if any
295 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 317 Coro::schedule;
303 323
304 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
305 lock_wait $key; 325 lock_wait $key;
306 326
307 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
308 329
309 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
312 } 334 }
313} 335}
314 336
326 }; 348 };
327 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
328 $guard 350 $guard
329} 351}
330 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
331=item cf::get_slot $time[, $priority[, $name]] 368=item cf::get_slot $time[, $priority[, $name]]
332 369
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 370Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds 371This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede. 372of cpu time till the next tick. The slot is only valid till the next cede.
344our @SLOT_QUEUE; 381our @SLOT_QUEUE;
345our $SLOT_QUEUE; 382our $SLOT_QUEUE;
346 383
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
349 my $signal = new Coro::Signal; 388 my $signal = new Coro::Signal;
350 389
351 while () { 390 while () {
352 next_job: 391 next_job:
353 my $avail = cf::till_tick; 392 my $avail = cf::till_tick;
361 } 400 }
362 } 401 }
363 } 402 }
364 403
365 if (@SLOT_QUEUE) { 404 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 406 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 407 $signal->wait;
369 } else { 408 } else {
370 Coro::schedule; 409 Coro::schedule;
371 } 410 }
394 433
395BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
396 435
397=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
398 437
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 438The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 439is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 441acceptable.
403 442
404If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
405the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
410 449
411sub sync_job(&) { 450sub sync_job(&) {
412 my ($job) = @_; 451 my ($job) = @_;
413 452
414 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 454 my $time = EV::time;
416 455
417 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
419 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
420 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 462 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
423 464
424 my $busy = 1; 465 my $busy = 1;
425 my @res; 466 my @res;
426 467
427 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 470 @res = eval { $job->() };
429 warn $@ if $@; 471 warn $@ if $@;
430 undef $busy; 472 undef $busy;
431 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
432 474
433 while ($busy) { 475 while ($busy) {
434 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
435 } 480 }
481 }
436 482
437 $time = Event::time - $time; 483 $time = EV::time - $time;
438 484
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active; 486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441 487
442 $tick_start += $time; # do not account sync jobs to server load 488 $tick_start += $time; # do not account sync jobs to server load
472=item fork_call { }, $args 518=item fork_call { }, $args
473 519
474Executes the given code block with the given arguments in a seperate 520Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 521process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 522Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 523never block itself or use any form of event handling.
478 524
479=cut 525=cut
480 526
481sub fork_call(&@) { 527sub fork_call(&@) {
482 my ($cb, @args) = @_; 528 my ($cb, @args) = @_;
483 529
484 # we seemingly have to make a local copy of the whole thing, 530 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 531 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 532 # TODO: investigate and fix (likely this will be rather laborious)
487 533
488 my @res = Coro::Util::fork_eval { 534 my @res = Coro::Util::fork_eval {
489 reset_signals; 535 reset_signals;
490 &$cb 536 &$cb
491 }, @args; 537 }, @args;
500=item cf::db_put $family => $key => $value 546=item cf::db_put $family => $key => $value
501 547
502Stores the given C<$value> in the family. It can currently store binary 548Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
505=cut 556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
506 574
507our $DB; 575our $DB;
508 576
509sub db_init { 577sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 578 cf::sync_job {
514 eval { 579 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 580 };
524} 581}
525 582
526sub db_get($$) { 583sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 584 my $key = "$_[0]/$_[1]";
528 585
632attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
634 691
635In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
636C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 694Deliantra).
638 695
639=over 4 696=over 4
640 697
641=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
642 699
924 } 981 }
925 982
926 0 983 0
927} 984}
928 985
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 987
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 989
933Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
934 991
940 997
941=cut 998=cut
942 999
943############################################################################# 1000#############################################################################
944# object support 1001# object support
945#
946 1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
947sub _can_merge { 1036sub _can_merge {
948 my ($ob1, $ob2) = @_; 1037 my ($ob1, $ob2) = @_;
949 1038
950 local $Storable::canonical = 1; 1039 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1040
954 $fob1 eq $fob2 1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
955} 1043}
956 1044
957sub reattach { 1045sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1047 my ($obj) = @_;
981cf::attachable->attach ( 1069cf::attachable->attach (
982 prio => -1000000, 1070 prio => -1000000,
983 on_instantiate => sub { 1071 on_instantiate => sub {
984 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
985 1073
986 $data = from_json $data; 1074 $data = decode_json $data;
987 1075
988 for (@$data) { 1076 for (@$data) {
989 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
990 1078
991 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1095sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
1009 1097
1010 sync_job { 1098 sync_job {
1011 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
1014 1103
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1108 close $fh;
1020 1109
1021 if (@$objs) { 1110 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1116 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1118 }
1037 } 1126 }
1038 } else { 1127 } else {
1039 aio_unlink $filename; 1128 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
1041 } 1130 }
1042 } 1131 };
1043} 1132}
1044 1133
1045sub object_freezer_as_string { 1134sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
1047 1136
1059 or return; 1148 or return;
1060 1149
1061 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1152 or return;
1153
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
1065 } 1156 }
1066 1157
1158 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1160 $decname, length $data, scalar @{$av || []};
1161
1069 return ($data, $av); 1162 ($data, $av)
1070} 1163}
1071 1164
1072=head2 COMMAND CALLBACKS 1165=head2 COMMAND CALLBACKS
1073 1166
1074=over 4 1167=over 4
1260 1353
1261=head3 cf::player 1354=head3 cf::player
1262 1355
1263=over 4 1356=over 4
1264 1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
1371
1265=item cf::player::find $login 1372=item cf::player::find $login
1266 1373
1267Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
1268 1375
1269=cut 1376=cut
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1415
1309 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1312 } 1424 }
1313 } 1425 }
1314} 1426}
1315 1427
1413 or return []; 1525 or return [];
1414 1526
1415 my @logins; 1527 my @logins;
1416 1528
1417 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1421 1538
1422 utf8::decode $login; 1539 utf8::decode $login;
1423 push @logins, $login; 1540 push @logins, $login;
1424 } 1541 }
1425 1542
1458 1575
1459Expand crossfire pod fragments into protocol xml. 1576Expand crossfire pod fragments into protocol xml.
1460 1577
1461=cut 1578=cut
1462 1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1463sub expand_cfpod { 1591sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1592 my ($self, $pod) = @_;
1465 1593
1466 # escape & and < 1594 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1595
1470 # this is buggy, it needs to properly take care of nested <'s 1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1471 1599
1472 1 while 1600 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1601 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1602
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1603 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1604 } elsif ($pod =~ m%\G
1477 # replace G<male|female> tags 1605 ([BCGHITU])
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1606 <
1479 $self->gender ? $2 : $1 1607 (?:
1480 }ge 1608 ([^<>]*) (?{ $group = $^N })
1481 # replace H<hint text> 1609 | < $interior >
1482 || s{H<([^\>]*)>} 1610 )
1611 >
1612 %gcsx
1483 { 1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1633 "")
1487 [$self->{hintmode}] 1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1488 }ge; 1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1489 1645
1646 for ($xml) {
1490 # create single paragraphs (very hackish) 1647 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g; 1648 s/(?<=\S)\n(?=\w)/ /g;
1492 1649
1493 # compress some whitespace 1650 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends 1651 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines 1652 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines 1653 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines 1654 s/\n+$//; # ending lines
1655 }
1498 1656
1499 $_ 1657 $xml
1500} 1658}
1659
1660no re 'eval';
1501 1661
1502sub hintmode { 1662sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1664 $_[0]{hintmode}
1505} 1665}
1749 1909
1750sub load_header_from($) { 1910sub load_header_from($) {
1751 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1752 1912
1753 utf8::encode $path; 1913 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1759 1922
1760 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1761 1924
1762 1 1925 1
1763} 1926}
1817sub find { 1980sub find {
1818 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1819 1982
1820 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1821 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1823 1987
1824 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1826 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1827 or return; 1993 or return;
1828 1994
1829 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1830 1996
1832 or return; 1998 or return;
1833 1999
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1837 $map->reset; 2005 $map->reset;
1838 undef $guard;
1839 return find $path; 2006 return find $path;
1840 } 2007 }
1841 2008
1842 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1843 } 2010 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1853 2020
1854 my $path = $self->{path}; 2021 my $path = $self->{path};
1855 2022
1856 { 2023 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 2025
2026 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2028
1862 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1863 2030
1864 $self->alloc; 2031 $self->alloc;
1865 2032
1866 $self->pre_load; 2033 $self->pre_load;
1867 cf::cede_to_tick; 2034 cf::cede_to_tick;
1868 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1870 or return; 2039 or return;
1871 2040
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1874 2043
1875 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2045 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2048 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1880 } 2052 }
1881 } 2053 }
2054
2055 $f->resolve_delayed_derefs;
1882 2056
1883 cf::cede_to_tick; 2057 cf::cede_to_tick;
1884 # now do the right thing for maps 2058 # now do the right thing for maps
1885 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1972 } 2146 }
1973 2147
1974 $MAP_PREFETCH{$path} |= $load; 2148 $MAP_PREFETCH{$path} |= $load;
1975 2149
1976 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1977 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2155 if (my $map = find $k) {
1980 $map->load if $v; 2156 $map->load if $v;
1981 } 2157 }
2007 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2008 2184
2009 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
2010 2186
2011 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
2013 }; 2190 };
2014 2191
2015 if ($uniq) { 2192 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 2207
2031 return if $self->players; 2208 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2034 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2216 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2217}
2038 2218
2039sub reset_at { 2219sub reset_at {
2040 my ($self) = @_; 2220 my ($self) = @_;
2041 2221
2073 if $uniq; 2253 if $uniq;
2074 } 2254 }
2075 2255
2076 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
2077 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2260 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2261
2082 $self->unlink_save; 2262 $self->unlink_save;
2083 $self->destroy; 2263 $self->destroy;
2084} 2264}
2085 2265
2086my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
2087 2267
2088sub nuke { 2268sub nuke {
2089 my ($self) = @_; 2269 my ($self) = @_;
2090 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
2091 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
2092 2275
2093 $self->unlink_save; 2276 $self->unlink_save;
2094 2277
2095 bless $self, "cf::map"; 2278 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2283
2101 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
2102 2286
2103 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2104} 2288}
2105 2289
2106=item $maps = cf::map::tmp_maps 2290=item $maps = cf::map::tmp_maps
2182 2366
2183sub inv_recursive { 2367sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2185} 2369}
2186 2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
2397}
2398
2187package cf; 2399package cf;
2188 2400
2189=back 2401=back
2190 2402
2191=head3 cf::object::player 2403=head3 cf::object::player
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2562
2351 $self->enter_link; 2563 $self->enter_link;
2352 2564
2353 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2354 my $map = eval { 2587 my $map = eval {
2355 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2356 2589
2357 if ($map) { 2590 if ($map) {
2358 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2360 } else { 2593 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2595 }
2363 2596
2364 $map 2597 $map
2365 }; 2598 };
2366 2599
2419 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2420 } 2653 }
2421 2654
2422 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2423 2656
2424 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2425 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2426 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2427 2660
2428 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2429 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2456 # if exit is damned, update players death & WoR home-position 2689 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp) 2690 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED); 2691 if $exit->flag (FLAG_DAMNED);
2459 2692
2460 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2461 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2462 unless (eval { 2697 unless (eval {
2463 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2464 2699
2465 1; 2700 1;
2500the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2502 2737
2503=cut 2738=cut
2504 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2505sub cf::client::send_msg { 2792sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2793 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2794
2508 $msg = $self->pl->expand_cfpod ($msg); 2795 $msg = $self->pl->expand_cfpod ($msg);
2509 2796
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2512 if (ref $channel) { 2808 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 2809 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2810 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2811 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2517 } 2814 }
2518 2815
2519 $channel = $channel->{id}; 2816 $channel = $channel->{id};
2520 } 2817 }
2521 2818
2733=pod 3030=pod
2734 3031
2735The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2736 3033
2737 cf::object 3034 cf::object
2738 contr pay_amount pay_player map x y force_find force_add 3035 contr pay_amount pay_player map x y force_find force_add destroy
2739 insert remove name archname title slaying race decrease_ob_nr 3036 insert remove name archname title slaying race decrease_ob_nr
2740 3037
2741 cf::object::player 3038 cf::object::player
2742 player 3039 player
2743 3040
2750=cut 3047=cut
2751 3048
2752for ( 3049for (
2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race 3051 insert remove inv name archname title slaying race
2755 decrease_ob_nr)], 3052 decrease_ob_nr destroy)],
2756 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2758 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2759) { 3056) {
2760 no strict 'refs'; 3057 no strict 'refs';
2836# the server's init and main functions 3133# the server's init and main functions
2837 3134
2838sub load_facedata($) { 3135sub load_facedata($) {
2839 my ($path) = @_; 3136 my ($path) = @_;
2840 3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2842 3143
2843 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2844 3145
2845 my $facedata; 3146 my $facedata;
2861 { 3162 {
2862 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2863 3164
2864 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2866 cf::face::set_visibility $idx, $info->{visibility}; 3168 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3169 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3172
2871 cf::cede_to_tick; 3173 cf::cede_to_tick;
2872 } 3174 }
2873 3175
2874 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2876 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2877 or next; 3180 or next;
3181
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3183 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3185 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2900 { 3204 {
2901 # TODO: for gcfclient pleasure, we should give resources 3205 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3206 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3207 my $res = $facedata->{resource};
2904 3208
2905 my $soundconf = delete $res->{"res/sound.conf"};
2906
2907 while (my ($name, $info) = each %$res) { 3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
2908 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909 my $data; 3212 my $data;
2910 3213
2911 if ($info->{type} & 1) { 3214 if ($info->{type} & 1) {
2912 # prepend meta info 3215 # prepend meta info
2913 3216
2914 my $meta = $enc->encode ({ 3217 my $meta = $enc->encode ({
2915 name => $name, 3218 name => $name,
2916 %{ $info->{meta} || {} }, 3219 %{ $info->{meta} || {} },
2917 }); 3220 });
2918 3221
2919 $data = pack "(w/a*)*", $meta, $info->{data}; 3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
2920 } else { 3229 } else {
2921 $data = $info->{data}; 3230 $RESOURCE{$name} = $info;
2922 } 3231 }
2923 3232
2924 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925 cf::face::set_type $idx, $info->{type};
2926
2927 cf::cede_to_tick; 3233 cf::cede_to_tick;
2928 } 3234 }
2929
2930 if ($soundconf) {
2931 $soundconf = $enc->decode (delete $soundconf->{data});
2932
2933 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934 my $sound = $soundconf->{compat}[$_]
2935 or next;
2936
2937 my $face = cf::face::find "sound/$sound->[1]";
2938 cf::sound::set $sound->[0] => $face;
2939 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940 }
2941
2942 while (my ($k, $v) = each %{$soundconf->{event}}) {
2943 my $face = cf::face::find "sound/$v";
2944 cf::sound::set $k => $face;
2945 }
2946 }
2947 } 3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2948 3238
2949 1 3239 1
2950} 3240}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
2951 3261
2952register_exticmd fx_want => sub { 3262register_exticmd fx_want => sub {
2953 my ($ns, $want) = @_; 3263 my ($ns, $want) = @_;
2954 3264
2955 while (my ($k, $v) = each %$want) { 3265 while (my ($k, $v) = each %$want) {
2956 $ns->fx_want ($k, $v); 3266 $ns->fx_want ($k, $v);
2957 } 3267 }
2958}; 3268};
2959 3269
2960sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2961 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2962 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
2963 3277
2964 for (cf::region::list) { 3278 for (cf::region::list) {
2965 $_->{match} = qr/$_->{match}/ 3279 $_->{match} = qr/$_->{match}/
3006sub reload_config { 3320sub reload_config {
3007 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
3008 or return; 3322 or return;
3009 3323
3010 local $/; 3324 local $/;
3011 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
3012 3326
3013 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3014 3328
3015 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3016 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3027sub main { 3341sub main {
3028 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
3029 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
3030 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3031 (async { 3345 (async {
3032 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
3033 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
3034 }; 3349 };
3035 3350
3036 reload_config; 3351 reload_config;
3037 db_init; 3352 db_init;
3038 load_extensions; 3353 load_extensions;
3039 3354
3040 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3041 Event::loop; 3357 EV::loop;
3042} 3358}
3043 3359
3044############################################################################# 3360#############################################################################
3045# initialisation and cleanup 3361# initialisation and cleanup
3046 3362
3047# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
3048BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
3049 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
3050 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3051 reentrant => 0,
3052 data => WF_AUTOCANCEL,
3053 signal => $signal,
3054 prio => 0,
3055 cb => sub {
3056 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
3057 },
3058 ); 3369 };
3059 } 3370 }
3060} 3371}
3061 3372
3062sub write_runtime { 3373sub write_runtime {
3063 my $runtime = "$LOCALDIR/runtime"; 3374 my $runtime = "$LOCALDIR/runtime";
3108 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
3109 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
3110 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
3111 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
3112 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3113 $pl->save; 3425 $pl->save;
3114 } 3426 }
3115 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
3116 3428
3117 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
3156 warn "syncing database to disk"; 3468 warn "syncing database to disk";
3157 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
3158 3470
3159 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
3160 3472
3161 warn "cancelling all WF_AUTOCANCEL watchers";
3162 for (Event::all_watchers) {
3163 $_->cancel if $_->data & WF_AUTOCANCEL;
3164 }
3165
3166 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
3167 for (;;) { 3474 for (;;) {
3168 BDB::flush; 3475 BDB::flush;
3169 IO::AIO::flush; 3476 IO::AIO::flush;
3170 Coro::cede; 3477 Coro::cede_notself;
3171 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
3172 warn "iterate..."; 3479 warn "iterate...";
3173 } 3480 }
3174 3481
3175 ++$RELOAD; 3482 ++$RELOAD;
3264 3571
3265sub reload_perl() { 3572sub reload_perl() {
3266 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
3267 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
3268 3575
3269 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3270 reentrant => 0,
3271 after => 0,
3272 data => WF_AUTOCANCEL,
3273 cb => sub {
3274 do_reload_perl; 3577 do_reload_perl;
3275 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
3276 },
3277 ); 3579 };
3278} 3580}
3279 3581
3280register_command "reload" => sub { 3582register_command "reload" => sub {
3281 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
3282 3584
3283 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
3284 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
3285 async { reload_perl }; 3589 reload_perl;
3590 };
3286 } 3591 }
3287}; 3592};
3288 3593
3289unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
3290 3595
3309 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
3310 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
3311 $signal->wait; 3616 $signal->wait;
3312} 3617}
3313 3618
3314 my $min = 1e6;#d# 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
3315 my $avg = 10;
3316$TICK_WATCHER = Event->timer (
3317 reentrant => 0,
3318 parked => 1,
3319 prio => 0,
3320 at => $NEXT_TICK || $TICK,
3321 data => WF_AUTOCANCEL,
3322 cb => sub {
3323 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3324 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3325 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
3326 return; 3623 return;
3327 } 3624 }
3328 3625
3329 $NOW = $tick_start = Event::time; 3626 $NOW = $tick_start = EV::now;
3330 3627
3331 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
3332 3629
3333 0 && sync_job {#d# 3630 $RUNTIME += $TICK;
3334 for(1..10) { 3631 $NEXT_TICK = $_[0]->at;
3335 my $t = Event::time;
3336 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3337 or die;
3338 3632
3339 $map->width (50); 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3340 $map->height (50); 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3341 $map->alloc; 3635 Coro::async_pool {
3342 $map->_load_objects ("/tmp/x.map", 1); 3636 $Coro::current->{desc} = "runtime saver";
3343 my $t = Event::time - $t; 3637 write_runtime
3344 3638 or warn "ERROR: unable to write runtime file: $!";
3345 #next unless $t < 0.0013;#d#
3346 if ($t < $min) {
3347 $min = $t;
3348 }
3349 $avg = $avg * 0.99 + $t * 0.01;
3350 }
3351 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3352 exit 0;
3353 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3354 }; 3639 };
3640 }
3355 3641
3356 $RUNTIME += $TICK;
3357 $NEXT_TICK += $TICK;
3358
3359 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3360 $NEXT_RUNTIME_WRITE = $NOW + 10;
3361 Coro::async_pool {
3362 write_runtime
3363 or warn "ERROR: unable to write runtime file: $!";
3364 };
3365 }
3366
3367# my $AFTER = Event::time;
3368# warn $AFTER - $NOW;#d#
3369
3370 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3371 $sig->send; 3643 $sig->send;
3372 } 3644 }
3373 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
3374 $sig->send; 3646 $sig->send;
3375 } 3647 }
3376 3648
3377 $NOW = Event::time;
3378
3379 # if we are delayed by four ticks or more, skip them all
3380 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3381
3382 $TICK_WATCHER->at ($NEXT_TICK);
3383 $TICK_WATCHER->start;
3384
3385 $LOAD = ($NOW - $tick_start) / $TICK; 3649 $LOAD = ($NOW - $tick_start) / $TICK;
3386 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3387 3651
3388 _post_tick; 3652 _post_tick;
3389 3653};
3390 3654$TICK_WATCHER->priority (EV::MAXPRI);
3391 },
3392);
3393 3655
3394{ 3656{
3395 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
3396 $BDB_POLL_WATCHER = Event->io ( 3658
3397 reentrant => 0,
3398 fd => BDB::poll_fileno,
3399 poll => 'r',
3400 prio => 0,
3401 data => WF_AUTOCANCEL,
3402 cb => \&BDB::poll_cb,
3403 );
3404 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
3405 3660 BDB::max_poll_reqs $TICK * 0.1;
3406 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
3407 my $status;
3408 my $current = $Coro::current;
3409 (
3410 sub {
3411 $status = $!;
3412 $current->ready; undef $current;
3413 },
3414 sub {
3415 Coro::schedule while defined $current;
3416 $! = $status;
3417 },
3418 )
3419 };
3420 3662
3421 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
3422 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3423 3669
3424 cf::sync_job { 3670 cf::sync_job {
3425 eval { 3671 eval {
3426 BDB::db_env_open 3672 BDB::db_env_open
3427 $DB_ENV, 3673 $DB_ENV,
3429 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3430 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3431 0666; 3677 0666;
3432 3678
3433 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3434
3435 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3436 $DB_ENV->set_lk_detect;
3437 }; 3680 };
3438 3681
3439 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
3440 }; 3683 };
3441 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
3442} 3695}
3443 3696
3444{ 3697{
3698 # configure IO::AIO
3699
3445 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
3446
3447 undef $Coro::AIO::WATCHER;
3448 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
3449 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
3450 reentrant => 0,
3451 data => WF_AUTOCANCEL,
3452 fd => IO::AIO::poll_fileno,
3453 poll => 'r',
3454 prio => 6,
3455 cb => \&IO::AIO::poll_cb,
3456 );
3457} 3703}
3458 3704
3459my $_log_backtrace; 3705my $_log_backtrace;
3460 3706
3461sub _log_backtrace { 3707sub _log_backtrace {
3465 3711
3466 # limit the # of concurrent backtraces 3712 # limit the # of concurrent backtraces
3467 if ($_log_backtrace < 2) { 3713 if ($_log_backtrace < 2) {
3468 ++$_log_backtrace; 3714 ++$_log_backtrace;
3469 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
3470 my @bt = fork_call { 3718 my @bt = fork_call {
3471 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
3472 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3473 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3474 or die "addr2line: $!"; 3722 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines