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.340 by root, Fri Aug 24 00:40:31 2007 UTC vs.
Revision 1.385 by root, Fri Oct 12 19:13:26 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;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
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
… …
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';
… …
272Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
275returned. 277returned.
276 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
277Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
279 284
280=item $locked = cf::lock_active $string 285=item $locked = cf::lock_active $string
281 286
282Return 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.
283 288
284=cut 289=cut
285 290
286our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
287 293
288sub lock_wait($) { 294sub lock_wait($) {
289 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#
290 301
291 # wait for lock, if any 302 # wait for lock, if any
292 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 305 Coro::schedule;
… …
300 311
301 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
302 lock_wait $key; 313 lock_wait $key;
303 314
304 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
305 317
306 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
309 } 322 }
310} 323}
311 324
… …
341our @SLOT_QUEUE; 354our @SLOT_QUEUE;
342our $SLOT_QUEUE; 355our $SLOT_QUEUE;
343 356
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
346 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
347 362
348 while () { 363 while () {
349 next_job: 364 next_job:
350 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
358 } 373 }
359 } 374 }
360 } 375 }
361 376
362 if (@SLOT_QUEUE) { 377 if (@SLOT_QUEUE) {
363 # 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
364 push @cf::WAIT_FOR_TICK, $signal; 379 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 380 $signal->wait;
366 } else { 381 } else {
367 Coro::schedule; 382 Coro::schedule;
368 } 383 }
… …
412 my $time = Event::time; 427 my $time = Event::time;
413 428
414 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
416 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
417 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
418 # (but this is cancel-safe) 435 # (but this is cancel-safe)
419 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
420 437
421 my $busy = 1; 438 my $busy = 1;
422 my @res; 439 my @res;
423 440
424 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 443 @res = eval { $job->() };
426 warn $@ if $@; 444 warn $@ if $@;
427 undef $busy; 445 undef $busy;
428 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
429 447
… …
478sub fork_call(&@) { 496sub fork_call(&@) {
479 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
480 498
481 # we seemingly have to make a local copy of the whole thing, 499 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
484 502
485 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
486 reset_signals; 504 reset_signals;
487 &$cb 505 &$cb
488 }, @args; 506 }, @args;
… …
497=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
498 516
499Stores the given C<$value> in the family. It can currently store binary 517Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 518data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 519
520=item $db = cf::db_table "name"
521
522Create and/or open a new database table. The string must not be "db" and must be unique
523within each server.
524
502=cut 525=cut
526
527sub db_table($) {
528 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV;
530
531 eval {
532 $db->set_flags (BDB::CHKSUM);
533
534 utf8::encode $name;
535 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
536 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
537 cf::cleanup "db_open(db): $!" if $!;
538 };
539 cf::cleanup "db_open(db): $@" if $@;
540
541 $db
542}
503 543
504our $DB; 544our $DB;
505 545
506sub db_init { 546sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 547 cf::sync_job {
511 eval { 548 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 549 };
521} 550}
522 551
523sub db_get($$) { 552sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
525 554
… …
575 if (1) { 604 if (1) {
576 $md5 = 605 $md5 =
577 join "\x00", 606 join "\x00",
578 $processversion, 607 $processversion,
579 map { 608 map {
580 Coro::cede; 609 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 610 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 611 } 0.. $#$src;
583 612
584 613
585 my $dbmd5 = db_get cache => "$id/md5"; 614 my $dbmd5 = db_get cache => "$id/md5";
… …
942# 971#
943 972
944sub _can_merge { 973sub _can_merge {
945 my ($ob1, $ob2) = @_; 974 my ($ob1, $ob2) = @_;
946 975
976 return 1;#d#
977
978 #todo#d# kill yourself and do some recursive checking manually without storable
979 sync_job {
980 my $guard = Coro::Storable::guard;
947 local $Storable::canonical = 1; 981 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1; 982 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2; 983 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2 984 $fob1 eq $fob2
985 }
952} 986}
953 987
954sub reattach { 988sub reattach {
955 # basically do the same as instantiate, without calling instantiate 989 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 990 my ($obj) = @_;
… …
1004sub object_freezer_save { 1038sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1039 my ($filename, $rdata, $objs) = @_;
1006 1040
1007 sync_job { 1041 sync_job {
1008 if (length $$rdata) { 1042 if (length $$rdata) {
1043 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1044 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1045 $decname, length $$rdata, scalar @$objs;
1011 1046
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1047 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1048 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1049 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1050 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1051 close $fh;
1017 1052
1018 if (@$objs) { 1053 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1054 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1055 chmod SAVE_MODE, $fh;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1056 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1057 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1058 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1059 close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1060 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1061 }
… …
1034 } 1069 }
1035 } else { 1070 } else {
1036 aio_unlink $filename; 1071 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1072 aio_unlink "$filename.pst";
1038 } 1073 }
1039 } 1074 };
1040} 1075}
1041 1076
1042sub object_freezer_as_string { 1077sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1078 my ($rdata, $objs) = @_;
1044 1079
… …
1056 or return; 1091 or return;
1057 1092
1058 unless (aio_stat "$filename.pst") { 1093 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1094 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1095 or return;
1061 $av = eval { (Storable::thaw $av)->{objs} };
1062 }
1063 1096
1097 my $st = eval { Coro::Storable::thaw $av }
1098 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1099 $av = $st->{objs};
1100 }
1101
1102 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1103 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1104 $decname, length $data, scalar @{$av || []};
1105
1066 return ($data, $av); 1106 ($data, $av)
1067} 1107}
1068 1108
1069=head2 COMMAND CALLBACKS 1109=head2 COMMAND CALLBACKS
1070 1110
1071=over 4 1111=over 4
… …
1257 1297
1258=head3 cf::player 1298=head3 cf::player
1259 1299
1260=over 4 1300=over 4
1261 1301
1302=item cf::player::num_playing
1303
1304Returns the official number of playing players, as per the Crossfire metaserver rules.
1305
1306=cut
1307
1308sub num_playing {
1309 scalar grep
1310 $_->ob->map
1311 && !$_->hidden
1312 && !$_->ob->flag (cf::FLAG_WIZ),
1313 cf::player::list
1314}
1315
1262=item cf::player::find $login 1316=item cf::player::find $login
1263 1317
1264Returns the given player object, loading it if necessary (might block). 1318Returns the given player object, loading it if necessary (might block).
1265 1319
1266=cut 1320=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1355 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1356 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1357 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1358 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1359
1306 my $pl = load_pl path $login 1360 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1361 or return;
1362
1363 my $pl = cf::player::load_pl $f
1364 or return;
1365 local $cf::PLAYER_LOADING{$login} = $pl;
1366 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1367 $cf::PLAYER{$login} = $pl
1309 } 1368 }
1310 } 1369 }
1311} 1370}
1312 1371
… …
1322 1381
1323 aio_mkdir playerdir $pl, 0770; 1382 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1383 $pl->{last_save} = $cf::RUNTIME;
1325 1384
1326 $pl->save_pl ($path); 1385 $pl->save_pl ($path);
1327 Coro::cede; 1386 cf::cede_to_tick;
1328} 1387}
1329 1388
1330sub new($) { 1389sub new($) {
1331 my ($login) = @_; 1390 my ($login) = @_;
1332 1391
… …
1410 or return []; 1469 or return [];
1411 1470
1412 my @logins; 1471 my @logins;
1413 1472
1414 for my $login (@$dirs) { 1473 for my $login (@$dirs) {
1474 my $path = path $login;
1475
1476 # a .pst is a dead give-away for a valid player
1477 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1478 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1479 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1480 $buf !~ /^password -------------$/m or next; # official not-valid tag
1481 }
1418 1482
1419 utf8::decode $login; 1483 utf8::decode $login;
1420 push @logins, $login; 1484 push @logins, $login;
1421 } 1485 }
1422 1486
… …
1460sub expand_cfpod { 1524sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1525 ((my $self), (local $_)) = @_;
1462 1526
1463 # escape & and < 1527 # escape & and <
1464 s/&/&amp;/g; 1528 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1529 s/(?<![BIUGHT])</&lt;/g;
1466 1530
1467 # this is buggy, it needs to properly take care of nested <'s 1531 # this is buggy, it needs to properly take care of nested <'s
1468 1532
1469 1 while 1533 1 while
1470 # replace B<>, I<>, U<> etc. 1534 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1535 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1536 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1537 || s/U<([^\>]*)>/<u>$1<\/u>/
1538 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1539 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1540 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1541 $self->gender ? $2 : $1
1477 }ge 1542 }ge
1478 # replace H<hint text> 1543 # replace H<hint text>
… …
1746 1811
1747sub load_header_from($) { 1812sub load_header_from($) {
1748 my ($self, $path) = @_; 1813 my ($self, $path) = @_;
1749 1814
1750 utf8::encode $path; 1815 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1816 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1817 or return;
1818
1819 $self->_load_header ($f)
1820 or return;
1821
1822 local $MAP_LOADING{$self->{path}} = $self;
1823 $f->resolve_delayed_derefs;
1756 1824
1757 $self->{load_path} = $path; 1825 $self->{load_path} = $path;
1758 1826
1759 1 1827 1
1760} 1828}
… …
1814sub find { 1882sub find {
1815 my ($path, $origin) = @_; 1883 my ($path, $origin) = @_;
1816 1884
1817 $path = normalise $path, $origin && $origin->path; 1885 $path = normalise $path, $origin && $origin->path;
1818 1886
1887 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1888 cf::lock_wait "map_find:$path";
1820 1889
1821 $cf::MAP{$path} || do { 1890 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1891 my $guard1 = cf::lock_acquire "map_find:$path";
1892 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1893
1823 my $map = new_from_path cf::map $path 1894 my $map = new_from_path cf::map $path
1824 or return; 1895 or return;
1825 1896
1826 $map->{last_save} = $cf::RUNTIME; 1897 $map->{last_save} = $cf::RUNTIME;
1827 1898
… …
1829 or return; 1900 or return;
1830 1901
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1902 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1903 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1904 #$cf::WAIT_FOR_TICK->wait;
1905 undef $guard1;
1906 undef $guard2;
1834 $map->reset; 1907 $map->reset;
1835 undef $guard;
1836 return find $path; 1908 return find $path;
1837 } 1909 }
1838 1910
1839 $cf::MAP{$path} = $map 1911 $cf::MAP{$path} = $map
1840 } 1912 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1921 local $self->{deny_reset} = 1; # loading can take a long time
1850 1922
1851 my $path = $self->{path}; 1923 my $path = $self->{path};
1852 1924
1853 { 1925 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1926 my $guard = cf::lock_acquire "map_data:$path";
1855 1927
1928 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1929 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1930
1858 $self->in_memory (cf::MAP_LOADING); 1931 $self->in_memory (cf::MAP_LOADING);
1859 1932
1860 $self->alloc; 1933 $self->alloc;
1861 1934
1862 $self->pre_load; 1935 $self->pre_load;
1863 Coro::cede; 1936 cf::cede_to_tick;
1864 1937
1938 my $f = new_from_file cf::object::thawer $self->{load_path};
1939 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1940 $self->_load_objects ($f)
1866 or return; 1941 or return;
1867 1942
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1943 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1944 if delete $self->{load_original};
1870 1945
1871 if (my $uniq = $self->uniq_path) { 1946 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1947 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1948 unless (aio_stat $uniq) {
1949 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1950 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1951 $self->_load_objects ($f);
1952 $f->resolve_delayed_derefs;
1953 }
1876 } 1954 }
1877 } 1955 }
1878 1956
1879 Coro::cede; 1957 $f->resolve_delayed_derefs;
1958
1959 cf::cede_to_tick;
1880 # now do the right thing for maps 1960 # now do the right thing for maps
1881 $self->link_multipart_objects; 1961 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1962 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1963 unless $self->difficulty;
1884 Coro::cede; 1964 cf::cede_to_tick;
1885 1965
1886 unless ($self->{deny_activate}) { 1966 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1967 $self->decay_objects;
1888 $self->fix_auto_apply; 1968 $self->fix_auto_apply;
1889 $self->update_buttons; 1969 $self->update_buttons;
1890 Coro::cede; 1970 cf::cede_to_tick;
1891 $self->set_darkness_map; 1971 $self->set_darkness_map;
1892 Coro::cede; 1972 cf::cede_to_tick;
1893 $self->activate; 1973 $self->activate;
1894 } 1974 }
1895 1975
1896 $self->{last_save} = $cf::RUNTIME; 1976 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1977 $self->last_access ($cf::RUNTIME);
… …
1948 2028
1949sub do_load_sync { 2029sub do_load_sync {
1950 my ($map) = @_; 2030 my ($map) = @_;
1951 2031
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2032 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2033 if $Coro::current == $Coro::main;
1954 2034
1955 cf::sync_job { $map->load }; 2035 cf::sync_job { $map->load };
1956} 2036}
1957 2037
1958our %MAP_PREFETCH; 2038our %MAP_PREFETCH;
… …
1968 } 2048 }
1969 2049
1970 $MAP_PREFETCH{$path} |= $load; 2050 $MAP_PREFETCH{$path} |= $load;
1971 2051
1972 $MAP_PREFETCHER ||= cf::async { 2052 $MAP_PREFETCHER ||= cf::async {
2053 $Coro::current->{desc} = "map prefetcher";
2054
1973 while (%MAP_PREFETCH) { 2055 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2056 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2057 if (my $map = find $k) {
1976 $map->load if $v; 2058 $map->load if $v;
1977 } 2059 }
… …
1987} 2069}
1988 2070
1989sub save { 2071sub save {
1990 my ($self) = @_; 2072 my ($self) = @_;
1991 2073
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2074 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2075
1994 $self->{last_save} = $cf::RUNTIME; 2076 $self->{last_save} = $cf::RUNTIME;
1995 2077
1996 return unless $self->dirty; 2078 return unless $self->dirty;
1997 2079
… …
2003 return if $self->{deny_save}; 2085 return if $self->{deny_save};
2004 2086
2005 local $self->{last_access} = $self->last_access;#d# 2087 local $self->{last_access} = $self->last_access;#d#
2006 2088
2007 cf::async { 2089 cf::async {
2090 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2091 $_->contr->save for $self->players;
2009 }; 2092 };
2010 2093
2011 if ($uniq) { 2094 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2095 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2020 my ($self) = @_; 2103 my ($self) = @_;
2021 2104
2022 # save first because save cedes 2105 # save first because save cedes
2023 $self->save; 2106 $self->save;
2024 2107
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2108 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2109
2027 return if $self->players; 2110 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2111 return if $self->in_memory != cf::MAP_IN_MEMORY;
2029 return if $self->{deny_save}; 2112 return if $self->{deny_save};
2030 2113
2114 $self->in_memory (cf::MAP_SWAPPED);
2115
2116 $self->deactivate;
2117 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2118 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2119}
2034 2120
2035sub reset_at { 2121sub reset_at {
2036 my ($self) = @_; 2122 my ($self) = @_;
2037 2123
… …
2069 if $uniq; 2155 if $uniq;
2070 } 2156 }
2071 2157
2072 delete $cf::MAP{$self->path}; 2158 delete $cf::MAP{$self->path};
2073 2159
2160 $self->deactivate;
2161 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2162 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2163
2078 $self->unlink_save; 2164 $self->unlink_save;
2079 $self->destroy; 2165 $self->destroy;
2080} 2166}
2081 2167
2082my $nuke_counter = "aaaa"; 2168my $nuke_counter = "aaaa";
2083 2169
2084sub nuke { 2170sub nuke {
2085 my ($self) = @_; 2171 my ($self) = @_;
2086 2172
2173 {
2174 my $lock = cf::lock_acquire "map_data:$self->{path}";
2175
2087 delete $cf::MAP{$self->path}; 2176 delete $cf::MAP{$self->path};
2088 2177
2089 $self->unlink_save; 2178 $self->unlink_save;
2090 2179
2091 bless $self, "cf::map"; 2180 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2181 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2182 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2183 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2184 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2185
2097 $cf::MAP{$self->path} = $self; 2186 $cf::MAP{$self->path} = $self;
2187 }
2098 2188
2099 $self->reset; # polite request, might not happen 2189 $self->reset; # polite request, might not happen
2100} 2190}
2101 2191
2102=item $maps = cf::map::tmp_maps 2192=item $maps = cf::map::tmp_maps
… …
2178 2268
2179sub inv_recursive { 2269sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2270 inv_recursive_ inv $_[0]
2181} 2271}
2182 2272
2273=item $ref = $ob->ref
2274
2275creates and returns a persistent reference to an objetc that can be stored as a string.
2276
2277=item $ob = cf::object::deref ($refstring)
2278
2279returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2280even if the object actually exists. May block.
2281
2282=cut
2283
2284sub deref {
2285 my ($ref) = @_;
2286
2287 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2288 my ($uuid, $name) = ($1, $2);
2289 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2290 or return;
2291 $pl->ob->uuid eq $uuid
2292 or return;
2293
2294 $pl->ob
2295 } else {
2296 warn "$ref: cannot resolve object reference\n";
2297 undef
2298 }
2299}
2300
2183package cf; 2301package cf;
2184 2302
2185=back 2303=back
2186 2304
2187=head3 cf::object::player 2305=head3 cf::object::player
… …
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2463 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2464
2347 $self->enter_link; 2465 $self->enter_link;
2348 2466
2349 (async { 2467 (async {
2468 $Coro::current->{desc} = "player::goto $path $x $y";
2469
2470 # *tag paths override both path and x|y
2471 if ($path =~ /^\*(.*)$/) {
2472 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2473 my $ob = $obs[rand @obs];
2474
2475 # see if we actually can go there
2476 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2477 $ob = $obs[rand @obs];
2478 } else {
2479 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2480 }
2481 # else put us there anyways for now #d#
2482
2483 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2484 } else {
2485 ($path, $x, $y) = (undef, undef, undef);
2486 }
2487 }
2488
2350 my $map = eval { 2489 my $map = eval {
2351 my $map = cf::map::find $path; 2490 my $map = defined $path ? cf::map::find $path : undef;
2352 2491
2353 if ($map) { 2492 if ($map) {
2354 $map = $map->customise_for ($self); 2493 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2494 $map = $check->($map) if $check && $map;
2356 } else { 2495 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2496 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2497 }
2359 2498
2360 $map 2499 $map
2361 }; 2500 };
2362 2501
… …
2452 # if exit is damned, update players death & WoR home-position 2591 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp) 2592 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED); 2593 if $exit->flag (FLAG_DAMNED);
2455 2594
2456 (async { 2595 (async {
2596 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2597
2457 $self->deactivate_recursive; # just to be sure 2598 $self->deactivate_recursive; # just to be sure
2458 unless (eval { 2599 unless (eval {
2459 $self->goto ($slaying, $hp, $sp); 2600 $self->goto ($slaying, $hp, $sp);
2460 2601
2461 1; 2602 1;
… …
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2637the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2638the message unless the client supports the msg packet.
2498 2639
2499=cut 2640=cut
2500 2641
2642our %CHANNEL = (
2643 "c/identify" => {
2644 id => "infobox",
2645 title => "Identify",
2646 reply => undef,
2647 tooltip => "Items recently identified",
2648 },
2649 "c/examine" => {
2650 id => "infobox",
2651 title => "Examine",
2652 reply => undef,
2653 tooltip => "Signs and other items you examined",
2654 },
2655 "c/lookat" => {
2656 id => "infobox",
2657 title => "Look",
2658 reply => undef,
2659 tooltip => "What you saw there",
2660 },
2661);
2662
2501sub cf::client::send_msg { 2663sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2664 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2665
2504 $msg = $self->pl->expand_cfpod ($msg); 2666 $msg = $self->pl->expand_cfpod ($msg);
2505 2667
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2668 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2669
2670 # check predefined channels, for the benefit of C
2671 if ($CHANNEL{$channel}) {
2672 $channel = $CHANNEL{$channel};
2673
2674 $self->ext_msg (channel_info => $channel)
2675 if $self->can_msg;
2676
2677 $channel = $channel->{id};
2678
2508 if (ref $channel) { 2679 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2680 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2681 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2682 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2683 $self->ext_msg (channel_info => $channel)
2684 if $self->can_msg;
2513 } 2685 }
2514 2686
2515 $channel = $channel->{id}; 2687 $channel = $channel->{id};
2516 } 2688 }
2517 2689
… …
2558=cut 2730=cut
2559 2731
2560sub cf::client::ext_msg($$@) { 2732sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2733 my ($self, $type, @msg) = @_;
2562 2734
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2735 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2736 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2737 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2738 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2739 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2740 }
2571} 2741}
2572 2742
… …
2579sub cf::client::ext_reply($$@) { 2749sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2750 my ($self, $id, @msg) = @_;
2581 2751
2582 if ($self->extcmd == 2) { 2752 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2753 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2754 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2755 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2756 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2757 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2758 }
2589} 2759}
… …
2731=pod 2901=pod
2732 2902
2733The following functions and methods are available within a safe environment: 2903The following functions and methods are available within a safe environment:
2734 2904
2735 cf::object 2905 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 2906 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race 2907 insert remove name archname title slaying race decrease_ob_nr
2738 2908
2739 cf::object::player 2909 cf::object::player
2740 player 2910 player
2741 2911
2742 cf::player 2912 cf::player
… …
2747 2917
2748=cut 2918=cut
2749 2919
2750for ( 2920for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2921 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 2922 insert remove inv name archname title slaying race
2923 decrease_ob_nr destroy)],
2753 ["cf::object::player" => qw(player)], 2924 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 2925 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 2926 ["cf::map" => qw(trigger)],
2756) { 2927) {
2757 no strict 'refs'; 2928 no strict 'refs';
… …
2833# the server's init and main functions 3004# the server's init and main functions
2834 3005
2835sub load_facedata($) { 3006sub load_facedata($) {
2836 my ($path) = @_; 3007 my ($path) = @_;
2837 3008
3009 # HACK to clear player env face cache, we need some signal framework
3010 # for this (global event?)
3011 %ext::player_env::MUSIC_FACE_CACHE = ();
3012
2838 my $enc = JSON::XS->new->utf8->canonical; 3013 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 3014
2840 warn "loading facedata from $path\n"; 3015 warn "loading facedata from $path\n";
2841 3016
2842 my $facedata; 3017 my $facedata;
2843 0 < aio_load $path, $facedata 3018 0 < aio_load $path, $facedata
… …
2953 $ns->fx_want ($k, $v); 3128 $ns->fx_want ($k, $v);
2954 } 3129 }
2955}; 3130};
2956 3131
2957sub reload_regions { 3132sub reload_regions {
3133 # HACK to clear player env face cache, we need some signal framework
3134 # for this (global event?)
3135 %ext::player_env::MUSIC_FACE_CACHE = ();
3136
2958 load_resource_file "$MAPDIR/regions" 3137 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3138 or die "unable to load regions file\n";
2960 3139
2961 for (cf::region::list) { 3140 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3141 $_->{match} = qr/$_->{match}/
… …
2998 3177
2999sub init { 3178sub init {
3000 reload_resources; 3179 reload_resources;
3001} 3180}
3002 3181
3003sub cfg_load { 3182sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3183 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3184 or return;
3006 3185
3007 local $/; 3186 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3187 *CFG = YAML::Syck::Load <$fh>;
… …
3024sub main { 3203sub main {
3025 # we must not ever block the main coroutine 3204 # we must not ever block the main coroutine
3026 local $Coro::idle = sub { 3205 local $Coro::idle = sub {
3027 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3206 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3028 (async { 3207 (async {
3208 $Coro::current->{desc} = "IDLE BUG HANDLER";
3029 Event::one_event; 3209 Event::one_event;
3030 })->prio (Coro::PRIO_MAX); 3210 })->prio (Coro::PRIO_MAX);
3031 }; 3211 };
3032 3212
3033 cfg_load; 3213 reload_config;
3034 db_init; 3214 db_init;
3035 load_extensions; 3215 load_extensions;
3036 3216
3037 $TICK_WATCHER->start; 3217 $TICK_WATCHER->start;
3038 Event::loop; 3218 Event::loop;
… …
3105 # and maps saved/destroyed asynchronously. 3285 # and maps saved/destroyed asynchronously.
3106 warn "begin emergency player save\n"; 3286 warn "begin emergency player save\n";
3107 for my $login (keys %cf::PLAYER) { 3287 for my $login (keys %cf::PLAYER) {
3108 my $pl = $cf::PLAYER{$login} or next; 3288 my $pl = $cf::PLAYER{$login} or next;
3109 $pl->valid or next; 3289 $pl->valid or next;
3290 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3110 $pl->save; 3291 $pl->save;
3111 } 3292 }
3112 warn "end emergency player save\n"; 3293 warn "end emergency player save\n";
3113 3294
3114 warn "begin emergency map save\n"; 3295 warn "begin emergency map save\n";
… …
3231 warn "reloading cf.pm"; 3412 warn "reloading cf.pm";
3232 require cf; 3413 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3414 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3415
3235 warn "loading config and database again"; 3416 warn "loading config and database again";
3236 cf::cfg_load; 3417 cf::reload_config;
3237 3418
3238 warn "loading extensions"; 3419 warn "loading extensions";
3239 cf::load_extensions; 3420 cf::load_extensions;
3240 3421
3241 warn "reattaching attachments to objects/players"; 3422 warn "reattaching attachments to objects/players";
… …
3277register_command "reload" => sub { 3458register_command "reload" => sub {
3278 my ($who, $arg) = @_; 3459 my ($who, $arg) = @_;
3279 3460
3280 if ($who->flag (FLAG_WIZ)) { 3461 if ($who->flag (FLAG_WIZ)) {
3281 $who->message ("reloading server."); 3462 $who->message ("reloading server.");
3463 async {
3464 $Coro::current->{desc} = "perl_reload";
3282 async { reload_perl }; 3465 reload_perl;
3466 };
3283 } 3467 }
3284}; 3468};
3285 3469
3286unshift @INC, $LIBDIR; 3470unshift @INC, $LIBDIR;
3287 3471
… …
3306 my $signal = new Coro::Signal; 3490 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal; 3491 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait; 3492 $signal->wait;
3309} 3493}
3310 3494
3311 my $min = 1e6;#d#
3312 my $avg = 10;
3313$TICK_WATCHER = Event->timer ( 3495$TICK_WATCHER = Event->timer (
3314 reentrant => 0, 3496 reentrant => 0,
3315 parked => 1, 3497 parked => 1,
3316 prio => 0, 3498 prio => 0,
3317 at => $NEXT_TICK || $TICK, 3499 at => $NEXT_TICK || $TICK,
… …
3325 3507
3326 $NOW = $tick_start = Event::time; 3508 $NOW = $tick_start = Event::time;
3327 3509
3328 cf::server_tick; # one server iteration 3510 cf::server_tick; # one server iteration
3329 3511
3330 0 && sync_job {#d#
3331 for(1..10) {
3332 my $t = Event::time;
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3334 or die;
3335
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 };
3352
3353 $RUNTIME += $TICK; 3512 $RUNTIME += $TICK;
3354 $NEXT_TICK += $TICK; 3513 $NEXT_TICK += $TICK;
3355 3514
3356 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3515 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3357 $NEXT_RUNTIME_WRITE = $NOW + 10; 3516 $NEXT_RUNTIME_WRITE = $NOW + 10;
3358 Coro::async_pool { 3517 Coro::async_pool {
3518 $Coro::current->{desc} = "runtime saver";
3359 write_runtime 3519 write_runtime
3360 or warn "ERROR: unable to write runtime file: $!"; 3520 or warn "ERROR: unable to write runtime file: $!";
3361 }; 3521 };
3362 } 3522 }
3363 3523
3364# my $AFTER = Event::time;
3365# warn $AFTER - $NOW;#d#
3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3524 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send; 3525 $sig->send;
3369 } 3526 }
3370 while (my $sig = shift @WAIT_FOR_TICK) { 3527 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send; 3528 $sig->send;
… …
3381 3538
3382 $LOAD = ($NOW - $tick_start) / $TICK; 3539 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3540 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384 3541
3385 _post_tick; 3542 _post_tick;
3386
3387
3388 }, 3543 },
3389); 3544);
3390 3545
3391{ 3546{
3547 BDB::min_parallel 8;
3392 BDB::max_poll_time $TICK * 0.1; 3548 BDB::max_poll_time $TICK * 0.1;
3393 $BDB_POLL_WATCHER = Event->io ( 3549 $BDB_POLL_WATCHER = Event->io (
3394 reentrant => 0, 3550 reentrant => 0,
3395 fd => BDB::poll_fileno, 3551 fd => BDB::poll_fileno,
3396 poll => 'r', 3552 poll => 'r',
3397 prio => 0, 3553 prio => 0,
3398 data => WF_AUTOCANCEL, 3554 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb, 3555 cb => \&BDB::poll_cb,
3400 ); 3556 );
3401 BDB::min_parallel 8;
3402 3557
3403 BDB::set_sync_prepare { 3558 BDB::set_sync_prepare {
3404 my $status; 3559 my $status;
3405 my $current = $Coro::current; 3560 my $current = $Coro::current;
3406 ( 3561 (
… …
3415 ) 3570 )
3416 }; 3571 };
3417 3572
3418 unless ($DB_ENV) { 3573 unless ($DB_ENV) {
3419 $DB_ENV = BDB::db_env_create; 3574 $DB_ENV = BDB::db_env_create;
3575 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3576 | BDB::LOG_AUTOREMOVE, 1);
3577 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3578 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3420 3579
3421 cf::sync_job { 3580 cf::sync_job {
3422 eval { 3581 eval {
3423 BDB::db_env_open 3582 BDB::db_env_open
3424 $DB_ENV, 3583 $DB_ENV,
… …
3426 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 3587 0666;
3429 3588
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3589 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3433 $DB_ENV->set_lk_detect;
3434 }; 3590 };
3435 3591
3436 cf::cleanup "db_env_open(db): $@" if $@; 3592 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 3593 };
3438 } 3594 }
3595
3596 $BDB_DEADLOCK_WATCHER = Event->timer (
3597 after => 3,
3598 interval => 1,
3599 hard => 1,
3600 prio => 0,
3601 data => WF_AUTOCANCEL,
3602 cb => sub {
3603 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3604 },
3605 );
3606 $BDB_CHECKPOINT_WATCHER = Event->timer (
3607 after => 11,
3608 interval => 60,
3609 hard => 1,
3610 prio => 0,
3611 data => WF_AUTOCANCEL,
3612 cb => sub {
3613 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3614 },
3615 );
3616 $BDB_TRICKLE_WATCHER = Event->timer (
3617 after => 5,
3618 interval => 10,
3619 hard => 1,
3620 prio => 0,
3621 data => WF_AUTOCANCEL,
3622 cb => sub {
3623 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3624 },
3625 );
3439} 3626}
3440 3627
3441{ 3628{
3442 IO::AIO::min_parallel 8; 3629 IO::AIO::min_parallel 8;
3443 3630
… …
3446 $AIO_POLL_WATCHER = Event->io ( 3633 $AIO_POLL_WATCHER = Event->io (
3447 reentrant => 0, 3634 reentrant => 0,
3448 data => WF_AUTOCANCEL, 3635 data => WF_AUTOCANCEL,
3449 fd => IO::AIO::poll_fileno, 3636 fd => IO::AIO::poll_fileno,
3450 poll => 'r', 3637 poll => 'r',
3451 prio => 6, 3638 prio => 0,
3452 cb => \&IO::AIO::poll_cb, 3639 cb => \&IO::AIO::poll_cb,
3453 ); 3640 );
3454} 3641}
3455 3642
3456my $_log_backtrace; 3643my $_log_backtrace;
… …
3462 3649
3463 # limit the # of concurrent backtraces 3650 # limit the # of concurrent backtraces
3464 if ($_log_backtrace < 2) { 3651 if ($_log_backtrace < 2) {
3465 ++$_log_backtrace; 3652 ++$_log_backtrace;
3466 async { 3653 async {
3654 $Coro::current->{desc} = "abt $msg";
3655
3467 my @bt = fork_call { 3656 my @bt = fork_call {
3468 @addr = map { sprintf "%x", $_ } @addr; 3657 @addr = map { sprintf "%x", $_ } @addr;
3469 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3658 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3470 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3659 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3471 or die "addr2line: $!"; 3660 or die "addr2line: $!";

Diff Legend

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