ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.375 by root, Sun Sep 30 20:22:21 2007 UTC

… …
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 ();
… …
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;
… …
420 435
421 my $busy = 1; 436 my $busy = 1;
422 my @res; 437 my @res;
423 438
424 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 441 @res = eval { $job->() };
426 warn $@ if $@; 442 warn $@ if $@;
427 undef $busy; 443 undef $busy;
428 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
429 445
… …
478sub fork_call(&@) { 494sub fork_call(&@) {
479 my ($cb, @args) = @_; 495 my ($cb, @args) = @_;
480 496
481 # we seemingly have to make a local copy of the whole thing, 497 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 498 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 499 # TODO: investigate and fix (likely this will be rather laborious)
484 500
485 my @res = Coro::Util::fork_eval { 501 my @res = Coro::Util::fork_eval {
486 reset_signals; 502 reset_signals;
487 &$cb 503 &$cb
488 }, @args; 504 }, @args;
… …
497=item cf::db_put $family => $key => $value 513=item cf::db_put $family => $key => $value
498 514
499Stores the given C<$value> in the family. It can currently store binary 515Stores 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). 516data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 517
518=item $db = cf::db_table "name"
519
520Create and/or open a new database table. The string must not be "db" and must be unique
521within each server.
522
502=cut 523=cut
524
525sub db_table($) {
526 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV;
528
529 eval {
530 $db->set_flags (BDB::CHKSUM);
531
532 utf8::encode $name;
533 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
534 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
535 cf::cleanup "db_open(db): $!" if $!;
536 };
537 cf::cleanup "db_open(db): $@" if $@;
538
539 $db
540}
503 541
504our $DB; 542our $DB;
505 543
506sub db_init { 544sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 545 cf::sync_job {
511 eval { 546 $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 } 547 };
521} 548}
522 549
523sub db_get($$) { 550sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 551 my $key = "$_[0]/$_[1]";
525 552
… …
575 if (1) { 602 if (1) {
576 $md5 = 603 $md5 =
577 join "\x00", 604 join "\x00",
578 $processversion, 605 $processversion,
579 map { 606 map {
580 Coro::cede; 607 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 608 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 609 } 0.. $#$src;
583 610
584 611
585 my $dbmd5 = db_get cache => "$id/md5"; 612 my $dbmd5 = db_get cache => "$id/md5";
… …
1004sub object_freezer_save { 1031sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1006 1033
1007 sync_job { 1034 sync_job {
1008 if (length $$rdata) { 1035 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1038 $decname, length $$rdata, scalar @$objs;
1011 1039
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1041 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1043 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1062 }
1035 } else { 1063 } else {
1036 aio_unlink $filename; 1064 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1038 } 1066 }
1039 } 1067 };
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1056 or return; 1084 or return;
1057 1085
1058 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1088 or return;
1089
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1091 }
1063 1092
1093 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1095 $decname, length $data, scalar @{$av || []};
1096
1066 return ($data, $av); 1097 ($data, $av)
1067} 1098}
1068 1099
1069=head2 COMMAND CALLBACKS 1100=head2 COMMAND CALLBACKS
1070 1101
1071=over 4 1102=over 4
… …
1149 my ($type, $reply, @payload) = 1180 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1181 "ARRAY" eq ref $msg
1151 ? @$msg 1182 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1184
1185 my @reply;
1186
1154 if (my $cb = $EXTCMD{$type}) { 1187 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1188 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1189 }
1190
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1160 } else { 1194 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1196 }
1163 1197
1164 cf::override; 1198 cf::override;
… …
1254 1288
1255=head3 cf::player 1289=head3 cf::player
1256 1290
1257=over 4 1291=over 4
1258 1292
1293=item cf::player::num_playing
1294
1295Returns the official number of playing players, as per the Crossfire metaserver rules.
1296
1297=cut
1298
1299sub num_playing {
1300 scalar grep
1301 $_->ob->map
1302 && !$_->hidden
1303 && !$_->ob->flag (cf::FLAG_WIZ),
1304 cf::player::list
1305}
1306
1259=item cf::player::find $login 1307=item cf::player::find $login
1260 1308
1261Returns the given player object, loading it if necessary (might block). 1309Returns the given player object, loading it if necessary (might block).
1262 1310
1263=cut 1311=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1346 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1347 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1348 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1350
1303 my $pl = load_pl path $login 1351 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1352 or return;
1353
1354 my $pl = cf::player::load_pl $f
1355 or return;
1356 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
1306 } 1359 }
1307 } 1360 }
1308} 1361}
1309 1362
… …
1319 1372
1320 aio_mkdir playerdir $pl, 0770; 1373 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1374 $pl->{last_save} = $cf::RUNTIME;
1322 1375
1323 $pl->save_pl ($path); 1376 $pl->save_pl ($path);
1324 Coro::cede; 1377 cf::cede_to_tick;
1325} 1378}
1326 1379
1327sub new($) { 1380sub new($) {
1328 my ($login) = @_; 1381 my ($login) = @_;
1329 1382
… …
1407 or return []; 1460 or return [];
1408 1461
1409 my @logins; 1462 my @logins;
1410 1463
1411 for my $login (@$dirs) { 1464 for my $login (@$dirs) {
1465 my $path = path $login;
1466
1467 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1470 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1471 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 }
1415 1473
1416 utf8::decode $login; 1474 utf8::decode $login;
1417 push @logins, $login; 1475 push @logins, $login;
1418 } 1476 }
1419 1477
… …
1457sub expand_cfpod { 1515sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1516 ((my $self), (local $_)) = @_;
1459 1517
1460 # escape & and < 1518 # escape & and <
1461 s/&/&amp;/g; 1519 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1520 s/(?<![BIUGHT])</&lt;/g;
1463 1521
1464 # this is buggy, it needs to properly take care of nested <'s 1522 # this is buggy, it needs to properly take care of nested <'s
1465 1523
1466 1 while 1524 1 while
1467 # replace B<>, I<>, U<> etc. 1525 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1526 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1530 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1531 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1532 $self->gender ? $2 : $1
1474 }ge 1533 }ge
1475 # replace H<hint text> 1534 # replace H<hint text>
… …
1743 1802
1744sub load_header_from($) { 1803sub load_header_from($) {
1745 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1746 1805
1747 utf8::encode $path; 1806 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1808 or return;
1809
1810 $self->_load_header ($f)
1811 or return;
1812
1813 local $MAP_LOADING{$self->{path}} = $self;
1814 $f->resolve_delayed_derefs;
1753 1815
1754 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1755 1817
1756 1 1818 1
1757} 1819}
… …
1811sub find { 1873sub find {
1812 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1813 1875
1814 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1815 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1817 1880
1818 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1820 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1821 or return; 1886 or return;
1822 1887
1823 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1824 1889
… …
1826 or return; 1891 or return;
1827 1892
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1831 $map->reset; 1898 $map->reset;
1832 undef $guard;
1833 return find $path; 1899 return find $path;
1834 } 1900 }
1835 1901
1836 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1837 } 1903 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1847 1913
1848 my $path = $self->{path}; 1914 my $path = $self->{path};
1849 1915
1850 { 1916 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1852 1918
1919 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1921
1855 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1856 1923
1857 $self->alloc; 1924 $self->alloc;
1858 1925
1859 $self->pre_load; 1926 $self->pre_load;
1860 Coro::cede; 1927 cf::cede_to_tick;
1861 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1863 or return; 1932 or return;
1864 1933
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1867 1936
1868 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1938 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1941 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1873 } 1945 }
1874 } 1946 }
1875 1947
1876 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1877 # now do the right thing for maps 1951 # now do the right thing for maps
1878 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1954 unless $self->difficulty;
1881 Coro::cede; 1955 cf::cede_to_tick;
1882 1956
1883 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1958 $self->decay_objects;
1885 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1886 $self->update_buttons; 1960 $self->update_buttons;
1887 Coro::cede; 1961 cf::cede_to_tick;
1888 $self->set_darkness_map; 1962 $self->set_darkness_map;
1889 Coro::cede; 1963 cf::cede_to_tick;
1890 $self->activate; 1964 $self->activate;
1891 } 1965 }
1892 1966
1893 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1944} 2018}
1945 2019
1946sub do_load_sync { 2020sub do_load_sync {
1947 my ($map) = @_; 2021 my ($map) = @_;
1948 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1949 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1950} 2027}
1951 2028
1952our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1954 2031
1955sub find_async { 2032sub find_async {
1956 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1957 2034
1958 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1959 2036
1960 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2039 }
1963 2040
1964 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1965 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1966 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2048 if (my $map = find $k) {
1969 $map->load; 2049 $map->load if $v;
1970 } 2050 }
1971 2051
1972 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1973 } 2053 }
1974 } 2054 }
1975 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1976 }; 2056 };
1977 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
1980} 2060}
1981 2061
1982sub save { 2062sub save {
1983 my ($self) = @_; 2063 my ($self) = @_;
1984 2064
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2066
1987 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1988 2068
1989 return unless $self->dirty; 2069 return unless $self->dirty;
1990 2070
… …
1996 return if $self->{deny_save}; 2076 return if $self->{deny_save};
1997 2077
1998 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
1999 2079
2000 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2002 }; 2083 };
2003 2084
2004 if ($uniq) { 2085 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2013 my ($self) = @_; 2094 my ($self) = @_;
2014 2095
2015 # save first because save cedes 2096 # save first because save cedes
2016 $self->save; 2097 $self->save;
2017 2098
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2100
2020 return if $self->players; 2101 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2023 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2109 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2110}
2027 2111
2028sub reset_at { 2112sub reset_at {
2029 my ($self) = @_; 2113 my ($self) = @_;
2030 2114
… …
2062 if $uniq; 2146 if $uniq;
2063 } 2147 }
2064 2148
2065 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2066 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2153 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2154
2071 $self->unlink_save; 2155 $self->unlink_save;
2072 $self->destroy; 2156 $self->destroy;
2073} 2157}
2074 2158
2075my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2076 2160
2077sub nuke { 2161sub nuke {
2078 my ($self) = @_; 2162 my ($self) = @_;
2079 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2080 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2081 2168
2082 $self->unlink_save; 2169 $self->unlink_save;
2083 2170
2084 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2176
2090 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2091 2179
2092 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2093} 2181}
2094 2182
2095=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2171 2259
2172sub inv_recursive { 2260sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2174} 2262}
2175 2263
2264=item $ref = $ob->ref
2265
2266creates and returns a persistent reference to an objetc that can be stored as a string.
2267
2268=item $ob = cf::object::deref ($refstring)
2269
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block.
2272
2273=cut
2274
2275sub deref {
2276 my ($ref) = @_;
2277
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return;
2285 $pl->ob->uuid eq $uuid
2286 or return;
2287
2288 $pl->ob
2289 } else {
2290 warn "$ref: cannot resolve object reference\n";
2291 undef
2292 }
2293}
2294
2176package cf; 2295package cf;
2177 2296
2178=back 2297=back
2179 2298
2180=head3 cf::object::player 2299=head3 cf::object::player
… …
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2458
2340 $self->enter_link; 2459 $self->enter_link;
2341 2460
2342 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs];
2468
2469 # see if we actually can go there
2470 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2471 $ob = $obs[rand @obs];
2472 } else {
2473 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2474 }
2475 # else put us there anyways for now #d#
2476
2477 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2478 } else {
2479 ($path, $x, $y) = (undef, undef, undef);
2480 }
2481 }
2482
2343 my $map = eval { 2483 my $map = eval {
2344 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2345 2485
2346 if ($map) { 2486 if ($map) {
2347 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2349 } else { 2489 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2491 }
2352 2492
2353 $map 2493 $map
2354 }; 2494 };
2355 2495
… …
2445 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2448 2588
2449 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2450 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2451 unless (eval { 2593 unless (eval {
2452 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2453 2595
2454 1; 2596 1;
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2631the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2632the message unless the client supports the msg packet.
2491 2633
2492=cut 2634=cut
2493 2635
2636our %CHANNEL = (
2637 "c/identify" => {
2638 id => "infobox",
2639 title => "Identify",
2640 reply => undef,
2641 tooltip => "Items recently identified",
2642 },
2643 "c/examine" => {
2644 id => "infobox",
2645 title => "Examine",
2646 reply => undef,
2647 tooltip => "Signs and other items you examined",
2648 },
2649 "c/lookat" => {
2650 id => "infobox",
2651 title => "Look",
2652 reply => undef,
2653 tooltip => "What you saw there",
2654 },
2655);
2656
2494sub cf::client::send_msg { 2657sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2659
2497 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2498 2661
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2663
2664 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel};
2667
2668 $self->ext_msg (channel_info => $channel)
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id};
2672
2501 if (ref $channel) { 2673 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2677 $self->ext_msg (channel_info => $channel)
2678 if $self->can_msg;
2506 } 2679 }
2507 2680
2508 $channel = $channel->{id}; 2681 $channel = $channel->{id};
2509 } 2682 }
2510 2683
… …
2551=cut 2724=cut
2552 2725
2553sub cf::client::ext_msg($$@) { 2726sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2727 my ($self, $type, @msg) = @_;
2555 2728
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2729 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2731 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2732 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2734 }
2564} 2735}
2565 2736
… …
2572sub cf::client::ext_reply($$@) { 2743sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2744 my ($self, $id, @msg) = @_;
2574 2745
2575 if ($self->extcmd == 2) { 2746 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2748 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2749 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2750 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2752 }
2582} 2753}
… …
2646 my ($type, $reply, @payload) = 2817 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2818 "ARRAY" eq ref $msg
2648 ? @$msg 2819 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2820 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2821
2822 my @reply;
2823
2651 if (my $cb = $EXTICMD{$type}) { 2824 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2825 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2826 }
2827
2828 $ns->ext_reply ($reply, @reply)
2829 if $reply;
2830
2657 } else { 2831 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2832 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2833 }
2660 2834
2661 cf::override; 2835 cf::override;
… …
2722 2896
2723The following functions and methods are available within a safe environment: 2897The following functions and methods are available within a safe environment:
2724 2898
2725 cf::object 2899 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2900 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2901 insert remove name archname title slaying race decrease_ob_nr
2728 2902
2729 cf::object::player 2903 cf::object::player
2730 player 2904 player
2731 2905
2732 cf::player 2906 cf::player
… …
2737 2911
2738=cut 2912=cut
2739 2913
2740for ( 2914for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2916 insert remove inv name archname title slaying race
2917 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2918 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2919 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2920 ["cf::map" => qw(trigger)],
2746) { 2921) {
2747 no strict 'refs'; 2922 no strict 'refs';
… …
2823# the server's init and main functions 2998# the server's init and main functions
2824 2999
2825sub load_facedata($) { 3000sub load_facedata($) {
2826 my ($path) = @_; 3001 my ($path) = @_;
2827 3002
3003 # HACK to clear player env face cache, we need some signal framework
3004 # for this (global event?)
3005 %ext::player_env::MUSIC_FACE_CACHE = ();
3006
2828 my $enc = JSON::XS->new->utf8->canonical; 3007 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3008
2830 warn "loading facedata from $path\n"; 3009 warn "loading facedata from $path\n";
2831 3010
2832 my $facedata; 3011 my $facedata;
2833 0 < aio_load $path, $facedata 3012 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3018 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3019
2841 # patch in the exptable 3020 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 3021 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 3022 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3023 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 3024 };
2846 cf::cede_to_tick; 3025 cf::cede_to_tick;
2847 3026
2848 { 3027 {
2849 my $faces = $facedata->{faceinfo}; 3028 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 3081 name => $name,
2903 %{ $info->{meta} || {} }, 3082 %{ $info->{meta} || {} },
2904 }); 3083 });
2905 3084
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else {
3087 $data = $info->{data};
2907 } 3088 }
2908 3089
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 3091 cf::face::set_type $idx, $info->{type};
2911 3092
… …
2941 $ns->fx_want ($k, $v); 3122 $ns->fx_want ($k, $v);
2942 } 3123 }
2943}; 3124};
2944 3125
2945sub reload_regions { 3126sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = ();
3130
2946 load_resource_file "$MAPDIR/regions" 3131 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3132 or die "unable to load regions file\n";
2948 3133
2949 for (cf::region::list) { 3134 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3135 $_->{match} = qr/$_->{match}/
… …
2986 3171
2987sub init { 3172sub init {
2988 reload_resources; 3173 reload_resources;
2989} 3174}
2990 3175
2991sub cfg_load { 3176sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3177 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3178 or return;
2994 3179
2995 local $/; 3180 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3181 *CFG = YAML::Syck::Load <$fh>;
… …
3012sub main { 3197sub main {
3013 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
3014 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
3015 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3016 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
3017 Event::one_event; 3203 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
3019 }; 3205 };
3020 3206
3021 cfg_load; 3207 reload_config;
3022 db_init; 3208 db_init;
3023 load_extensions; 3209 load_extensions;
3024 3210
3025 $TICK_WATCHER->start; 3211 $TICK_WATCHER->start;
3026 Event::loop; 3212 Event::loop;
… …
3219 warn "reloading cf.pm"; 3405 warn "reloading cf.pm";
3220 require cf; 3406 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3408
3223 warn "loading config and database again"; 3409 warn "loading config and database again";
3224 cf::cfg_load; 3410 cf::reload_config;
3225 3411
3226 warn "loading extensions"; 3412 warn "loading extensions";
3227 cf::load_extensions; 3413 cf::load_extensions;
3228 3414
3229 warn "reattaching attachments to objects/players"; 3415 warn "reattaching attachments to objects/players";
… …
3265register_command "reload" => sub { 3451register_command "reload" => sub {
3266 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3267 3453
3268 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3269 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3270 async { reload_perl }; 3458 reload_perl;
3459 };
3271 } 3460 }
3272}; 3461};
3273 3462
3274unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3275 3464
… …
3294 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 3485 $signal->wait;
3297} 3486}
3298 3487
3299 my $min = 1e6;#d#
3300 my $avg = 10;
3301$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3302 reentrant => 0, 3489 reentrant => 0,
3303 parked => 1, 3490 parked => 1,
3304 prio => 0, 3491 prio => 0,
3305 at => $NEXT_TICK || $TICK, 3492 at => $NEXT_TICK || $TICK,
… …
3313 3500
3314 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3315 3502
3316 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3317 3504
3318 0 && sync_job {#d#
3319 for(1..10) {
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323
3324 $map->width (50);
3325 $map->height (50);
3326 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1);
3328 my $t = Event::time - $t;
3329
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 };
3340
3341 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3343 3507
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3346 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3347 write_runtime 3512 write_runtime
3348 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3349 }; 3514 };
3350 } 3515 }
3351 3516
3352# my $AFTER = Event::time;
3353# warn $AFTER - $NOW;#d#
3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send; 3518 $sig->send;
3357 } 3519 }
3358 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send; 3521 $sig->send;
… …
3369 3531
3370 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 3534
3373 _post_tick; 3535 _post_tick;
3374
3375
3376 }, 3536 },
3377); 3537);
3378 3538
3379{ 3539{
3540 BDB::min_parallel 8;
3380 BDB::max_poll_time $TICK * 0.1; 3541 BDB::max_poll_time $TICK * 0.1;
3381 $BDB_POLL_WATCHER = Event->io ( 3542 $BDB_POLL_WATCHER = Event->io (
3382 reentrant => 0, 3543 reentrant => 0,
3383 fd => BDB::poll_fileno, 3544 fd => BDB::poll_fileno,
3384 poll => 'r', 3545 poll => 'r',
3385 prio => 0, 3546 prio => 0,
3386 data => WF_AUTOCANCEL, 3547 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb, 3548 cb => \&BDB::poll_cb,
3388 ); 3549 );
3389 BDB::min_parallel 8;
3390 3550
3391 BDB::set_sync_prepare { 3551 BDB::set_sync_prepare {
3392 my $status; 3552 my $status;
3393 my $current = $Coro::current; 3553 my $current = $Coro::current;
3394 ( 3554 (
… …
3403 ) 3563 )
3404 }; 3564 };
3405 3565
3406 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3407 $DB_ENV = BDB::db_env_create; 3567 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3408 3572
3409 cf::sync_job { 3573 cf::sync_job {
3410 eval { 3574 eval {
3411 BDB::db_env_open 3575 BDB::db_env_open
3412 $DB_ENV, 3576 $DB_ENV,
… …
3414 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3578 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 3580 0666;
3417 3581
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3421 $DB_ENV->set_lk_detect;
3422 }; 3583 };
3423 3584
3424 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 3586 };
3426 } 3587 }
3588
3589 $BDB_DEADLOCK_WATCHER = Event->timer (
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 );
3599 $BDB_CHECKPOINT_WATCHER = Event->timer (
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 );
3609 $BDB_TRICKLE_WATCHER = Event->timer (
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 );
3427} 3619}
3428 3620
3429{ 3621{
3430 IO::AIO::min_parallel 8; 3622 IO::AIO::min_parallel 8;
3431 3623
… …
3450 3642
3451 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3452 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3453 ++$_log_backtrace; 3645 ++$_log_backtrace;
3454 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3455 my @bt = fork_call { 3649 my @bt = fork_call {
3456 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3457 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3652 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3459 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

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