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.349 by root, Fri Aug 31 04:10:43 2007 UTC vs.
Revision 1.371 by root, Thu Sep 13 16:16:01 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
… …
1005); 1026);
1006 1027
1007sub object_freezer_save { 1028sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1029 my ($filename, $rdata, $objs) = @_;
1009 1030
1031 my $guard = cf::lock_acquire "io";
1032
1010 sync_job { 1033 sync_job {
1011 if (length $$rdata) { 1034 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1036 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1037 $decname, length $$rdata, scalar @$objs;
1014 1038
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1040 chmod SAVE_MODE, $fh;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1042 aio_fsync $fh if $cf::USE_FSYNC;
… …
1037 } 1061 }
1038 } else { 1062 } else {
1039 aio_unlink $filename; 1063 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1064 aio_unlink "$filename.pst";
1041 } 1065 }
1042 } 1066 };
1067
1068 undef $guard;
1043} 1069}
1044 1070
1045sub object_freezer_as_string { 1071sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1072 my ($rdata, $objs) = @_;
1047 1073
… …
1052 1078
1053sub object_thawer_load { 1079sub object_thawer_load {
1054 my ($filename) = @_; 1080 my ($filename) = @_;
1055 1081
1056 my ($data, $av); 1082 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1057 1085
1058 (aio_load $filename, $data) >= 0 1086 (aio_load $filename, $data) >= 0
1059 or return; 1087 or return;
1060 1088
1061 unless (aio_stat "$filename.pst") { 1089 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1090 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1091 or return;
1092
1093 undef $guard;
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1094 $av = eval { (Storable::thaw $av)->{objs} };
1065 } 1095 }
1066 1096
1097 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1098 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1099 $decname, length $data, scalar @{$av || []};
1100
1069 return ($data, $av); 1101 ($data, $av)
1070} 1102}
1071 1103
1072=head2 COMMAND CALLBACKS 1104=head2 COMMAND CALLBACKS
1073 1105
1074=over 4 1106=over 4
… …
1260 1292
1261=head3 cf::player 1293=head3 cf::player
1262 1294
1263=over 4 1295=over 4
1264 1296
1297=item cf::player::num_playing
1298
1299Returns the official number of playing players, as per the Crossfire metaserver rules.
1300
1301=cut
1302
1303sub num_playing {
1304 scalar grep
1305 $_->ob->map
1306 && !$_->hidden
1307 && !$_->ob->flag (cf::FLAG_WIZ),
1308 cf::player::list
1309}
1310
1265=item cf::player::find $login 1311=item cf::player::find $login
1266 1312
1267Returns the given player object, loading it if necessary (might block). 1313Returns the given player object, loading it if necessary (might block).
1268 1314
1269=cut 1315=cut
… …
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1350 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1351 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1352 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1353 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1354
1309 my $pl = load_pl path $login 1355 my $f = new_from_file cf::object::thawer path $login
1310 or return; 1356 or return;
1357
1358 $f->next;
1359 my $pl = cf::player::load_pl $f
1360 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs;
1311 $cf::PLAYER{$login} = $pl 1363 $cf::PLAYER{$login} = $pl
1312 } 1364 }
1313 } 1365 }
1314} 1366}
1315 1367
… …
1413 or return []; 1465 or return [];
1414 1466
1415 my @logins; 1467 my @logins;
1416 1468
1417 for my $login (@$dirs) { 1469 for my $login (@$dirs) {
1470 my $path = path $login;
1471
1472 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1475 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1476 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 }
1421 1478
1422 utf8::decode $login; 1479 utf8::decode $login;
1423 push @logins, $login; 1480 push @logins, $login;
1424 } 1481 }
1425 1482
… …
1463sub expand_cfpod { 1520sub expand_cfpod {
1464 ((my $self), (local $_)) = @_; 1521 ((my $self), (local $_)) = @_;
1465 1522
1466 # escape & and < 1523 # escape & and <
1467 s/&/&amp;/g; 1524 s/&/&amp;/g;
1468 s/(?<![BIUGH])</&lt;/g; 1525 s/(?<![BIUGHT])</&lt;/g;
1469 1526
1470 # this is buggy, it needs to properly take care of nested <'s 1527 # this is buggy, it needs to properly take care of nested <'s
1471 1528
1472 1 while 1529 1 while
1473 # replace B<>, I<>, U<> etc. 1530 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/ 1531 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/ 1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/ 1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1477 # replace G<male|female> tags 1535 # replace G<male|female> tags
1478 || s{G<([^>|]*)\|([^>]*)>}{ 1536 || s{G<([^>|]*)\|([^>]*)>}{
1479 $self->gender ? $2 : $1 1537 $self->gender ? $2 : $1
1480 }ge 1538 }ge
1481 # replace H<hint text> 1539 # replace H<hint text>
… …
1749 1807
1750sub load_header_from($) { 1808sub load_header_from($) {
1751 my ($self, $path) = @_; 1809 my ($self, $path) = @_;
1752 1810
1753 utf8::encode $path; 1811 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1812 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1813 or return;
1814
1815 $self->_load_header ($f)
1816 or return;
1817
1818 local $MAP_LOADING{$self->{path}} = $self;
1819 $f->resolve_delayed_derefs;
1759 1820
1760 $self->{load_path} = $path; 1821 $self->{load_path} = $path;
1761 1822
1762 1 1823 1
1763} 1824}
… …
1817sub find { 1878sub find {
1818 my ($path, $origin) = @_; 1879 my ($path, $origin) = @_;
1819 1880
1820 $path = normalise $path, $origin && $origin->path; 1881 $path = normalise $path, $origin && $origin->path;
1821 1882
1883 cf::lock_wait "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1884 cf::lock_wait "map_find:$path";
1823 1885
1824 $cf::MAP{$path} || do { 1886 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path"; 1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1826 my $map = new_from_path cf::map $path 1890 my $map = new_from_path cf::map $path
1827 or return; 1891 or return;
1828 1892
1829 $map->{last_save} = $cf::RUNTIME; 1893 $map->{last_save} = $cf::RUNTIME;
1830 1894
… …
1832 or return; 1896 or return;
1833 1897
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1899 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1900 #$cf::WAIT_FOR_TICK->wait;
1901 undef $guard1;
1902 undef $guard2;
1837 $map->reset; 1903 $map->reset;
1838 undef $guard;
1839 return find $path; 1904 return find $path;
1840 } 1905 }
1841 1906
1842 $cf::MAP{$path} = $map 1907 $cf::MAP{$path} = $map
1843 } 1908 }
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1917 local $self->{deny_reset} = 1; # loading can take a long time
1853 1918
1854 my $path = $self->{path}; 1919 my $path = $self->{path};
1855 1920
1856 { 1921 {
1857 my $guard1 = cf::lock_acquire "map_data:$path"; 1922 my $guard = cf::lock_acquire "map_data:$path";
1858 my $guard2 = cf::lock_acquire "map_load:$path";
1859 1923
1924 return unless $self->valid;
1860 return if $self->in_memory != cf::MAP_SWAPPED; 1925 return unless $self->in_memory == cf::MAP_SWAPPED;
1861 1926
1862 $self->in_memory (cf::MAP_LOADING); 1927 $self->in_memory (cf::MAP_LOADING);
1863 1928
1864 $self->alloc; 1929 $self->alloc;
1865 1930
1866 $self->pre_load; 1931 $self->pre_load;
1867 cf::cede_to_tick; 1932 cf::cede_to_tick;
1868 1933
1934 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block;
1869 $self->_load_objects ($self->{load_path}, 1) 1936 $self->_load_objects ($f)
1870 or return; 1937 or return;
1871 1938
1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1873 if delete $self->{load_original}; 1940 if delete $self->{load_original};
1874 1941
1875 if (my $uniq = $self->uniq_path) { 1942 if (my $uniq = $self->uniq_path) {
1876 utf8::encode $uniq; 1943 utf8::encode $uniq;
1877 if (aio_open $uniq, O_RDONLY, 0) { 1944 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) {
1878 $self->clear_unique_items; 1946 $self->clear_unique_items;
1879 $self->_load_objects ($uniq, 0); 1947 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs;
1949 }
1880 } 1950 }
1881 } 1951 }
1952
1953 $f->resolve_delayed_derefs;
1882 1954
1883 cf::cede_to_tick; 1955 cf::cede_to_tick;
1884 # now do the right thing for maps 1956 # now do the right thing for maps
1885 $self->link_multipart_objects; 1957 $self->link_multipart_objects;
1886 $self->difficulty ($self->estimate_difficulty) 1958 $self->difficulty ($self->estimate_difficulty)
… …
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
… …
2090 2165
2091 { 2166 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093 2168
2094 delete $cf::MAP{$self->path}; 2169 delete $cf::MAP{$self->path};
2170
2171 $self->unlink_save;
2095 2172
2096 bless $self, "cf::map"; 2173 bless $self, "cf::map";
2097 delete $self->{deny_reset}; 2174 delete $self->{deny_reset};
2098 $self->{deny_save} = 1; 2175 $self->{deny_save} = 1;
2099 $self->reset_timeout (1); 2176 $self->reset_timeout (1);
2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2101
2102 $self->unlink_save;
2103 2178
2104 $cf::MAP{$self->path} = $self; 2179 $cf::MAP{$self->path} = $self;
2105 } 2180 }
2106 2181
2107 $self->reset; # polite request, might not happen 2182 $self->reset; # polite request, might not happen
… …
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 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return;
2287 $pl->ob->uuid eq $uuid
2288 or return;
2289
2290 $pl->ob
2291 } else {
2292 warn "$ref: cannot resolve object reference\n";
2293 undef
2294 }
2295}
2296
2191package cf; 2297package cf;
2192 2298
2193=back 2299=back
2194 2300
2195=head3 cf::object::player 2301=head3 cf::object::player
… …
2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2354 2460
2355 $self->enter_link; 2461 $self->enter_link;
2356 2462
2357 (async { 2463 (async {
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
2358 my $map = eval { 2483 my $map = eval {
2359 my $map = cf::map::find $path; 2484 my $map = defined $path ? cf::map::find $path : undef;
2360 2485
2361 if ($map) { 2486 if ($map) {
2362 $map = $map->customise_for ($self); 2487 $map = $map->customise_for ($self);
2363 $map = $check->($map) if $check && $map; 2488 $map = $check->($map) if $check && $map;
2364 } else { 2489 } else {
2365 $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);
2366 } 2491 }
2367 2492
2368 $map 2493 $map
2369 }; 2494 };
2370 2495
… …
2504the message, with C<log> being the default. If C<$color> is negative, suppress 2629the message, with C<log> being the default. If C<$color> is negative, suppress
2505the message unless the client supports the msg packet. 2630the message unless the client supports the msg packet.
2506 2631
2507=cut 2632=cut
2508 2633
2634our %CHANNEL = (
2635 "c/identify" => {
2636 id => "identify",
2637 title => "Identify",
2638 reply => undef,
2639 tooltip => "Items recently identified",
2640 },
2641 "c/examine" => {
2642 id => "examine",
2643 title => "Examine",
2644 reply => undef,
2645 tooltip => "Signs and other items you examined",
2646 },
2647);
2648
2509sub cf::client::send_msg { 2649sub cf::client::send_msg {
2510 my ($self, $channel, $msg, $color, @extra) = @_; 2650 my ($self, $channel, $msg, $color, @extra) = @_;
2511 2651
2512 $msg = $self->pl->expand_cfpod ($msg); 2652 $msg = $self->pl->expand_cfpod ($msg);
2513 2653
2514 $color &= cf::NDI_CLIENT_MASK; # just in case... 2654 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655
2656 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2515 2658
2516 if (ref $channel) { 2659 if (ref $channel) {
2517 # send meta info to client, if not yet sent 2660 # send meta info to client, if not yet sent
2518 unless (exists $self->{channel}{$channel->{id}}) { 2661 unless (exists $self->{channel}{$channel->{id}}) {
2519 $self->{channel}{$channel->{id}} = $channel; 2662 $self->{channel}{$channel->{id}} = $channel;
2520 $self->ext_msg (channel_info => $channel); 2663 $self->ext_msg (channel_info => $channel)
2664 if $self->can_msg;
2521 } 2665 }
2522 2666
2523 $channel = $channel->{id}; 2667 $channel = $channel->{id};
2524 } 2668 }
2525 2669
… …
3321 my $signal = new Coro::Signal; 3465 my $signal = new Coro::Signal;
3322 push @WAIT_FOR_TICK_BEGIN, $signal; 3466 push @WAIT_FOR_TICK_BEGIN, $signal;
3323 $signal->wait; 3467 $signal->wait;
3324} 3468}
3325 3469
3326 my $min = 1e6;#d#
3327 my $avg = 10;
3328$TICK_WATCHER = Event->timer ( 3470$TICK_WATCHER = Event->timer (
3329 reentrant => 0, 3471 reentrant => 0,
3330 parked => 1, 3472 parked => 1,
3331 prio => 0, 3473 prio => 0,
3332 at => $NEXT_TICK || $TICK, 3474 at => $NEXT_TICK || $TICK,
… …
3340 3482
3341 $NOW = $tick_start = Event::time; 3483 $NOW = $tick_start = Event::time;
3342 3484
3343 cf::server_tick; # one server iteration 3485 cf::server_tick; # one server iteration
3344 3486
3345 0 && sync_job {#d#
3346 for(1..10) {
3347 my $t = Event::time;
3348 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3349 or die;
3350
3351 $map->width (50);
3352 $map->height (50);
3353 $map->alloc;
3354 $map->_load_objects ("/tmp/x.map", 1);
3355 my $t = Event::time - $t;
3356
3357 #next unless $t < 0.0013;#d#
3358 if ($t < $min) {
3359 $min = $t;
3360 }
3361 $avg = $avg * 0.99 + $t * 0.01;
3362 }
3363 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3364 exit 0;
3365 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3366 };
3367
3368 $RUNTIME += $TICK; 3487 $RUNTIME += $TICK;
3369 $NEXT_TICK += $TICK; 3488 $NEXT_TICK += $TICK;
3370 3489
3371 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3490 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3372 $NEXT_RUNTIME_WRITE = $NOW + 10; 3491 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
3374 write_runtime 3493 write_runtime
3375 or warn "ERROR: unable to write runtime file: $!"; 3494 or warn "ERROR: unable to write runtime file: $!";
3376 }; 3495 };
3377 } 3496 }
3378 3497
3379# my $AFTER = Event::time;
3380# warn $AFTER - $NOW;#d#
3381
3382 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3383 $sig->send; 3499 $sig->send;
3384 } 3500 }
3385 while (my $sig = shift @WAIT_FOR_TICK) { 3501 while (my $sig = shift @WAIT_FOR_TICK) {
3386 $sig->send; 3502 $sig->send;
… …
3396 3512
3397 $LOAD = ($NOW - $tick_start) / $TICK; 3513 $LOAD = ($NOW - $tick_start) / $TICK;
3398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3399 3515
3400 _post_tick; 3516 _post_tick;
3401
3402
3403 }, 3517 },
3404); 3518);
3405 3519
3406{ 3520{
3521 BDB::min_parallel 8;
3407 BDB::max_poll_time $TICK * 0.1; 3522 BDB::max_poll_time $TICK * 0.1;
3408 $BDB_POLL_WATCHER = Event->io ( 3523 $BDB_POLL_WATCHER = Event->io (
3409 reentrant => 0, 3524 reentrant => 0,
3410 fd => BDB::poll_fileno, 3525 fd => BDB::poll_fileno,
3411 poll => 'r', 3526 poll => 'r',
3412 prio => 0, 3527 prio => 0,
3413 data => WF_AUTOCANCEL, 3528 data => WF_AUTOCANCEL,
3414 cb => \&BDB::poll_cb, 3529 cb => \&BDB::poll_cb,
3415 ); 3530 );
3416 BDB::min_parallel 8;
3417 3531
3418 BDB::set_sync_prepare { 3532 BDB::set_sync_prepare {
3419 my $status; 3533 my $status;
3420 my $current = $Coro::current; 3534 my $current = $Coro::current;
3421 ( 3535 (
… …
3430 ) 3544 )
3431 }; 3545 };
3432 3546
3433 unless ($DB_ENV) { 3547 unless ($DB_ENV) {
3434 $DB_ENV = BDB::db_env_create; 3548 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3550 | BDB::LOG_AUTOREMOVE, 1);
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3435 3553
3436 cf::sync_job { 3554 cf::sync_job {
3437 eval { 3555 eval {
3438 BDB::db_env_open 3556 BDB::db_env_open
3439 $DB_ENV, 3557 $DB_ENV,
… …
3441 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3442 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3443 0666; 3561 0666;
3444 3562
3445 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3446
3447 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3448 $DB_ENV->set_lk_detect;
3449 }; 3564 };
3450 3565
3451 cf::cleanup "db_env_open(db): $@" if $@; 3566 cf::cleanup "db_env_open(db): $@" if $@;
3452 }; 3567 };
3453 } 3568 }
3569
3570 $BDB_DEADLOCK_WATCHER = Event->timer (
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 );
3580 $BDB_CHECKPOINT_WATCHER = Event->timer (
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 );
3590 $BDB_TRICKLE_WATCHER = Event->timer (
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 );
3454} 3600}
3455 3601
3456{ 3602{
3457 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3458 3604

Diff Legend

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