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.395 by root, Sat Nov 10 22:41:59 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable;
10use Event; 9use 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.1 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
… …
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.32 (); 32use IO::AIO 2.51 ();
33use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 (); 35use Digest::MD5 ();
36 36
37# configure various modules to our taste 37# configure various modules to our taste
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 88our $DB_ENV;
86 89
87our %CFG; 90our %CFG;
88 91
89our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 93our $RUNTIME;
91 94
92our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
95 98
96# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 101
… …
159 162
160The raw value load value from the last tick. 163The raw value load value from the last tick.
161 164
162=item %cf::CFG 165=item %cf::CFG
163 166
164Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 168from wherever your confdir points to.
166 169
167=item cf::wait_for_tick, cf::wait_for_tick_begin 170=item cf::wait_for_tick, cf::wait_for_tick_begin
168 171
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
… …
187 $msg .= "\n" 190 $msg .= "\n"
188 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
189 192
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 194
192 utf8::encode $msg;
193 LOG llevError, $msg; 195 LOG llevError, $msg;
194 }; 196 };
195} 197}
196 198
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
… …
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
… …
344our @SLOT_QUEUE; 354our @SLOT_QUEUE;
345our $SLOT_QUEUE; 355our $SLOT_QUEUE;
346 356
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
349 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
350 362
351 while () { 363 while () {
352 next_job: 364 next_job:
353 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
361 } 373 }
362 } 374 }
363 } 375 }
364 376
365 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive 378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 380 $signal->wait;
369 } else { 381 } else {
370 Coro::schedule; 382 Coro::schedule;
371 } 383 }
… …
394 406
395BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
396 408
397=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
398 410
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 411The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 412is 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 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 414acceptable.
403 415
404If it must be done, put the blocking parts into C<sync_job>. This will run 416If 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 417the given BLOCK in another coroutine while waiting for the result. The
… …
415 my $time = Event::time; 427 my $time = Event::time;
416 428
417 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
419 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
420 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 435 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
423 437
424 my $busy = 1; 438 my $busy = 1;
425 my @res; 439 my @res;
426 440
427 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 443 @res = eval { $job->() };
429 warn $@ if $@; 444 warn $@ if $@;
430 undef $busy; 445 undef $busy;
431 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
432 447
433 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
434 Coro::cede or Event::one_event; 452 Event::one_event;
453 }
435 } 454 }
436 455
437 $time = Event::time - $time; 456 $time = Event::time - $time;
438 457
439 LOG llevError | logBacktrace, Carp::longmess "long sync job" 458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
… …
481sub fork_call(&@) { 500sub fork_call(&@) {
482 my ($cb, @args) = @_; 501 my ($cb, @args) = @_;
483 502
484 # we seemingly have to make a local copy of the whole thing, 503 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 504 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 505 # TODO: investigate and fix (likely this will be rather laborious)
487 506
488 my @res = Coro::Util::fork_eval { 507 my @res = Coro::Util::fork_eval {
489 reset_signals; 508 reset_signals;
490 &$cb 509 &$cb
491 }, @args; 510 }, @args;
… …
500=item cf::db_put $family => $key => $value 519=item cf::db_put $family => $key => $value
501 520
502Stores the given C<$value> in the family. It can currently store binary 521Stores 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). 522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
505=cut 529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
506 547
507our $DB; 548our $DB;
508 549
509sub db_init { 550sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 551 cf::sync_job {
514 eval { 552 $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 } 553 };
524} 554}
525 555
526sub db_get($$) { 556sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 557 my $key = "$_[0]/$_[1]";
528 558
… …
632attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
634 664
635In the following description, CLASS can be any of C<global>, C<object> 665In 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 666C<player>, C<client> or C<map> (i.e. the attachable objects in
637Crossfire TRT). 667Deliantra).
638 668
639=over 4 669=over 4
640 670
641=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
642 672
… …
940 970
941=cut 971=cut
942 972
943############################################################################# 973#############################################################################
944# object support 974# object support
945#
946 975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
947sub _can_merge { 1009sub _can_merge {
948 my ($ob1, $ob2) = @_; 1010 my ($ob1, $ob2) = @_;
949 1011
950 local $Storable::canonical = 1; 1012 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1013
954 $fob1 eq $fob2 1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
955} 1016}
956 1017
957sub reattach { 1018sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1020 my ($obj) = @_;
… …
1007sub object_freezer_save { 1068sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
1009 1070
1010 sync_job { 1071 sync_job {
1011 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
1014 1076
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1081 close $fh;
1020 1082
1021 if (@$objs) { 1083 if (@$objs) {
1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1023 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1089 close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1091 }
… …
1037 } 1099 }
1038 } else { 1100 } else {
1039 aio_unlink $filename; 1101 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
1041 } 1103 }
1042 } 1104 };
1043} 1105}
1044 1106
1045sub object_freezer_as_string { 1107sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
1047 1109
… …
1059 or return; 1121 or return;
1060 1122
1061 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1125 or return;
1126
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
1065 } 1129 }
1066 1130
1131 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1133 $decname, length $data, scalar @{$av || []};
1134
1069 return ($data, $av); 1135 ($data, $av)
1070} 1136}
1071 1137
1072=head2 COMMAND CALLBACKS 1138=head2 COMMAND CALLBACKS
1073 1139
1074=over 4 1140=over 4
… …
1260 1326
1261=head3 cf::player 1327=head3 cf::player
1262 1328
1263=over 4 1329=over 4
1264 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
1265=item cf::player::find $login 1345=item cf::player::find $login
1266 1346
1267Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
1268 1348
1269=cut 1349=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1387 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1388
1309 my $pl = load_pl path $login 1389 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
1312 } 1397 }
1313 } 1398 }
1314} 1399}
1315 1400
… …
1413 or return []; 1498 or return [];
1414 1499
1415 my @logins; 1500 my @logins;
1416 1501
1417 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1421 1511
1422 utf8::decode $login; 1512 utf8::decode $login;
1423 push @logins, $login; 1513 push @logins, $login;
1424 } 1514 }
1425 1515
… …
1458 1548
1459Expand crossfire pod fragments into protocol xml. 1549Expand crossfire pod fragments into protocol xml.
1460 1550
1461=cut 1551=cut
1462 1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1463sub expand_cfpod { 1564sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1565 my ($self, $pod) = @_;
1465 1566
1466 # escape & and < 1567 my $xml;
1467 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g;
1469 1568
1470 # this is buggy, it needs to properly take care of nested <'s 1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1471 1572
1472 1 while 1573 $group =~ s/&/&amp;/g;
1473 # replace B<>, I<>, U<> etc. 1574 $group =~ s/</&lt;/g;
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1575
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1576 $xml .= $group;
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1577 } elsif ($pod =~ m%\G
1477 # replace G<male|female> tags 1578 ([BCGHITU])
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1579 <
1479 $self->gender ? $2 : $1 1580 (?:
1480 }ge 1581 ([^<>]*) (?{ $group = $^N })
1481 # replace H<hint text> 1582 | < $interior >
1482 || s{H<([^\>]*)>} 1583 )
1584 >
1585 %gcsx
1483 { 1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1484 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1485 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1486 "") 1606 "")
1487 [$self->{hintmode}] 1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1488 }ge; 1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1489 1618
1619 for ($xml) {
1490 # create single paragraphs (very hackish) 1620 # create single paragraphs (very hackish)
1491 s/(?<=\S)\n(?=\w)/ /g; 1621 s/(?<=\S)\n(?=\w)/ /g;
1492 1622
1493 # compress some whitespace 1623 # compress some whitespace
1494 s/\s+\n/\n/g; # ws line-ends 1624 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines 1625 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines 1626 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines 1627 s/\n+$//; # ending lines
1628 }
1498 1629
1499 $_ 1630 $xml
1500} 1631}
1632
1633no re 'eval';
1501 1634
1502sub hintmode { 1635sub hintmode {
1503 $_[0]{hintmode} = $_[1] if @_ > 1; 1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1504 $_[0]{hintmode} 1637 $_[0]{hintmode}
1505} 1638}
… …
1749 1882
1750sub load_header_from($) { 1883sub load_header_from($) {
1751 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1752 1885
1753 utf8::encode $path; 1886 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1759 1895
1760 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1761 1897
1762 1 1898 1
1763} 1899}
… …
1817sub find { 1953sub find {
1818 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1819 1955
1820 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1821 1957
1958 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1959 cf::lock_wait "map_find:$path";
1823 1960
1824 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1826 my $map = new_from_path cf::map $path 1965 my $map = new_from_path cf::map $path
1827 or return; 1966 or return;
1828 1967
1829 $map->{last_save} = $cf::RUNTIME; 1968 $map->{last_save} = $cf::RUNTIME;
1830 1969
… …
1832 or return; 1971 or return;
1833 1972
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1974 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1975 #$cf::WAIT_FOR_TICK->wait;
1976 undef $guard1;
1977 undef $guard2;
1837 $map->reset; 1978 $map->reset;
1838 undef $guard;
1839 return find $path; 1979 return find $path;
1840 } 1980 }
1841 1981
1842 $cf::MAP{$path} = $map 1982 $cf::MAP{$path} = $map
1843 } 1983 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1992 local $self->{deny_reset} = 1; # loading can take a long time
1853 1993
1854 my $path = $self->{path}; 1994 my $path = $self->{path};
1855 1995
1856 { 1996 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1997 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1998
1999 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 2000 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 2001
1862 $self->in_memory (cf::MAP_LOADING); 2002 $self->in_memory (cf::MAP_LOADING);
1863 2003
1864 $self->alloc; 2004 $self->alloc;
1865 2005
1866 $self->pre_load; 2006 $self->pre_load;
1867 cf::cede_to_tick; 2007 cf::cede_to_tick;
1868 2008
2009 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 2011 $self->_load_objects ($f)
1870 or return; 2012 or return;
1871 2013
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 2015 if delete $self->{load_original};
1874 2016
1875 if (my $uniq = $self->uniq_path) { 2017 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 2018 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 2019 unless (aio_stat $uniq) {
2020 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 2021 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 2022 $self->_load_objects ($f);
2023 $f->resolve_delayed_derefs;
2024 }
1880 } 2025 }
1881 } 2026 }
2027
2028 $f->resolve_delayed_derefs;
1882 2029
1883 cf::cede_to_tick; 2030 cf::cede_to_tick;
1884 # now do the right thing for maps 2031 # now do the right thing for maps
1885 $self->link_multipart_objects; 2032 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 2033 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2119 }
1973 2120
1974 $MAP_PREFETCH{$path} |= $load; 2121 $MAP_PREFETCH{$path} |= $load;
1975 2122
1976 $MAP_PREFETCHER ||= cf::async { 2123 $MAP_PREFETCHER ||= cf::async {
2124 $Coro::current->{desc} = "map prefetcher";
2125
1977 while (%MAP_PREFETCH) { 2126 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2127 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2128 if (my $map = find $k) {
1980 $map->load if $v; 2129 $map->load if $v;
1981 } 2130 }
… …
2007 return if $self->{deny_save}; 2156 return if $self->{deny_save};
2008 2157
2009 local $self->{last_access} = $self->last_access;#d# 2158 local $self->{last_access} = $self->last_access;#d#
2010 2159
2011 cf::async { 2160 cf::async {
2161 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2162 $_->contr->save for $self->players;
2013 }; 2163 };
2014 2164
2015 if ($uniq) { 2165 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2180
2031 return if $self->players; 2181 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2182 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2183 return if $self->{deny_save};
2034 2184
2185 $self->in_memory (cf::MAP_SWAPPED);
2186
2187 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2189 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2190}
2038 2191
2039sub reset_at { 2192sub reset_at {
2040 my ($self) = @_; 2193 my ($self) = @_;
2041 2194
… …
2073 if $uniq; 2226 if $uniq;
2074 } 2227 }
2075 2228
2076 delete $cf::MAP{$self->path}; 2229 delete $cf::MAP{$self->path};
2077 2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2233 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2234
2082 $self->unlink_save; 2235 $self->unlink_save;
2083 $self->destroy; 2236 $self->destroy;
2084} 2237}
2085 2238
2086my $nuke_counter = "aaaa"; 2239my $nuke_counter = "aaaa";
2087 2240
2088sub nuke { 2241sub nuke {
2089 my ($self) = @_; 2242 my ($self) = @_;
2090 2243
2244 {
2245 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246
2091 delete $cf::MAP{$self->path}; 2247 delete $cf::MAP{$self->path};
2092 2248
2093 $self->unlink_save; 2249 $self->unlink_save;
2094 2250
2095 bless $self, "cf::map"; 2251 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2252 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2253 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2254 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2256
2101 $cf::MAP{$self->path} = $self; 2257 $cf::MAP{$self->path} = $self;
2258 }
2102 2259
2103 $self->reset; # polite request, might not happen 2260 $self->reset; # polite request, might not happen
2104} 2261}
2105 2262
2106=item $maps = cf::map::tmp_maps 2263=item $maps = cf::map::tmp_maps
… …
2182 2339
2183sub inv_recursive { 2340sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2341 inv_recursive_ inv $_[0]
2185} 2342}
2186 2343
2344=item $ref = $ob->ref
2345
2346creates and returns a persistent reference to an objetc that can be stored as a string.
2347
2348=item $ob = cf::object::deref ($refstring)
2349
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block.
2352
2353=cut
2354
2355sub deref {
2356 my ($ref) = @_;
2357
2358 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2359 my ($uuid, $name) = ($1, $2);
2360 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2361 or return;
2362 $pl->ob->uuid eq $uuid
2363 or return;
2364
2365 $pl->ob
2366 } else {
2367 warn "$ref: cannot resolve object reference\n";
2368 undef
2369 }
2370}
2371
2187package cf; 2372package cf;
2188 2373
2189=back 2374=back
2190 2375
2191=head3 cf::object::player 2376=head3 cf::object::player
… …
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2534 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2535
2351 $self->enter_link; 2536 $self->enter_link;
2352 2537
2353 (async { 2538 (async {
2539 $Coro::current->{desc} = "player::goto $path $x $y";
2540
2541 # *tag paths override both path and x|y
2542 if ($path =~ /^\*(.*)$/) {
2543 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2544 my $ob = $obs[rand @obs];
2545
2546 # see if we actually can go there
2547 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2548 $ob = $obs[rand @obs];
2549 } else {
2550 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2551 }
2552 # else put us there anyways for now #d#
2553
2554 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2555 } else {
2556 ($path, $x, $y) = (undef, undef, undef);
2557 }
2558 }
2559
2354 my $map = eval { 2560 my $map = eval {
2355 my $map = cf::map::find $path; 2561 my $map = defined $path ? cf::map::find $path : undef;
2356 2562
2357 if ($map) { 2563 if ($map) {
2358 $map = $map->customise_for ($self); 2564 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2565 $map = $check->($map) if $check && $map;
2360 } else { 2566 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2567 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2568 }
2363 2569
2364 $map 2570 $map
2365 }; 2571 };
2366 2572
… …
2456 # if exit is damned, update players death & WoR home-position 2662 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp) 2663 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED); 2664 if $exit->flag (FLAG_DAMNED);
2459 2665
2460 (async { 2666 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2668
2461 $self->deactivate_recursive; # just to be sure 2669 $self->deactivate_recursive; # just to be sure
2462 unless (eval { 2670 unless (eval {
2463 $self->goto ($slaying, $hp, $sp); 2671 $self->goto ($slaying, $hp, $sp);
2464 2672
2465 1; 2673 1;
… …
2500the message, with C<log> being the default. If C<$color> is negative, suppress 2708the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2709the message unless the client supports the msg packet.
2502 2710
2503=cut 2711=cut
2504 2712
2713# non-persistent channels (usually the info channel)
2714our %CHANNEL = (
2715 "c/identify" => {
2716 id => "infobox",
2717 title => "Identify",
2718 reply => undef,
2719 tooltip => "Items recently identified",
2720 },
2721 "c/examine" => {
2722 id => "infobox",
2723 title => "Examine",
2724 reply => undef,
2725 tooltip => "Signs and other items you examined",
2726 },
2727 "c/book" => {
2728 id => "infobox",
2729 title => "Book",
2730 reply => undef,
2731 tooltip => "The contents of a note or book",
2732 },
2733 "c/lookat" => {
2734 id => "infobox",
2735 title => "Look",
2736 reply => undef,
2737 tooltip => "What you saw there",
2738 },
2739 "c/who" => {
2740 id => "infobox",
2741 title => "Players",
2742 reply => undef,
2743 tooltip => "Shows players who are currently online",
2744 },
2745 "c/body" => {
2746 id => "infobox",
2747 title => "Body Parts",
2748 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available",
2750 },
2751 "c/uptime" => {
2752 id => "infobox",
2753 title => "Uptime",
2754 reply => undef,
2755 tooltip => "How long the server has been running since last restart",
2756 },
2757 "c/mapinfo" => {
2758 id => "infobox",
2759 title => "Map Info",
2760 reply => undef,
2761 tooltip => "Information related to the maps",
2762 },
2763);
2764
2505sub cf::client::send_msg { 2765sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2766 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2767
2508 $msg = $self->pl->expand_cfpod ($msg); 2768 $msg = $self->pl->expand_cfpod ($msg);
2509 2769
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2770 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511 2771
2772 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel};
2775
2776 $self->ext_msg (channel_info => $channel)
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id};
2780
2512 if (ref $channel) { 2781 } elsif (ref $channel) {
2513 # send meta info to client, if not yet sent 2782 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2783 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2784 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2785 $self->ext_msg (channel_info => $channel)
2786 if $self->can_msg;
2517 } 2787 }
2518 2788
2519 $channel = $channel->{id}; 2789 $channel = $channel->{id};
2520 } 2790 }
2521 2791
… …
2733=pod 3003=pod
2734 3004
2735The following functions and methods are available within a safe environment: 3005The following functions and methods are available within a safe environment:
2736 3006
2737 cf::object 3007 cf::object
2738 contr pay_amount pay_player map x y force_find force_add 3008 contr pay_amount pay_player map x y force_find force_add destroy
2739 insert remove name archname title slaying race decrease_ob_nr 3009 insert remove name archname title slaying race decrease_ob_nr
2740 3010
2741 cf::object::player 3011 cf::object::player
2742 player 3012 player
2743 3013
… …
2750=cut 3020=cut
2751 3021
2752for ( 3022for (
2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race 3024 insert remove inv name archname title slaying race
2755 decrease_ob_nr)], 3025 decrease_ob_nr destroy)],
2756 ["cf::object::player" => qw(player)], 3026 ["cf::object::player" => qw(player)],
2757 ["cf::player" => qw(peaceful)], 3027 ["cf::player" => qw(peaceful)],
2758 ["cf::map" => qw(trigger)], 3028 ["cf::map" => qw(trigger)],
2759) { 3029) {
2760 no strict 'refs'; 3030 no strict 'refs';
… …
2835############################################################################# 3105#############################################################################
2836# the server's init and main functions 3106# the server's init and main functions
2837 3107
2838sub load_facedata($) { 3108sub load_facedata($) {
2839 my ($path) = @_; 3109 my ($path) = @_;
3110
3111 # HACK to clear player env face cache, we need some signal framework
3112 # for this (global event?)
3113 %ext::player_env::MUSIC_FACE_CACHE = ();
2840 3114
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3115 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2842 3116
2843 warn "loading facedata from $path\n"; 3117 warn "loading facedata from $path\n";
2844 3118
… …
2956 $ns->fx_want ($k, $v); 3230 $ns->fx_want ($k, $v);
2957 } 3231 }
2958}; 3232};
2959 3233
2960sub reload_regions { 3234sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = ();
3238
2961 load_resource_file "$MAPDIR/regions" 3239 load_resource_file "$MAPDIR/regions"
2962 or die "unable to load regions file\n"; 3240 or die "unable to load regions file\n";
2963 3241
2964 for (cf::region::list) { 3242 for (cf::region::list) {
2965 $_->{match} = qr/$_->{match}/ 3243 $_->{match} = qr/$_->{match}/
… …
3027sub main { 3305sub main {
3028 # we must not ever block the main coroutine 3306 # we must not ever block the main coroutine
3029 local $Coro::idle = sub { 3307 local $Coro::idle = sub {
3030 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3031 (async { 3309 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER";
3032 Event::one_event; 3311 Event::one_event;
3033 })->prio (Coro::PRIO_MAX); 3312 })->prio (Coro::PRIO_MAX);
3034 }; 3313 };
3035 3314
3036 reload_config; 3315 reload_config;
… …
3108 # and maps saved/destroyed asynchronously. 3387 # and maps saved/destroyed asynchronously.
3109 warn "begin emergency player save\n"; 3388 warn "begin emergency player save\n";
3110 for my $login (keys %cf::PLAYER) { 3389 for my $login (keys %cf::PLAYER) {
3111 my $pl = $cf::PLAYER{$login} or next; 3390 my $pl = $cf::PLAYER{$login} or next;
3112 $pl->valid or next; 3391 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3113 $pl->save; 3393 $pl->save;
3114 } 3394 }
3115 warn "end emergency player save\n"; 3395 warn "end emergency player save\n";
3116 3396
3117 warn "begin emergency map save\n"; 3397 warn "begin emergency map save\n";
… …
3165 3445
3166 warn "flushing outstanding aio requests"; 3446 warn "flushing outstanding aio requests";
3167 for (;;) { 3447 for (;;) {
3168 BDB::flush; 3448 BDB::flush;
3169 IO::AIO::flush; 3449 IO::AIO::flush;
3170 Coro::cede; 3450 Coro::cede_notself;
3171 last unless IO::AIO::nreqs || BDB::nreqs; 3451 last unless IO::AIO::nreqs || BDB::nreqs;
3172 warn "iterate..."; 3452 warn "iterate...";
3173 } 3453 }
3174 3454
3175 ++$RELOAD; 3455 ++$RELOAD;
… …
3280register_command "reload" => sub { 3560register_command "reload" => sub {
3281 my ($who, $arg) = @_; 3561 my ($who, $arg) = @_;
3282 3562
3283 if ($who->flag (FLAG_WIZ)) { 3563 if ($who->flag (FLAG_WIZ)) {
3284 $who->message ("reloading server."); 3564 $who->message ("reloading server.");
3565 async {
3566 $Coro::current->{desc} = "perl_reload";
3285 async { reload_perl }; 3567 reload_perl;
3568 };
3286 } 3569 }
3287}; 3570};
3288 3571
3289unshift @INC, $LIBDIR; 3572unshift @INC, $LIBDIR;
3290 3573
… …
3309 my $signal = new Coro::Signal; 3592 my $signal = new Coro::Signal;
3310 push @WAIT_FOR_TICK_BEGIN, $signal; 3593 push @WAIT_FOR_TICK_BEGIN, $signal;
3311 $signal->wait; 3594 $signal->wait;
3312} 3595}
3313 3596
3314 my $min = 1e6;#d#
3315 my $avg = 10;
3316$TICK_WATCHER = Event->timer ( 3597$TICK_WATCHER = Event->timer (
3317 reentrant => 0, 3598 reentrant => 0,
3318 parked => 1, 3599 parked => 1,
3319 prio => 0, 3600 prio => 0,
3320 at => $NEXT_TICK || $TICK, 3601 at => $NEXT_TICK || $TICK,
… …
3328 3609
3329 $NOW = $tick_start = Event::time; 3610 $NOW = $tick_start = Event::time;
3330 3611
3331 cf::server_tick; # one server iteration 3612 cf::server_tick; # one server iteration
3332 3613
3333 0 && sync_job {#d#
3334 for(1..10) {
3335 my $t = Event::time;
3336 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3337 or die;
3338
3339 $map->width (50);
3340 $map->height (50);
3341 $map->alloc;
3342 $map->_load_objects ("/tmp/x.map", 1);
3343 my $t = Event::time - $t;
3344
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 };
3355
3356 $RUNTIME += $TICK; 3614 $RUNTIME += $TICK;
3357 $NEXT_TICK += $TICK; 3615 $NEXT_TICK += $TICK;
3358 3616
3359 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3617 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3360 $NEXT_RUNTIME_WRITE = $NOW + 10; 3618 $NEXT_RUNTIME_WRITE = $NOW + 10;
3361 Coro::async_pool { 3619 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver";
3362 write_runtime 3621 write_runtime
3363 or warn "ERROR: unable to write runtime file: $!"; 3622 or warn "ERROR: unable to write runtime file: $!";
3364 }; 3623 };
3365 } 3624 }
3366 3625
3367# my $AFTER = Event::time;
3368# warn $AFTER - $NOW;#d#
3369
3370 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3371 $sig->send; 3627 $sig->send;
3372 } 3628 }
3373 while (my $sig = shift @WAIT_FOR_TICK) { 3629 while (my $sig = shift @WAIT_FOR_TICK) {
3374 $sig->send; 3630 $sig->send;
… …
3384 3640
3385 $LOAD = ($NOW - $tick_start) / $TICK; 3641 $LOAD = ($NOW - $tick_start) / $TICK;
3386 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3387 3643
3388 _post_tick; 3644 _post_tick;
3389
3390
3391 }, 3645 },
3392); 3646);
3393 3647
3394{ 3648{
3649 BDB::min_parallel 8;
3395 BDB::max_poll_time $TICK * 0.1; 3650 BDB::max_poll_time $TICK * 0.1;
3396 $BDB_POLL_WATCHER = Event->io ( 3651 $BDB_POLL_WATCHER = Event->io (
3397 reentrant => 0, 3652 reentrant => 0,
3398 fd => BDB::poll_fileno, 3653 fd => BDB::poll_fileno,
3399 poll => 'r', 3654 poll => 'r',
3400 prio => 0, 3655 prio => 0,
3401 data => WF_AUTOCANCEL, 3656 data => WF_AUTOCANCEL,
3402 cb => \&BDB::poll_cb, 3657 cb => \&BDB::poll_cb,
3403 ); 3658 );
3404 BDB::min_parallel 8;
3405 3659
3406 BDB::set_sync_prepare { 3660 BDB::set_sync_prepare {
3407 my $status; 3661 my $status;
3408 my $current = $Coro::current; 3662 my $current = $Coro::current;
3409 ( 3663 (
… …
3418 ) 3672 )
3419 }; 3673 };
3420 3674
3421 unless ($DB_ENV) { 3675 unless ($DB_ENV) {
3422 $DB_ENV = BDB::db_env_create; 3676 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3678 | BDB::LOG_AUTOREMOVE, 1);
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3423 3681
3424 cf::sync_job { 3682 cf::sync_job {
3425 eval { 3683 eval {
3426 BDB::db_env_open 3684 BDB::db_env_open
3427 $DB_ENV, 3685 $DB_ENV,
… …
3429 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3687 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3430 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3688 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3431 0666; 3689 0666;
3432 3690
3433 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3691 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 }; 3692 };
3438 3693
3439 cf::cleanup "db_env_open(db): $@" if $@; 3694 cf::cleanup "db_env_open(db): $@" if $@;
3440 }; 3695 };
3441 } 3696 }
3697
3698 $BDB_DEADLOCK_WATCHER = Event->timer (
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 );
3708 $BDB_CHECKPOINT_WATCHER = Event->timer (
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 );
3718 $BDB_TRICKLE_WATCHER = Event->timer (
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 );
3442} 3728}
3443 3729
3444{ 3730{
3445 IO::AIO::min_parallel 8; 3731 IO::AIO::min_parallel 8;
3446 3732
… …
3449 $AIO_POLL_WATCHER = Event->io ( 3735 $AIO_POLL_WATCHER = Event->io (
3450 reentrant => 0, 3736 reentrant => 0,
3451 data => WF_AUTOCANCEL, 3737 data => WF_AUTOCANCEL,
3452 fd => IO::AIO::poll_fileno, 3738 fd => IO::AIO::poll_fileno,
3453 poll => 'r', 3739 poll => 'r',
3454 prio => 6, 3740 prio => 0,
3455 cb => \&IO::AIO::poll_cb, 3741 cb => \&IO::AIO::poll_cb,
3456 ); 3742 );
3457} 3743}
3458 3744
3459my $_log_backtrace; 3745my $_log_backtrace;
… …
3465 3751
3466 # limit the # of concurrent backtraces 3752 # limit the # of concurrent backtraces
3467 if ($_log_backtrace < 2) { 3753 if ($_log_backtrace < 2) {
3468 ++$_log_backtrace; 3754 ++$_log_backtrace;
3469 async { 3755 async {
3756 $Coro::current->{desc} = "abt $msg";
3757
3470 my @bt = fork_call { 3758 my @bt = fork_call {
3471 @addr = map { sprintf "%x", $_ } @addr; 3759 @addr = map { sprintf "%x", $_ } @addr;
3472 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3760 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3473 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3761 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3474 or die "addr2line: $!"; 3762 or die "addr2line: $!";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines