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.351 by root, Sun Sep 2 00:57:38 2007 UTC vs.
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC

… …
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';
… …
285Return true if the lock is currently active, i.e. somebody has locked it. 287Return true if the lock is currently active, i.e. somebody has locked it.
286 288
287=cut 289=cut
288 290
289our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
290 293
291sub lock_wait($) { 294sub lock_wait($) {
292 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
293 301
294 # wait for lock, if any 302 # wait for lock, if any
295 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule; 305 Coro::schedule;
… …
303 311
304 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
305 lock_wait $key; 313 lock_wait $key;
306 314
307 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
308 317
309 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
310 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
312 } 322 }
313} 323}
314 324
… …
344our @SLOT_QUEUE; 354our @SLOT_QUEUE;
345our $SLOT_QUEUE; 355our $SLOT_QUEUE;
346 356
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
349 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
350 362
351 while () { 363 while () {
352 next_job: 364 next_job:
353 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
415 my $time = Event::time; 427 my $time = Event::time;
416 428
417 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
419 431
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d#
433
420 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
421 # (but this is cancel-safe) 435 # (but this is cancel-safe)
422 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
423 437
424 my $busy = 1; 438 my $busy = 1;
425 my @res; 439 my @res;
426 440
427 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 443 @res = eval { $job->() };
429 warn $@ if $@; 444 warn $@ if $@;
430 undef $busy; 445 undef $busy;
431 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
432 447
… …
481sub fork_call(&@) { 496sub fork_call(&@) {
482 my ($cb, @args) = @_; 497 my ($cb, @args) = @_;
483 498
484 # 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,
485 # otherwise perl prematurely frees the stuff :/ 500 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 501 # TODO: investigate and fix (likely this will be rather laborious)
487 502
488 my @res = Coro::Util::fork_eval { 503 my @res = Coro::Util::fork_eval {
489 reset_signals; 504 reset_signals;
490 &$cb 505 &$cb
491 }, @args; 506 }, @args;
… …
500=item cf::db_put $family => $key => $value 515=item cf::db_put $family => $key => $value
501 516
502Stores 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
503data 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).
504 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
505=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}
506 543
507our $DB; 544our $DB;
508 545
509sub db_init { 546sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 547 cf::sync_job {
514 eval { 548 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 549 };
524} 550}
525 551
526sub db_get($$) { 552sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 553 my $key = "$_[0]/$_[1]";
528 554
… …
1007sub object_freezer_save { 1033sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1034 my ($filename, $rdata, $objs) = @_;
1009 1035
1010 sync_job { 1036 sync_job {
1011 if (length $$rdata) { 1037 if (length $$rdata) {
1038 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1039 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1040 $decname, length $$rdata, scalar @$objs;
1014 1041
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1043 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1045 aio_fsync $fh if $cf::USE_FSYNC;
… …
1037 } 1064 }
1038 } else { 1065 } else {
1039 aio_unlink $filename; 1066 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1067 aio_unlink "$filename.pst";
1041 } 1068 }
1042 } 1069 };
1043} 1070}
1044 1071
1045sub object_freezer_as_string { 1072sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1073 my ($rdata, $objs) = @_;
1047 1074
… …
1059 or return; 1086 or return;
1060 1087
1061 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1090 or return;
1091
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1092 $av = eval { (Storable::thaw $av)->{objs} };
1065 } 1093 }
1066 1094
1095 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1096 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1097 $decname, length $data, scalar @{$av || []};
1098
1069 return ($data, $av); 1099 ($data, $av)
1070} 1100}
1071 1101
1072=head2 COMMAND CALLBACKS 1102=head2 COMMAND CALLBACKS
1073 1103
1074=over 4 1104=over 4
… …
1260 1290
1261=head3 cf::player 1291=head3 cf::player
1262 1292
1263=over 4 1293=over 4
1264 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
1265=item cf::player::find $login 1309=item cf::player::find $login
1266 1310
1267Returns the given player object, loading it if necessary (might block). 1311Returns the given player object, loading it if necessary (might block).
1268 1312
1269=cut 1313=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1348 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1349 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1350 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1351 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1352
1309 my $pl = load_pl path $login 1353 my $f = new_from_file cf::object::thawer path $login
1310 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;
1311 $cf::PLAYER{$login} = $pl 1360 $cf::PLAYER{$login} = $pl
1312 } 1361 }
1313 } 1362 }
1314} 1363}
1315 1364
… …
1413 or return []; 1462 or return [];
1414 1463
1415 my @logins; 1464 my @logins;
1416 1465
1417 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") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1472 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1473 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 }
1421 1475
1422 utf8::decode $login; 1476 utf8::decode $login;
1423 push @logins, $login; 1477 push @logins, $login;
1424 } 1478 }
1425 1479
… …
1463sub expand_cfpod { 1517sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1518 ((my $self), (local $_)) = @_;
1465 1519
1466 # escape & and < 1520 # escape & and <
1467 s/&/&amp;/g; 1521 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1522 s/(?<![BIUGHT])</&lt;/g;
1469 1523
1470 # 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
1471 1525
1472 1 while 1526 1 while
1473 # replace B<>, I<>, U<> etc. 1527 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1528 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1532 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1533 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1534 $self->gender ? $2 : $1
1480 }ge 1535 }ge
1481 # replace H<hint text> 1536 # replace H<hint text>
… …
1749 1804
1750sub load_header_from($) { 1805sub load_header_from($) {
1751 my ($self, $path) = @_; 1806 my ($self, $path) = @_;
1752 1807
1753 utf8::encode $path; 1808 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1809 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1817
1760 $self->{load_path} = $path; 1818 $self->{load_path} = $path;
1761 1819
1762 1 1820 1
1763} 1821}
… …
1817sub find { 1875sub find {
1818 my ($path, $origin) = @_; 1876 my ($path, $origin) = @_;
1819 1877
1820 $path = normalise $path, $origin && $origin->path; 1878 $path = normalise $path, $origin && $origin->path;
1821 1879
1880 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1881 cf::lock_wait "map_find:$path";
1823 1882
1824 $cf::MAP{$path} || do { 1883 $cf::MAP{$path} || do {
1825 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
1826 my $map = new_from_path cf::map $path 1887 my $map = new_from_path cf::map $path
1827 or return; 1888 or return;
1828 1889
1829 $map->{last_save} = $cf::RUNTIME; 1890 $map->{last_save} = $cf::RUNTIME;
1830 1891
… …
1832 or return; 1893 or return;
1833 1894
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1896 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1897 #$cf::WAIT_FOR_TICK->wait;
1898 undef $guard1;
1899 undef $guard2;
1837 $map->reset; 1900 $map->reset;
1838 undef $guard;
1839 return find $path; 1901 return find $path;
1840 } 1902 }
1841 1903
1842 $cf::MAP{$path} = $map 1904 $cf::MAP{$path} = $map
1843 } 1905 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1914 local $self->{deny_reset} = 1; # loading can take a long time
1853 1915
1854 my $path = $self->{path}; 1916 my $path = $self->{path};
1855 1917
1856 { 1918 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1919 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1920
1921 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1922 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1923
1862 $self->in_memory (cf::MAP_LOADING); 1924 $self->in_memory (cf::MAP_LOADING);
1863 1925
1864 $self->alloc; 1926 $self->alloc;
1865 1927
1866 $self->pre_load; 1928 $self->pre_load;
1867 cf::cede_to_tick; 1929 cf::cede_to_tick;
1868 1930
1931 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1933 $self->_load_objects ($f)
1870 or return; 1934 or return;
1871 1935
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1937 if delete $self->{load_original};
1874 1938
1875 if (my $uniq = $self->uniq_path) { 1939 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1940 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1941 unless (aio_stat $uniq) {
1942 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1943 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1944 $self->_load_objects ($f);
1945 $f->resolve_delayed_derefs;
1946 }
1880 } 1947 }
1881 } 1948 }
1949
1950 $f->resolve_delayed_derefs;
1882 1951
1883 cf::cede_to_tick; 1952 cf::cede_to_tick;
1884 # now do the right thing for maps 1953 # now do the right thing for maps
1885 $self->link_multipart_objects; 1954 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1955 $self->difficulty ($self->estimate_difficulty)
… …
1972 } 2041 }
1973 2042
1974 $MAP_PREFETCH{$path} |= $load; 2043 $MAP_PREFETCH{$path} |= $load;
1975 2044
1976 $MAP_PREFETCHER ||= cf::async { 2045 $MAP_PREFETCHER ||= cf::async {
2046 $Coro::current->{desc} = "map prefetcher";
2047
1977 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1978 while (my ($k, $v) = each %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $k) { 2050 if (my $map = find $k) {
1980 $map->load if $v; 2051 $map->load if $v;
1981 } 2052 }
… …
2007 return if $self->{deny_save}; 2078 return if $self->{deny_save};
2008 2079
2009 local $self->{last_access} = $self->last_access;#d# 2080 local $self->{last_access} = $self->last_access;#d#
2010 2081
2011 cf::async { 2082 cf::async {
2083 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2084 $_->contr->save for $self->players;
2013 }; 2085 };
2014 2086
2015 if ($uniq) { 2087 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2030 2102
2031 return if $self->players; 2103 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2104 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2105 return if $self->{deny_save};
2034 2106
2107 $self->in_memory (cf::MAP_SWAPPED);
2108
2109 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2111 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2112}
2038 2113
2039sub reset_at { 2114sub reset_at {
2040 my ($self) = @_; 2115 my ($self) = @_;
2041 2116
… …
2073 if $uniq; 2148 if $uniq;
2074 } 2149 }
2075 2150
2076 delete $cf::MAP{$self->path}; 2151 delete $cf::MAP{$self->path};
2077 2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2155 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2156
2082 $self->unlink_save; 2157 $self->unlink_save;
2083 $self->destroy; 2158 $self->destroy;
2084} 2159}
2085 2160
… …
2186 2261
2187sub inv_recursive { 2262sub inv_recursive {
2188 inv_recursive_ inv $_[0] 2263 inv_recursive_ inv $_[0]
2189} 2264}
2190 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
2191package cf; 2294package cf;
2192 2295
2193=back 2296=back
2194 2297
2195=head3 cf::object::player 2298=head3 cf::object::player
… …
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2456 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2457
2355 $self->enter_link; 2458 $self->enter_link;
2356 2459
2357 (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
2358 my $map = eval { 2482 my $map = eval {
2359 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2360 2484
2361 if ($map) { 2485 if ($map) {
2362 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2364 } else { 2488 } else {
2365 $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);
2366 } 2490 }
2367 2491
2368 $map 2492 $map
2369 }; 2493 };
2370 2494
… …
2460 # if exit is damned, update players death & WoR home-position 2584 # if exit is damned, update players death & WoR home-position
2461 $self->contr->savebed ($slaying, $hp, $sp) 2585 $self->contr->savebed ($slaying, $hp, $sp)
2462 if $exit->flag (FLAG_DAMNED); 2586 if $exit->flag (FLAG_DAMNED);
2463 2587
2464 (async { 2588 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2590
2465 $self->deactivate_recursive; # just to be sure 2591 $self->deactivate_recursive; # just to be sure
2466 unless (eval { 2592 unless (eval {
2467 $self->goto ($slaying, $hp, $sp); 2593 $self->goto ($slaying, $hp, $sp);
2468 2594
2469 1; 2595 1;
… …
2506 2632
2507=cut 2633=cut
2508 2634
2509our %CHANNEL = ( 2635our %CHANNEL = (
2510 "c/identify" => { 2636 "c/identify" => {
2511 id => "identify", 2637 id => "infobox",
2512 title => "Identify", 2638 title => "Identify",
2513 reply => undef, 2639 reply => undef,
2514 tooltip => "Items recently identified", 2640 tooltip => "Items recently identified",
2515 }, 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 },
2516); 2654);
2517 2655
2518sub cf::client::send_msg { 2656sub cf::client::send_msg {
2519 my ($self, $channel, $msg, $color, @extra) = @_; 2657 my ($self, $channel, $msg, $color, @extra) = @_;
2520 2658
2521 $msg = $self->pl->expand_cfpod ($msg); 2659 $msg = $self->pl->expand_cfpod ($msg);
2522 2660
2523 $color &= cf::NDI_CLIENT_MASK; # just in case... 2661 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524 2662
2525 # check predefined channels, for the benefit of C 2663 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2664 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel};
2527 2666
2667 $self->ext_msg (channel_info => $channel)
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id};
2671
2528 if (ref $channel) { 2672 } elsif (ref $channel) {
2529 # send meta info to client, if not yet sent 2673 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) { 2674 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel; 2675 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel); 2676 $self->ext_msg (channel_info => $channel)
2677 if $self->can_msg;
2533 } 2678 }
2534 2679
2535 $channel = $channel->{id}; 2680 $channel = $channel->{id};
2536 } 2681 }
2537 2682
… …
3051sub main { 3196sub main {
3052 # we must not ever block the main coroutine 3197 # we must not ever block the main coroutine
3053 local $Coro::idle = sub { 3198 local $Coro::idle = sub {
3054 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#
3055 (async { 3200 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER";
3056 Event::one_event; 3202 Event::one_event;
3057 })->prio (Coro::PRIO_MAX); 3203 })->prio (Coro::PRIO_MAX);
3058 }; 3204 };
3059 3205
3060 reload_config; 3206 reload_config;
… …
3304register_command "reload" => sub { 3450register_command "reload" => sub {
3305 my ($who, $arg) = @_; 3451 my ($who, $arg) = @_;
3306 3452
3307 if ($who->flag (FLAG_WIZ)) { 3453 if ($who->flag (FLAG_WIZ)) {
3308 $who->message ("reloading server."); 3454 $who->message ("reloading server.");
3455 async {
3456 $Coro::current->{desc} = "perl_reload";
3309 async { reload_perl }; 3457 reload_perl;
3458 };
3310 } 3459 }
3311}; 3460};
3312 3461
3313unshift @INC, $LIBDIR; 3462unshift @INC, $LIBDIR;
3314 3463
… …
3333 my $signal = new Coro::Signal; 3482 my $signal = new Coro::Signal;
3334 push @WAIT_FOR_TICK_BEGIN, $signal; 3483 push @WAIT_FOR_TICK_BEGIN, $signal;
3335 $signal->wait; 3484 $signal->wait;
3336} 3485}
3337 3486
3338 my $min = 1e6;#d#
3339 my $avg = 10;
3340$TICK_WATCHER = Event->timer ( 3487$TICK_WATCHER = Event->timer (
3341 reentrant => 0, 3488 reentrant => 0,
3342 parked => 1, 3489 parked => 1,
3343 prio => 0, 3490 prio => 0,
3344 at => $NEXT_TICK || $TICK, 3491 at => $NEXT_TICK || $TICK,
… …
3352 3499
3353 $NOW = $tick_start = Event::time; 3500 $NOW = $tick_start = Event::time;
3354 3501
3355 cf::server_tick; # one server iteration 3502 cf::server_tick; # one server iteration
3356 3503
3357 0 && sync_job {#d#
3358 for(1..10) {
3359 my $t = Event::time;
3360 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3361 or die;
3362
3363 $map->width (50);
3364 $map->height (50);
3365 $map->alloc;
3366 $map->_load_objects ("/tmp/x.map", 1);
3367 my $t = Event::time - $t;
3368
3369 #next unless $t < 0.0013;#d#
3370 if ($t < $min) {
3371 $min = $t;
3372 }
3373 $avg = $avg * 0.99 + $t * 0.01;
3374 }
3375 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3376 exit 0;
3377 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3378 };
3379
3380 $RUNTIME += $TICK; 3504 $RUNTIME += $TICK;
3381 $NEXT_TICK += $TICK; 3505 $NEXT_TICK += $TICK;
3382 3506
3383 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3507 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3384 $NEXT_RUNTIME_WRITE = $NOW + 10; 3508 $NEXT_RUNTIME_WRITE = $NOW + 10;
3385 Coro::async_pool { 3509 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver";
3386 write_runtime 3511 write_runtime
3387 or warn "ERROR: unable to write runtime file: $!"; 3512 or warn "ERROR: unable to write runtime file: $!";
3388 }; 3513 };
3389 } 3514 }
3390 3515
3391# my $AFTER = Event::time;
3392# warn $AFTER - $NOW;#d#
3393
3394 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3395 $sig->send; 3517 $sig->send;
3396 } 3518 }
3397 while (my $sig = shift @WAIT_FOR_TICK) { 3519 while (my $sig = shift @WAIT_FOR_TICK) {
3398 $sig->send; 3520 $sig->send;
… …
3408 3530
3409 $LOAD = ($NOW - $tick_start) / $TICK; 3531 $LOAD = ($NOW - $tick_start) / $TICK;
3410 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3411 3533
3412 _post_tick; 3534 _post_tick;
3413
3414
3415 }, 3535 },
3416); 3536);
3417 3537
3418{ 3538{
3539 BDB::min_parallel 8;
3419 BDB::max_poll_time $TICK * 0.1; 3540 BDB::max_poll_time $TICK * 0.1;
3420 $BDB_POLL_WATCHER = Event->io ( 3541 $BDB_POLL_WATCHER = Event->io (
3421 reentrant => 0, 3542 reentrant => 0,
3422 fd => BDB::poll_fileno, 3543 fd => BDB::poll_fileno,
3423 poll => 'r', 3544 poll => 'r',
3424 prio => 0, 3545 prio => 0,
3425 data => WF_AUTOCANCEL, 3546 data => WF_AUTOCANCEL,
3426 cb => \&BDB::poll_cb, 3547 cb => \&BDB::poll_cb,
3427 ); 3548 );
3428 BDB::min_parallel 8;
3429 3549
3430 BDB::set_sync_prepare { 3550 BDB::set_sync_prepare {
3431 my $status; 3551 my $status;
3432 my $current = $Coro::current; 3552 my $current = $Coro::current;
3433 ( 3553 (
… …
3442 ) 3562 )
3443 }; 3563 };
3444 3564
3445 unless ($DB_ENV) { 3565 unless ($DB_ENV) {
3446 $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);
3447 3571
3448 cf::sync_job { 3572 cf::sync_job {
3449 eval { 3573 eval {
3450 BDB::db_env_open 3574 BDB::db_env_open
3451 $DB_ENV, 3575 $DB_ENV,
… …
3453 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
3454 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3578 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3455 0666; 3579 0666;
3456 3580
3457 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3581 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3458
3459 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3460 $DB_ENV->set_lk_detect;
3461 }; 3582 };
3462 3583
3463 cf::cleanup "db_env_open(db): $@" if $@; 3584 cf::cleanup "db_env_open(db): $@" if $@;
3464 }; 3585 };
3465 } 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 );
3466} 3618}
3467 3619
3468{ 3620{
3469 IO::AIO::min_parallel 8; 3621 IO::AIO::min_parallel 8;
3470 3622
… …
3473 $AIO_POLL_WATCHER = Event->io ( 3625 $AIO_POLL_WATCHER = Event->io (
3474 reentrant => 0, 3626 reentrant => 0,
3475 data => WF_AUTOCANCEL, 3627 data => WF_AUTOCANCEL,
3476 fd => IO::AIO::poll_fileno, 3628 fd => IO::AIO::poll_fileno,
3477 poll => 'r', 3629 poll => 'r',
3478 prio => 6, 3630 prio => 0,
3479 cb => \&IO::AIO::poll_cb, 3631 cb => \&IO::AIO::poll_cb,
3480 ); 3632 );
3481} 3633}
3482 3634
3483my $_log_backtrace; 3635my $_log_backtrace;
… …
3489 3641
3490 # limit the # of concurrent backtraces 3642 # limit the # of concurrent backtraces
3491 if ($_log_backtrace < 2) { 3643 if ($_log_backtrace < 2) {
3492 ++$_log_backtrace; 3644 ++$_log_backtrace;
3493 async { 3645 async {
3646 $Coro::current->{desc} = "abt $msg";
3647
3494 my @bt = fork_call { 3648 my @bt = fork_call {
3495 @addr = map { sprintf "%x", $_ } @addr; 3649 @addr = map { sprintf "%x", $_ } @addr;
3496 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3650 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3497 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 |"
3498 or die "addr2line: $!"; 3652 or die "addr2line: $!";

Diff Legend

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