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.335 by root, Mon Aug 20 22:21:48 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>
… …
1505=cut 1564=cut
1506 1565
1507sub ext_reply($$@) { 1566sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1567 my ($self, $id, @msg) = @_;
1509 1568
1510 if ($self->ns->extcmd == 2) { 1569 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1570}
1518 1571
1519=item $player->ext_msg ($type, @msg) 1572=item $player->ext_msg ($type, @msg)
1520 1573
1521Sends an ext event to the client. 1574Sends an ext event to the client.
… …
1749 1802
1750sub load_header_from($) { 1803sub load_header_from($) {
1751 my ($self, $path) = @_; 1804 my ($self, $path) = @_;
1752 1805
1753 utf8::encode $path; 1806 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1807 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1815
1760 $self->{load_path} = $path; 1816 $self->{load_path} = $path;
1761 1817
1762 1 1818 1
1763} 1819}
… …
1817sub find { 1873sub find {
1818 my ($path, $origin) = @_; 1874 my ($path, $origin) = @_;
1819 1875
1820 $path = normalise $path, $origin && $origin->path; 1876 $path = normalise $path, $origin && $origin->path;
1821 1877
1878 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1879 cf::lock_wait "map_find:$path";
1823 1880
1824 $cf::MAP{$path} || do { 1881 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1885 my $map = new_from_path cf::map $path
1827 or return; 1886 or return;
1828 1887
1829 $map->{last_save} = $cf::RUNTIME; 1888 $map->{last_save} = $cf::RUNTIME;
1830 1889
… …
1832 or return; 1891 or return;
1833 1892
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1894 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1895 #$cf::WAIT_FOR_TICK->wait;
1896 undef $guard1;
1897 undef $guard2;
1837 $map->reset; 1898 $map->reset;
1838 undef $guard;
1839 return find $path; 1899 return find $path;
1840 } 1900 }
1841 1901
1842 $cf::MAP{$path} = $map 1902 $cf::MAP{$path} = $map
1843 } 1903 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1912 local $self->{deny_reset} = 1; # loading can take a long time
1853 1913
1854 my $path = $self->{path}; 1914 my $path = $self->{path};
1855 1915
1856 { 1916 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1917 my $guard = cf::lock_acquire "map_data:$path";
1858 1918
1919 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1920 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 1921
1861 $self->in_memory (cf::MAP_LOADING); 1922 $self->in_memory (cf::MAP_LOADING);
1862 1923
1863 $self->alloc; 1924 $self->alloc;
1864 1925
1865 $self->pre_load; 1926 $self->pre_load;
1866 Coro::cede; 1927 cf::cede_to_tick;
1867 1928
1929 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 1931 $self->_load_objects ($f)
1869 or return; 1932 or return;
1870 1933
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original}; 1935 if delete $self->{load_original};
1873 1936
1874 if (my $uniq = $self->uniq_path) { 1937 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 1938 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 1939 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 1941 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1942 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs;
1944 }
1879 } 1945 }
1880 } 1946 }
1881 1947
1882 Coro::cede; 1948 $f->resolve_delayed_derefs;
1949
1950 cf::cede_to_tick;
1883 # now do the right thing for maps 1951 # now do the right thing for maps
1884 $self->link_multipart_objects; 1952 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1953 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1954 unless $self->difficulty;
1887 Coro::cede; 1955 cf::cede_to_tick;
1888 1956
1889 unless ($self->{deny_activate}) { 1957 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1958 $self->decay_objects;
1891 $self->fix_auto_apply; 1959 $self->fix_auto_apply;
1892 $self->update_buttons; 1960 $self->update_buttons;
1893 Coro::cede; 1961 cf::cede_to_tick;
1894 $self->set_darkness_map; 1962 $self->set_darkness_map;
1895 Coro::cede; 1963 cf::cede_to_tick;
1896 $self->activate; 1964 $self->activate;
1897 } 1965 }
1898 1966
1899 $self->{last_save} = $cf::RUNTIME; 1967 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1968 $self->last_access ($cf::RUNTIME);
… …
1950} 2018}
1951 2019
1952sub do_load_sync { 2020sub do_load_sync {
1953 my ($map) = @_; 2021 my ($map) = @_;
1954 2022
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main;
2025
1955 cf::sync_job { $map->load }; 2026 cf::sync_job { $map->load };
1956} 2027}
1957 2028
1958our %MAP_PREFETCH; 2029our %MAP_PREFETCH;
1959our $MAP_PREFETCHER = undef; 2030our $MAP_PREFETCHER = undef;
1960 2031
1961sub find_async { 2032sub find_async {
1962 my ($path, $origin) = @_; 2033 my ($path, $origin, $load) = @_;
1963 2034
1964 $path = normalise $path, $origin && $origin->{path}; 2035 $path = normalise $path, $origin && $origin->{path};
1965 2036
1966 if (my $map = $cf::MAP{$path}) { 2037 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1968 } 2039 }
1969 2040
1970 undef $MAP_PREFETCH{$path}; 2041 $MAP_PREFETCH{$path} |= $load;
2042
1971 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
1972 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
1973 for my $path (keys %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
1974 if (my $map = find $path) { 2048 if (my $map = find $k) {
1975 $map->load; 2049 $map->load if $v;
1976 } 2050 }
1977 2051
1978 delete $MAP_PREFETCH{$path}; 2052 delete $MAP_PREFETCH{$k};
1979 } 2053 }
1980 } 2054 }
1981 undef $MAP_PREFETCHER; 2055 undef $MAP_PREFETCHER;
1982 }; 2056 };
1983 $MAP_PREFETCHER->prio (6); 2057 $MAP_PREFETCHER->prio (6);
… …
1986} 2060}
1987 2061
1988sub save { 2062sub save {
1989 my ($self) = @_; 2063 my ($self) = @_;
1990 2064
1991 my $lock = cf::lock_acquire "map_data:" . $self->path; 2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
1992 2066
1993 $self->{last_save} = $cf::RUNTIME; 2067 $self->{last_save} = $cf::RUNTIME;
1994 2068
1995 return unless $self->dirty; 2069 return unless $self->dirty;
1996 2070
… …
2002 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2003 2077
2004 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2005 2079
2006 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2007 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2008 }; 2083 };
2009 2084
2010 if ($uniq) { 2085 if ($uniq) {
2011 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2019 my ($self) = @_; 2094 my ($self) = @_;
2020 2095
2021 # save first because save cedes 2096 # save first because save cedes
2022 $self->save; 2097 $self->save;
2023 2098
2024 my $lock = cf::lock_acquire "map_data:" . $self->path; 2099 my $lock = cf::lock_acquire "map_data:$self->{path}";
2025 2100
2026 return if $self->players; 2101 return if $self->players;
2027 return if $self->in_memory != cf::MAP_IN_MEMORY; 2102 return if $self->in_memory != cf::MAP_IN_MEMORY;
2028 return if $self->{deny_save}; 2103 return if $self->{deny_save};
2029 2104
2105 $self->in_memory (cf::MAP_SWAPPED);
2106
2107 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP;
2030 $self->clear; 2109 $self->clear;
2031 $self->in_memory (cf::MAP_SWAPPED);
2032} 2110}
2033 2111
2034sub reset_at { 2112sub reset_at {
2035 my ($self) = @_; 2113 my ($self) = @_;
2036 2114
… …
2068 if $uniq; 2146 if $uniq;
2069 } 2147 }
2070 2148
2071 delete $cf::MAP{$self->path}; 2149 delete $cf::MAP{$self->path};
2072 2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2073 $self->clear; 2153 $self->clear;
2074
2075 $_->clear_links_to ($self) for values %cf::MAP;
2076 2154
2077 $self->unlink_save; 2155 $self->unlink_save;
2078 $self->destroy; 2156 $self->destroy;
2079} 2157}
2080 2158
2081my $nuke_counter = "aaaa"; 2159my $nuke_counter = "aaaa";
2082 2160
2083sub nuke { 2161sub nuke {
2084 my ($self) = @_; 2162 my ($self) = @_;
2085 2163
2164 {
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166
2086 delete $cf::MAP{$self->path}; 2167 delete $cf::MAP{$self->path};
2087 2168
2088 $self->unlink_save; 2169 $self->unlink_save;
2089 2170
2090 bless $self, "cf::map"; 2171 bless $self, "cf::map";
2091 delete $self->{deny_reset}; 2172 delete $self->{deny_reset};
2092 $self->{deny_save} = 1; 2173 $self->{deny_save} = 1;
2093 $self->reset_timeout (1); 2174 $self->reset_timeout (1);
2094 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2095 2176
2096 $cf::MAP{$self->path} = $self; 2177 $cf::MAP{$self->path} = $self;
2178 }
2097 2179
2098 $self->reset; # polite request, might not happen 2180 $self->reset; # polite request, might not happen
2099} 2181}
2100 2182
2101=item $maps = cf::map::tmp_maps 2183=item $maps = cf::map::tmp_maps
… …
2177 2259
2178sub inv_recursive { 2260sub inv_recursive {
2179 inv_recursive_ inv $_[0] 2261 inv_recursive_ inv $_[0]
2180} 2262}
2181 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
2182package cf; 2295package cf;
2183 2296
2184=back 2297=back
2185 2298
2186=head3 cf::object::player 2299=head3 cf::object::player
… …
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2458
2346 $self->enter_link; 2459 $self->enter_link;
2347 2460
2348 (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
2349 my $map = eval { 2483 my $map = eval {
2350 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2351 2485
2352 if ($map) { 2486 if ($map) {
2353 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2355 } else { 2489 } else {
2356 $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);
2357 } 2491 }
2358 2492
2359 $map 2493 $map
2360 }; 2494 };
2361 2495
… …
2451 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2454 2588
2455 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2456 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2457 unless (eval { 2593 unless (eval {
2458 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2459 2595
2460 1; 2596 1;
… …
2495the 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
2496the message unless the client supports the msg packet. 2632the message unless the client supports the msg packet.
2497 2633
2498=cut 2634=cut
2499 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
2500sub cf::client::send_msg { 2657sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2658 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2659
2503 $msg = $self->pl->expand_cfpod ($msg); 2660 $msg = $self->pl->expand_cfpod ($msg);
2504 2661
2505 $color &= cf::NDI_CLIENT_MASK; # just in case... 2662 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 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
2507 if (ref $channel) { 2673 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 2674 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2675 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2676 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel); 2677 $self->ext_msg (channel_info => $channel)
2678 if $self->can_msg;
2512 } 2679 }
2513 2680
2514 $channel = $channel->{id}; 2681 $channel = $channel->{id};
2515 } 2682 }
2516 2683
… …
2557=cut 2724=cut
2558 2725
2559sub cf::client::ext_msg($$@) { 2726sub cf::client::ext_msg($$@) {
2560 my ($self, $type, @msg) = @_; 2727 my ($self, $type, @msg) = @_;
2561 2728
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) { 2729 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($extcmd == 1) { # TODO: remove 2731 } elsif ($self->extcmd == 1) { # TODO: remove
2567 push @msg, msgtype => "event_$type"; 2732 push @msg, msgtype => "event_$type";
2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 }
2735}
2736
2737=item $client->ext_reply ($msgid, @msg)
2738
2739Sends an ext reply to the client.
2740
2741=cut
2742
2743sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_;
2745
2746 if ($self->extcmd == 2) {
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id;
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 } 2752 }
2570} 2753}
2571 2754
2572=item $success = $client->query ($flags, "text", \&cb) 2755=item $success = $client->query ($flags, "text", \&cb)
… …
2634 my ($type, $reply, @payload) = 2817 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg 2818 "ARRAY" eq ref $msg
2636 ? @$msg 2819 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2820 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638 2821
2822 my @reply;
2823
2639 if (my $cb = $EXTICMD{$type}) { 2824 if (my $cb = $EXTICMD{$type}) {
2640 my @reply = $cb->($ns, @payload); 2825 @reply = $cb->($ns, @payload);
2641
2642 $ns->ext_reply ($reply, @reply)
2643 if $reply;
2644 } 2826 }
2827
2828 $ns->ext_reply ($reply, @reply)
2829 if $reply;
2830
2645 } else { 2831 } else {
2646 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";
2647 } 2833 }
2648 2834
2649 cf::override; 2835 cf::override;
… …
2710 2896
2711The following functions and methods are available within a safe environment: 2897The following functions and methods are available within a safe environment:
2712 2898
2713 cf::object 2899 cf::object
2714 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
2715 insert remove name archname title slaying race 2901 insert remove name archname title slaying race decrease_ob_nr
2716 2902
2717 cf::object::player 2903 cf::object::player
2718 player 2904 player
2719 2905
2720 cf::player 2906 cf::player
… …
2725 2911
2726=cut 2912=cut
2727 2913
2728for ( 2914for (
2729 ["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
2730 insert remove inv name archname title slaying race)], 2916 insert remove inv name archname title slaying race
2917 decrease_ob_nr)],
2731 ["cf::object::player" => qw(player)], 2918 ["cf::object::player" => qw(player)],
2732 ["cf::player" => qw(peaceful)], 2919 ["cf::player" => qw(peaceful)],
2733 ["cf::map" => qw(trigger)], 2920 ["cf::map" => qw(trigger)],
2734) { 2921) {
2735 no strict 'refs'; 2922 no strict 'refs';
… …
2811# the server's init and main functions 2998# the server's init and main functions
2812 2999
2813sub load_facedata($) { 3000sub load_facedata($) {
2814 my ($path) = @_; 3001 my ($path) = @_;
2815 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
2816 my $enc = JSON::XS->new->utf8->canonical; 3007 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2817 3008
2818 warn "loading facedata from $path\n"; 3009 warn "loading facedata from $path\n";
2819 3010
2820 my $facedata; 3011 my $facedata;
2821 0 < aio_load $path, $facedata 3012 0 < aio_load $path, $facedata
… …
2827 or cf::cleanup "$path: version mismatch, cannot proceed."; 3018 or cf::cleanup "$path: version mismatch, cannot proceed.";
2828 3019
2829 # patch in the exptable 3020 # patch in the exptable
2830 $facedata->{resource}{"res/exp_table"} = { 3021 $facedata->{resource}{"res/exp_table"} = {
2831 type => FT_RSRC, 3022 type => FT_RSRC,
2832 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]),
2833 }; 3024 };
2834 cf::cede_to_tick; 3025 cf::cede_to_tick;
2835 3026
2836 { 3027 {
2837 my $faces = $facedata->{faceinfo}; 3028 my $faces = $facedata->{faceinfo};
… …
2890 name => $name, 3081 name => $name,
2891 %{ $info->{meta} || {} }, 3082 %{ $info->{meta} || {} },
2892 }); 3083 });
2893 3084
2894 $data = pack "(w/a*)*", $meta, $info->{data}; 3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else {
3087 $data = $info->{data};
2895 } 3088 }
2896 3089
2897 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 3091 cf::face::set_type $idx, $info->{type};
2899 3092
… …
2929 $ns->fx_want ($k, $v); 3122 $ns->fx_want ($k, $v);
2930 } 3123 }
2931}; 3124};
2932 3125
2933sub 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
2934 load_resource_file "$MAPDIR/regions" 3131 load_resource_file "$MAPDIR/regions"
2935 or die "unable to load regions file\n"; 3132 or die "unable to load regions file\n";
2936 3133
2937 for (cf::region::list) { 3134 for (cf::region::list) {
2938 $_->{match} = qr/$_->{match}/ 3135 $_->{match} = qr/$_->{match}/
… …
2974 3171
2975sub init { 3172sub init {
2976 reload_resources; 3173 reload_resources;
2977} 3174}
2978 3175
2979sub cfg_load { 3176sub reload_config {
2980 open my $fh, "<:utf8", "$CONFDIR/config" 3177 open my $fh, "<:utf8", "$CONFDIR/config"
2981 or return; 3178 or return;
2982 3179
2983 local $/; 3180 local $/;
2984 *CFG = YAML::Syck::Load <$fh>; 3181 *CFG = YAML::Syck::Load <$fh>;
… …
3000sub main { 3197sub main {
3001 # we must not ever block the main coroutine 3198 # we must not ever block the main coroutine
3002 local $Coro::idle = sub { 3199 local $Coro::idle = sub {
3003 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#
3004 (async { 3201 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER";
3005 Event::one_event; 3203 Event::one_event;
3006 })->prio (Coro::PRIO_MAX); 3204 })->prio (Coro::PRIO_MAX);
3007 }; 3205 };
3008 3206
3009 cfg_load; 3207 reload_config;
3010 db_init; 3208 db_init;
3011 load_extensions; 3209 load_extensions;
3012 3210
3013 $TICK_WATCHER->start; 3211 $TICK_WATCHER->start;
3014 Event::loop; 3212 Event::loop;
… …
3207 warn "reloading cf.pm"; 3405 warn "reloading cf.pm";
3208 require cf; 3406 require cf;
3209 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3210 3408
3211 warn "loading config and database again"; 3409 warn "loading config and database again";
3212 cf::cfg_load; 3410 cf::reload_config;
3213 3411
3214 warn "loading extensions"; 3412 warn "loading extensions";
3215 cf::load_extensions; 3413 cf::load_extensions;
3216 3414
3217 warn "reattaching attachments to objects/players"; 3415 warn "reattaching attachments to objects/players";
… …
3253register_command "reload" => sub { 3451register_command "reload" => sub {
3254 my ($who, $arg) = @_; 3452 my ($who, $arg) = @_;
3255 3453
3256 if ($who->flag (FLAG_WIZ)) { 3454 if ($who->flag (FLAG_WIZ)) {
3257 $who->message ("reloading server."); 3455 $who->message ("reloading server.");
3456 async {
3457 $Coro::current->{desc} = "perl_reload";
3258 async { reload_perl }; 3458 reload_perl;
3459 };
3259 } 3460 }
3260}; 3461};
3261 3462
3262unshift @INC, $LIBDIR; 3463unshift @INC, $LIBDIR;
3263 3464
… …
3282 my $signal = new Coro::Signal; 3483 my $signal = new Coro::Signal;
3283 push @WAIT_FOR_TICK_BEGIN, $signal; 3484 push @WAIT_FOR_TICK_BEGIN, $signal;
3284 $signal->wait; 3485 $signal->wait;
3285} 3486}
3286 3487
3287 my $min = 1e6;#d#
3288 my $avg = 10;
3289$TICK_WATCHER = Event->timer ( 3488$TICK_WATCHER = Event->timer (
3290 reentrant => 0, 3489 reentrant => 0,
3291 parked => 1, 3490 parked => 1,
3292 prio => 0, 3491 prio => 0,
3293 at => $NEXT_TICK || $TICK, 3492 at => $NEXT_TICK || $TICK,
… …
3301 3500
3302 $NOW = $tick_start = Event::time; 3501 $NOW = $tick_start = Event::time;
3303 3502
3304 cf::server_tick; # one server iteration 3503 cf::server_tick; # one server iteration
3305 3504
3306 0 && sync_job {#d#
3307 for(1..10) {
3308 my $t = Event::time;
3309 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3310 or die;
3311
3312 $map->width (50);
3313 $map->height (50);
3314 $map->alloc;
3315 $map->_load_objects ("/tmp/x.map", 1);
3316 my $t = Event::time - $t;
3317
3318 #next unless $t < 0.0013;#d#
3319 if ($t < $min) {
3320 $min = $t;
3321 }
3322 $avg = $avg * 0.99 + $t * 0.01;
3323 }
3324 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3325 exit 0;
3326 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3327 };
3328
3329 $RUNTIME += $TICK; 3505 $RUNTIME += $TICK;
3330 $NEXT_TICK += $TICK; 3506 $NEXT_TICK += $TICK;
3331 3507
3332 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3508 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3333 $NEXT_RUNTIME_WRITE = $NOW + 10; 3509 $NEXT_RUNTIME_WRITE = $NOW + 10;
3334 Coro::async_pool { 3510 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver";
3335 write_runtime 3512 write_runtime
3336 or warn "ERROR: unable to write runtime file: $!"; 3513 or warn "ERROR: unable to write runtime file: $!";
3337 }; 3514 };
3338 } 3515 }
3339 3516
3340# my $AFTER = Event::time;
3341# warn $AFTER - $NOW;#d#
3342
3343 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3344 $sig->send; 3518 $sig->send;
3345 } 3519 }
3346 while (my $sig = shift @WAIT_FOR_TICK) { 3520 while (my $sig = shift @WAIT_FOR_TICK) {
3347 $sig->send; 3521 $sig->send;
… …
3357 3531
3358 $LOAD = ($NOW - $tick_start) / $TICK; 3532 $LOAD = ($NOW - $tick_start) / $TICK;
3359 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3360 3534
3361 _post_tick; 3535 _post_tick;
3362
3363
3364 }, 3536 },
3365); 3537);
3366 3538
3367{ 3539{
3540 BDB::min_parallel 8;
3368 BDB::max_poll_time $TICK * 0.1; 3541 BDB::max_poll_time $TICK * 0.1;
3369 $BDB_POLL_WATCHER = Event->io ( 3542 $BDB_POLL_WATCHER = Event->io (
3370 reentrant => 0, 3543 reentrant => 0,
3371 fd => BDB::poll_fileno, 3544 fd => BDB::poll_fileno,
3372 poll => 'r', 3545 poll => 'r',
3373 prio => 0, 3546 prio => 0,
3374 data => WF_AUTOCANCEL, 3547 data => WF_AUTOCANCEL,
3375 cb => \&BDB::poll_cb, 3548 cb => \&BDB::poll_cb,
3376 ); 3549 );
3377 BDB::min_parallel 8;
3378 3550
3379 BDB::set_sync_prepare { 3551 BDB::set_sync_prepare {
3380 my $status; 3552 my $status;
3381 my $current = $Coro::current; 3553 my $current = $Coro::current;
3382 ( 3554 (
… …
3391 ) 3563 )
3392 }; 3564 };
3393 3565
3394 unless ($DB_ENV) { 3566 unless ($DB_ENV) {
3395 $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);
3396 3572
3397 cf::sync_job { 3573 cf::sync_job {
3398 eval { 3574 eval {
3399 BDB::db_env_open 3575 BDB::db_env_open
3400 $DB_ENV, 3576 $DB_ENV,
… …
3402 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
3403 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3579 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3404 0666; 3580 0666;
3405 3581
3406 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3582 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3407
3408 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3409 $DB_ENV->set_lk_detect;
3410 }; 3583 };
3411 3584
3412 cf::cleanup "db_env_open(db): $@" if $@; 3585 cf::cleanup "db_env_open(db): $@" if $@;
3413 }; 3586 };
3414 } 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 );
3415} 3619}
3416 3620
3417{ 3621{
3418 IO::AIO::min_parallel 8; 3622 IO::AIO::min_parallel 8;
3419 3623
… …
3438 3642
3439 # limit the # of concurrent backtraces 3643 # limit the # of concurrent backtraces
3440 if ($_log_backtrace < 2) { 3644 if ($_log_backtrace < 2) {
3441 ++$_log_backtrace; 3645 ++$_log_backtrace;
3442 async { 3646 async {
3647 $Coro::current->{desc} = "abt $msg";
3648
3443 my @bt = fork_call { 3649 my @bt = fork_call {
3444 @addr = map { sprintf "%x", $_ } @addr; 3650 @addr = map { sprintf "%x", $_ } @addr;
3445 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3651 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3446 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 |"
3447 or die "addr2line: $!"; 3653 or die "addr2line: $!";

Diff Legend

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