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.348 by root, Thu Aug 30 08:34:40 2007 UTC vs.
Revision 1.373 by root, Sat Sep 15 15:58:06 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
… …
481sub fork_call(&@) { 491sub fork_call(&@) {
482 my ($cb, @args) = @_; 492 my ($cb, @args) = @_;
483 493
484 # we seemingly have to make a local copy of the whole thing, 494 # we seemingly have to make a local copy of the whole thing,
485 # otherwise perl prematurely frees the stuff :/ 495 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 496 # TODO: investigate and fix (likely this will be rather laborious)
487 497
488 my @res = Coro::Util::fork_eval { 498 my @res = Coro::Util::fork_eval {
489 reset_signals; 499 reset_signals;
490 &$cb 500 &$cb
491 }, @args; 501 }, @args;
… …
500=item cf::db_put $family => $key => $value 510=item cf::db_put $family => $key => $value
501 511
502Stores the given C<$value> in the family. It can currently store binary 512Stores 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). 513data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504 514
515=item $db = cf::db_table "name"
516
517Create and/or open a new database table. The string must not be "db" and must be unique
518within each server.
519
505=cut 520=cut
521
522sub db_table($) {
523 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV;
525
526 eval {
527 $db->set_flags (BDB::CHKSUM);
528
529 utf8::encode $name;
530 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
531 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
532 cf::cleanup "db_open(db): $!" if $!;
533 };
534 cf::cleanup "db_open(db): $@" if $@;
535
536 $db
537}
506 538
507our $DB; 539our $DB;
508 540
509sub db_init { 541sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 542 cf::sync_job {
514 eval { 543 $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 } 544 };
524} 545}
525 546
526sub db_get($$) { 547sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 548 my $key = "$_[0]/$_[1]";
528 549
… …
1007sub object_freezer_save { 1028sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1009 1030
1010 sync_job { 1031 sync_job {
1011 if (length $$rdata) { 1032 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1034 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1035 $decname, length $$rdata, scalar @$objs;
1014 1036
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1038 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1040 aio_fsync $fh if $cf::USE_FSYNC;
… …
1037 } 1059 }
1038 } else { 1060 } else {
1039 aio_unlink $filename; 1061 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1062 aio_unlink "$filename.pst";
1041 } 1063 }
1042 } 1064 };
1043} 1065}
1044 1066
1045sub object_freezer_as_string { 1067sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1068 my ($rdata, $objs) = @_;
1047 1069
… …
1059 or return; 1081 or return;
1060 1082
1061 unless (aio_stat "$filename.pst") { 1083 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1084 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1085 or return;
1086
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1087 $av = eval { (Storable::thaw $av)->{objs} };
1065 } 1088 }
1066 1089
1090 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1091 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1092 $decname, length $data, scalar @{$av || []};
1093
1069 return ($data, $av); 1094 ($data, $av)
1070} 1095}
1071 1096
1072=head2 COMMAND CALLBACKS 1097=head2 COMMAND CALLBACKS
1073 1098
1074=over 4 1099=over 4
… …
1260 1285
1261=head3 cf::player 1286=head3 cf::player
1262 1287
1263=over 4 1288=over 4
1264 1289
1290=item cf::player::num_playing
1291
1292Returns the official number of playing players, as per the Crossfire metaserver rules.
1293
1294=cut
1295
1296sub num_playing {
1297 scalar grep
1298 $_->ob->map
1299 && !$_->hidden
1300 && !$_->ob->flag (cf::FLAG_WIZ),
1301 cf::player::list
1302}
1303
1265=item cf::player::find $login 1304=item cf::player::find $login
1266 1305
1267Returns the given player object, loading it if necessary (might block). 1306Returns the given player object, loading it if necessary (might block).
1268 1307
1269=cut 1308=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1343 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1344 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1345 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1346 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1347
1309 my $pl = load_pl path $login 1348 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1349 or return;
1350
1351 my $pl = cf::player::load_pl $f
1352 or return;
1353 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1355 $cf::PLAYER{$login} = $pl
1312 } 1356 }
1313 } 1357 }
1314} 1358}
1315 1359
… …
1413 or return []; 1457 or return [];
1414 1458
1415 my @logins; 1459 my @logins;
1416 1460
1417 for my $login (@$dirs) { 1461 for my $login (@$dirs) {
1462 my $path = path $login;
1463
1464 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1467 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1468 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 }
1421 1470
1422 utf8::decode $login; 1471 utf8::decode $login;
1423 push @logins, $login; 1472 push @logins, $login;
1424 } 1473 }
1425 1474
… …
1463sub expand_cfpod { 1512sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1513 ((my $self), (local $_)) = @_;
1465 1514
1466 # escape & and < 1515 # escape & and <
1467 s/&/&amp;/g; 1516 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1517 s/(?<![BIUGHT])</&lt;/g;
1469 1518
1470 # this is buggy, it needs to properly take care of nested <'s 1519 # this is buggy, it needs to properly take care of nested <'s
1471 1520
1472 1 while 1521 1 while
1473 # replace B<>, I<>, U<> etc. 1522 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1523 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1527 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1528 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1529 $self->gender ? $2 : $1
1480 }ge 1530 }ge
1481 # replace H<hint text> 1531 # replace H<hint text>
… …
1749 1799
1750sub load_header_from($) { 1800sub load_header_from($) {
1751 my ($self, $path) = @_; 1801 my ($self, $path) = @_;
1752 1802
1753 utf8::encode $path; 1803 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1804 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1805 or return;
1806
1807 $self->_load_header ($f)
1808 or return;
1809
1810 local $MAP_LOADING{$self->{path}} = $self;
1811 $f->resolve_delayed_derefs;
1759 1812
1760 $self->{load_path} = $path; 1813 $self->{load_path} = $path;
1761 1814
1762 1 1815 1
1763} 1816}
… …
1817sub find { 1870sub find {
1818 my ($path, $origin) = @_; 1871 my ($path, $origin) = @_;
1819 1872
1820 $path = normalise $path, $origin && $origin->path; 1873 $path = normalise $path, $origin && $origin->path;
1821 1874
1875 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1876 cf::lock_wait "map_find:$path";
1823 1877
1824 $cf::MAP{$path} || do { 1878 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1826 my $map = new_from_path cf::map $path 1882 my $map = new_from_path cf::map $path
1827 or return; 1883 or return;
1828 1884
1829 $map->{last_save} = $cf::RUNTIME; 1885 $map->{last_save} = $cf::RUNTIME;
1830 1886
… …
1832 or return; 1888 or return;
1833 1889
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1891 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1892 #$cf::WAIT_FOR_TICK->wait;
1893 undef $guard1;
1894 undef $guard2;
1837 $map->reset; 1895 $map->reset;
1838 undef $guard;
1839 return find $path; 1896 return find $path;
1840 } 1897 }
1841 1898
1842 $cf::MAP{$path} = $map 1899 $cf::MAP{$path} = $map
1843 } 1900 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1909 local $self->{deny_reset} = 1; # loading can take a long time
1853 1910
1854 my $path = $self->{path}; 1911 my $path = $self->{path};
1855 1912
1856 { 1913 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1914 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1915
1916 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1917 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1918
1862 $self->in_memory (cf::MAP_LOADING); 1919 $self->in_memory (cf::MAP_LOADING);
1863 1920
1864 $self->alloc; 1921 $self->alloc;
1865 1922
1866 $self->pre_load; 1923 $self->pre_load;
1867 cf::cede_to_tick; 1924 cf::cede_to_tick;
1868 1925
1926 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1928 $self->_load_objects ($f)
1870 or return; 1929 or return;
1871 1930
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1932 if delete $self->{load_original};
1874 1933
1875 if (my $uniq = $self->uniq_path) { 1934 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1935 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1936 unless (aio_stat $uniq) {
1937 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1938 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1939 $self->_load_objects ($f);
1940 $f->resolve_delayed_derefs;
1941 }
1880 } 1942 }
1881 } 1943 }
1944
1945 $f->resolve_delayed_derefs;
1882 1946
1883 cf::cede_to_tick; 1947 cf::cede_to_tick;
1884 # now do the right thing for maps 1948 # now do the right thing for maps
1885 $self->link_multipart_objects; 1949 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1950 $self->difficulty ($self->estimate_difficulty)
… …
2030 2094
2031 return if $self->players; 2095 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2097 return if $self->{deny_save};
2034 2098
2099 $self->in_memory (cf::MAP_SWAPPED);
2100
2101 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP;
2035 $self->clear; 2103 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2104}
2038 2105
2039sub reset_at { 2106sub reset_at {
2040 my ($self) = @_; 2107 my ($self) = @_;
2041 2108
… …
2073 if $uniq; 2140 if $uniq;
2074 } 2141 }
2075 2142
2076 delete $cf::MAP{$self->path}; 2143 delete $cf::MAP{$self->path};
2077 2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2147 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2148
2082 $self->unlink_save; 2149 $self->unlink_save;
2083 $self->destroy; 2150 $self->destroy;
2084} 2151}
2085 2152
2086my $nuke_counter = "aaaa"; 2153my $nuke_counter = "aaaa";
2087 2154
2088sub nuke { 2155sub nuke {
2089 my ($self) = @_; 2156 my ($self) = @_;
2090 2157
2158 {
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160
2091 delete $cf::MAP{$self->path}; 2161 delete $cf::MAP{$self->path};
2092 2162
2093 $self->unlink_save; 2163 $self->unlink_save;
2094 2164
2095 bless $self, "cf::map"; 2165 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2166 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2167 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2168 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2170
2101 $cf::MAP{$self->path} = $self; 2171 $cf::MAP{$self->path} = $self;
2172 }
2102 2173
2103 $self->reset; # polite request, might not happen 2174 $self->reset; # polite request, might not happen
2104} 2175}
2105 2176
2106=item $maps = cf::map::tmp_maps 2177=item $maps = cf::map::tmp_maps
… …
2182 2253
2183sub inv_recursive { 2254sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2255 inv_recursive_ inv $_[0]
2185} 2256}
2186 2257
2258=item $ref = $ob->ref
2259
2260creates and returns a persistent reference to an objetc that can be stored as a string.
2261
2262=item $ob = cf::object::deref ($refstring)
2263
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block.
2266
2267=cut
2268
2269sub deref {
2270 my ($ref) = @_;
2271
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return;
2279 $pl->ob->uuid eq $uuid
2280 or return;
2281
2282 $pl->ob
2283 } else {
2284 warn "$ref: cannot resolve object reference\n";
2285 undef
2286 }
2287}
2288
2187package cf; 2289package cf;
2188 2290
2189=back 2291=back
2190 2292
2191=head3 cf::object::player 2293=head3 cf::object::player
… …
2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2350 2452
2351 $self->enter_link; 2453 $self->enter_link;
2352 2454
2353 (async { 2455 (async {
2456 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs];
2460
2461 # see if we actually can go there
2462 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2463 $ob = $obs[rand @obs];
2464 } else {
2465 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2466 }
2467 # else put us there anyways for now #d#
2468
2469 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2470 } else {
2471 ($path, $x, $y) = (undef, undef, undef);
2472 }
2473 }
2474
2354 my $map = eval { 2475 my $map = eval {
2355 my $map = cf::map::find $path; 2476 my $map = defined $path ? cf::map::find $path : undef;
2356 2477
2357 if ($map) { 2478 if ($map) {
2358 $map = $map->customise_for ($self); 2479 $map = $map->customise_for ($self);
2359 $map = $check->($map) if $check && $map; 2480 $map = $check->($map) if $check && $map;
2360 } else { 2481 } else {
2361 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2362 } 2483 }
2363 2484
2364 $map 2485 $map
2365 }; 2486 };
2366 2487
… …
2500the message, with C<log> being the default. If C<$color> is negative, suppress 2621the message, with C<log> being the default. If C<$color> is negative, suppress
2501the message unless the client supports the msg packet. 2622the message unless the client supports the msg packet.
2502 2623
2503=cut 2624=cut
2504 2625
2626our %CHANNEL = (
2627 "c/identify" => {
2628 id => "identify",
2629 title => "Identify",
2630 reply => undef,
2631 tooltip => "Items recently identified",
2632 },
2633 "c/examine" => {
2634 id => "examine",
2635 title => "Examine",
2636 reply => undef,
2637 tooltip => "Signs and other items you examined",
2638 },
2639);
2640
2505sub cf::client::send_msg { 2641sub cf::client::send_msg {
2506 my ($self, $channel, $msg, $color, @extra) = @_; 2642 my ($self, $channel, $msg, $color, @extra) = @_;
2507 2643
2508 $msg = $self->pl->expand_cfpod ($msg); 2644 $msg = $self->pl->expand_cfpod ($msg);
2509 2645
2510 $color &= cf::NDI_CLIENT_MASK; # just in case... 2646 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647
2648 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2511 2650
2512 if (ref $channel) { 2651 if (ref $channel) {
2513 # send meta info to client, if not yet sent 2652 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) { 2653 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel; 2654 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel); 2655 $self->ext_msg (channel_info => $channel)
2656 if $self->can_msg;
2517 } 2657 }
2518 2658
2519 $channel = $channel->{id}; 2659 $channel = $channel->{id};
2520 } 2660 }
2521 2661
… …
3317 my $signal = new Coro::Signal; 3457 my $signal = new Coro::Signal;
3318 push @WAIT_FOR_TICK_BEGIN, $signal; 3458 push @WAIT_FOR_TICK_BEGIN, $signal;
3319 $signal->wait; 3459 $signal->wait;
3320} 3460}
3321 3461
3322 my $min = 1e6;#d#
3323 my $avg = 10;
3324$TICK_WATCHER = Event->timer ( 3462$TICK_WATCHER = Event->timer (
3325 reentrant => 0, 3463 reentrant => 0,
3326 parked => 1, 3464 parked => 1,
3327 prio => 0, 3465 prio => 0,
3328 at => $NEXT_TICK || $TICK, 3466 at => $NEXT_TICK || $TICK,
… …
3336 3474
3337 $NOW = $tick_start = Event::time; 3475 $NOW = $tick_start = Event::time;
3338 3476
3339 cf::server_tick; # one server iteration 3477 cf::server_tick; # one server iteration
3340 3478
3341 0 && sync_job {#d#
3342 for(1..10) {
3343 my $t = Event::time;
3344 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3345 or die;
3346
3347 $map->width (50);
3348 $map->height (50);
3349 $map->alloc;
3350 $map->_load_objects ("/tmp/x.map", 1);
3351 my $t = Event::time - $t;
3352
3353 #next unless $t < 0.0013;#d#
3354 if ($t < $min) {
3355 $min = $t;
3356 }
3357 $avg = $avg * 0.99 + $t * 0.01;
3358 }
3359 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3360 exit 0;
3361 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3362 };
3363
3364 $RUNTIME += $TICK; 3479 $RUNTIME += $TICK;
3365 $NEXT_TICK += $TICK; 3480 $NEXT_TICK += $TICK;
3366 3481
3367 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3482 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3368 $NEXT_RUNTIME_WRITE = $NOW + 10; 3483 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3370 write_runtime 3485 write_runtime
3371 or warn "ERROR: unable to write runtime file: $!"; 3486 or warn "ERROR: unable to write runtime file: $!";
3372 }; 3487 };
3373 } 3488 }
3374 3489
3375# my $AFTER = Event::time;
3376# warn $AFTER - $NOW;#d#
3377
3378 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3379 $sig->send; 3491 $sig->send;
3380 } 3492 }
3381 while (my $sig = shift @WAIT_FOR_TICK) { 3493 while (my $sig = shift @WAIT_FOR_TICK) {
3382 $sig->send; 3494 $sig->send;
… …
3392 3504
3393 $LOAD = ($NOW - $tick_start) / $TICK; 3505 $LOAD = ($NOW - $tick_start) / $TICK;
3394 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3395 3507
3396 _post_tick; 3508 _post_tick;
3397
3398
3399 }, 3509 },
3400); 3510);
3401 3511
3402{ 3512{
3513 BDB::min_parallel 8;
3403 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3404 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3405 reentrant => 0, 3516 reentrant => 0,
3406 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3407 poll => 'r', 3518 poll => 'r',
3408 prio => 0, 3519 prio => 0,
3409 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3410 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3411 ); 3522 );
3412 BDB::min_parallel 8;
3413 3523
3414 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3415 my $status; 3525 my $status;
3416 my $current = $Coro::current; 3526 my $current = $Coro::current;
3417 ( 3527 (
… …
3426 ) 3536 )
3427 }; 3537 };
3428 3538
3429 unless ($DB_ENV) { 3539 unless ($DB_ENV) {
3430 $DB_ENV = BDB::db_env_create; 3540 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3542 | BDB::LOG_AUTOREMOVE, 1);
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3431 3545
3432 cf::sync_job { 3546 cf::sync_job {
3433 eval { 3547 eval {
3434 BDB::db_env_open 3548 BDB::db_env_open
3435 $DB_ENV, 3549 $DB_ENV,
… …
3437 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3551 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3438 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3552 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3439 0666; 3553 0666;
3440 3554
3441 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3555 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3442
3443 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3444 $DB_ENV->set_lk_detect;
3445 }; 3556 };
3446 3557
3447 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3448 }; 3559 };
3449 } 3560 }
3561
3562 $BDB_DEADLOCK_WATCHER = Event->timer (
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 );
3572 $BDB_CHECKPOINT_WATCHER = Event->timer (
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 );
3582 $BDB_TRICKLE_WATCHER = Event->timer (
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 );
3450} 3592}
3451 3593
3452{ 3594{
3453 IO::AIO::min_parallel 8; 3595 IO::AIO::min_parallel 8;
3454 3596

Diff Legend

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