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

Diff Legend

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