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.346 by root, Tue Aug 28 19:38:40 2007 UTC vs.
Revision 1.363 by root, Mon Sep 10 17:24:36 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_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 87our $DB_ENV;
86 88
87our %CFG; 89our %CFG;
88 90
89our $UPTIME; $UPTIME ||= time; 91our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 92our $RUNTIME;
91 93
92our %PLAYER; # all users 94our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 95our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 96our $LINK_MAP; # the special {link} map, which is always available
95 97
96# used to convert map paths into valid unix filenames by replacing / by ∕ 98# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 100
… …
187 $msg .= "\n" 189 $msg .= "\n"
188 unless $msg =~ /\n$/; 190 unless $msg =~ /\n$/;
189 191
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 193
192 utf8::encode $msg;
193 LOG llevError, $msg; 194 LOG llevError, $msg;
194 }; 195 };
195} 196}
196 197
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 273Wait 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, 274a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 275for example when the coroutine gets canceled), the lock is automatically
275returned. 276returned.
276 277
278Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro.
280
277Lock names should begin with a unique identifier (for example, cf::map::find 281Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 282uses map_find and cf::map::load uses map_load).
279 283
280=item $locked = cf::lock_active $string 284=item $locked = cf::lock_active $string
281 285
282Return true if the lock is currently active, i.e. somebody has locked it. 286Return true if the lock is currently active, i.e. somebody has locked it.
283 287
284=cut 288=cut
285 289
286our %LOCK; 290our %LOCK;
291our %LOCKER;#d#
287 292
288sub lock_wait($) { 293sub lock_wait($) {
289 my ($key) = @_; 294 my ($key) = @_;
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
290 300
291 # wait for lock, if any 301 # wait for lock, if any
292 while ($LOCK{$key}) { 302 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 303 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 304 Coro::schedule;
… …
300 310
301 # wait, to be sure we are not locked 311 # wait, to be sure we are not locked
302 lock_wait $key; 312 lock_wait $key;
303 313
304 $LOCK{$key} = []; 314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
305 316
306 Coro::guard { 317 Coro::guard {
318 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 319 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 320 $_->ready for @{ delete $LOCK{$key} };
309 } 321 }
310} 322}
311 323
… …
478sub fork_call(&@) { 490sub fork_call(&@) {
479 my ($cb, @args) = @_; 491 my ($cb, @args) = @_;
480 492
481 # we seemingly have to make a local copy of the whole thing, 493 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 494 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 495 # TODO: investigate and fix (likely this will be rather laborious)
484 496
485 my @res = Coro::Util::fork_eval { 497 my @res = Coro::Util::fork_eval {
486 reset_signals; 498 reset_signals;
487 &$cb 499 &$cb
488 }, @args; 500 }, @args;
… …
497=item cf::db_put $family => $key => $value 509=item cf::db_put $family => $key => $value
498 510
499Stores the given C<$value> in the family. It can currently store binary 511Stores 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). 512data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 513
514=item $db = cf::db_table "name"
515
516Create and/or open a new database table. The string must not be "db" and must be unique
517within each server.
518
502=cut 519=cut
520
521sub db_table($) {
522 my ($name) = @_;
523 my $db = BDB::db_create $DB_ENV;
524
525 eval {
526 $db->set_flags (BDB::CHKSUM);
527
528 utf8::encode $name;
529 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
530 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
531 cf::cleanup "db_open(db): $!" if $!;
532 };
533 cf::cleanup "db_open(db): $@" if $@;
534
535 $db
536}
503 537
504our $DB; 538our $DB;
505 539
506sub db_init { 540sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 541 cf::sync_job {
511 eval { 542 $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 } 543 };
521} 544}
522 545
523sub db_get($$) { 546sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 547 my $key = "$_[0]/$_[1]";
525 548
… …
1002); 1025);
1003 1026
1004sub object_freezer_save { 1027sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1028 my ($filename, $rdata, $objs) = @_;
1006 1029
1030 my $guard = cf::lock_acquire "io";
1031
1007 sync_job { 1032 sync_job {
1008 if (length $$rdata) { 1033 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1035 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1036 $decname, length $$rdata, scalar @$objs;
1011 1037
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1039 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1041 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1060 }
1035 } else { 1061 } else {
1036 aio_unlink $filename; 1062 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1063 aio_unlink "$filename.pst";
1038 } 1064 }
1039 } 1065 };
1066
1067 undef $guard;
1040} 1068}
1041 1069
1042sub object_freezer_as_string { 1070sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1044 1072
… …
1049 1077
1050sub object_thawer_load { 1078sub object_thawer_load {
1051 my ($filename) = @_; 1079 my ($filename) = @_;
1052 1080
1053 my ($data, $av); 1081 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1054 1084
1055 (aio_load $filename, $data) >= 0 1085 (aio_load $filename, $data) >= 0
1056 or return; 1086 or return;
1057 1087
1058 unless (aio_stat "$filename.pst") { 1088 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1089 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1090 or return;
1091
1092 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1093 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1094 }
1063 1095
1096 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1097 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1098 $decname, length $data, scalar @{$av || []};
1099
1066 return ($data, $av); 1100 ($data, $av)
1067} 1101}
1068 1102
1069=head2 COMMAND CALLBACKS 1103=head2 COMMAND CALLBACKS
1070 1104
1071=over 4 1105=over 4
… …
1257 1291
1258=head3 cf::player 1292=head3 cf::player
1259 1293
1260=over 4 1294=over 4
1261 1295
1296=item cf::player::num_playing
1297
1298Returns the official number of playing players, as per the Crossfire metaserver rules.
1299
1300=cut
1301
1302sub num_playing {
1303 scalar grep
1304 $_->ob->map
1305 && !$_->hidden
1306 && !$_->ob->flag (cf::FLAG_WIZ),
1307 cf::player::list
1308}
1309
1262=item cf::player::find $login 1310=item cf::player::find $login
1263 1311
1264Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1265 1313
1266=cut 1314=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1353
1306 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1355 or return;
1356
1357 $f->next;
1358 my $pl = cf::player::load_pl $f
1359 or return;
1360 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1309 } 1363 }
1310 } 1364 }
1311} 1365}
1312 1366
… …
1410 or return []; 1464 or return [];
1411 1465
1412 my @logins; 1466 my @logins;
1413 1467
1414 for my $login (@$dirs) { 1468 for my $login (@$dirs) {
1469 my $path = path $login;
1470
1471 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1418 1477
1419 utf8::decode $login; 1478 utf8::decode $login;
1420 push @logins, $login; 1479 push @logins, $login;
1421 } 1480 }
1422 1481
… …
1460sub expand_cfpod { 1519sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1462 1521
1463 # escape & and < 1522 # escape & and <
1464 s/&/&amp;/g; 1523 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1466 1525
1467 # this is buggy, it needs to properly take care of nested <'s 1526 # this is buggy, it needs to properly take care of nested <'s
1468 1527
1469 1 while 1528 1 while
1470 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1534 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1477 }ge 1537 }ge
1478 # replace H<hint text> 1538 # replace H<hint text>
… …
1746 1806
1747sub load_header_from($) { 1807sub load_header_from($) {
1748 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1749 1809
1750 utf8::encode $path; 1810 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1812 or return;
1813
1814 $self->_load_header ($f)
1815 or return;
1816
1817 local $MAP_LOADING{$self->{path}} = $self;
1818 $f->resolve_delayed_derefs;
1756 1819
1757 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1758 1821
1759 1 1822 1
1760} 1823}
… …
1814sub find { 1877sub find {
1815 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1816 1879
1817 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1818 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1820 1884
1821 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1822 my $guard = cf::lock_acquire "map_find:$path"; 1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1823 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1824 or return; 1890 or return;
1825 1891
1826 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1827 1893
… …
1829 or return; 1895 or return;
1830 1896
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1834 $map->reset; 1902 $map->reset;
1835 undef $guard;
1836 return find $path; 1903 return find $path;
1837 } 1904 }
1838 1905
1839 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1840 } 1907 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1850 1917
1851 my $path = $self->{path}; 1918 my $path = $self->{path};
1852 1919
1853 { 1920 {
1854 my $guard1 = cf::lock_acquire "map_data:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1855 my $guard2 = cf::lock_acquire "map_load:$path";
1856 1922
1923 return unless $self->valid;
1857 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1858 1925
1859 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1860 1927
1861 $self->alloc; 1928 $self->alloc;
1862 1929
1863 $self->pre_load; 1930 $self->pre_load;
1864 cf::cede_to_tick; 1931 cf::cede_to_tick;
1865 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1866 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1867 or return; 1936 or return;
1868 1937
1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1870 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1871 1940
1872 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1873 utf8::encode $uniq; 1942 utf8::encode $uniq;
1874 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1875 $self->clear_unique_items; 1945 $self->clear_unique_items;
1876 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1877 } 1949 }
1878 } 1950 }
1951
1952 $f->resolve_delayed_derefs;
1879 1953
1880 cf::cede_to_tick; 1954 cf::cede_to_tick;
1881 # now do the right thing for maps 1955 # now do the right thing for maps
1882 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1883 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
… …
2027 2101
2028 return if $self->players; 2102 return if $self->players;
2029 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2030 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2031 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2032 $self->clear; 2110 $self->clear;
2033 $self->in_memory (cf::MAP_SWAPPED);
2034} 2111}
2035 2112
2036sub reset_at { 2113sub reset_at {
2037 my ($self) = @_; 2114 my ($self) = @_;
2038 2115
… …
2070 if $uniq; 2147 if $uniq;
2071 } 2148 }
2072 2149
2073 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2074 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2075 $self->clear; 2154 $self->clear;
2076
2077 $_->clear_links_to ($self) for values %cf::MAP;
2078 2155
2079 $self->unlink_save; 2156 $self->unlink_save;
2080 $self->destroy; 2157 $self->destroy;
2081} 2158}
2082 2159
2083my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2084 2161
2085sub nuke { 2162sub nuke {
2086 my ($self) = @_; 2163 my ($self) = @_;
2087 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2088 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2089 2169
2090 $self->unlink_save; 2170 $self->unlink_save;
2091 2171
2092 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2093 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2094 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2095 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2096 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2097 2177
2098 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2099 2180
2100 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2101} 2182}
2102 2183
2103=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2179 2260
2180sub inv_recursive { 2261sub inv_recursive {
2181 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2182} 2263}
2183 2264
2265=item $ref = $ob->ref
2266
2267creates and returns a persistent reference to an objetc that can be stored as a string.
2268
2269=item $ob = cf::object::deref ($refstring)
2270
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block.
2273
2274=cut
2275
2276sub deref {
2277 my ($ref) = @_;
2278
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return;
2286 $pl->ob->uuid eq $uuid
2287 or return;
2288
2289 $pl->ob
2290 } else {
2291 warn "$ref: cannot resolve object reference\n";
2292 undef
2293 }
2294}
2295
2184package cf; 2296package cf;
2185 2297
2186=back 2298=back
2187 2299
2188=head3 cf::object::player 2300=head3 cf::object::player
… …
2497the message, with C<log> being the default. If C<$color> is negative, suppress 2609the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet. 2610the message unless the client supports the msg packet.
2499 2611
2500=cut 2612=cut
2501 2613
2614our %CHANNEL = (
2615 "c/identify" => {
2616 id => "identify",
2617 title => "Identify",
2618 reply => undef,
2619 tooltip => "Items recently identified",
2620 },
2621 "c/examine" => {
2622 id => "examine",
2623 title => "Examine",
2624 reply => undef,
2625 tooltip => "Signs and other items you examined",
2626 },
2627);
2628
2502sub cf::client::send_msg { 2629sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_; 2630 my ($self, $channel, $msg, $color, @extra) = @_;
2504 2631
2505 $msg = $self->pl->expand_cfpod ($msg); 2632 $msg = $self->pl->expand_cfpod ($msg);
2506 2633
2507 $color &= cf::NDI_CLIENT_MASK; # just in case... 2634 $color &= cf::NDI_CLIENT_MASK; # just in case...
2635
2636 # check predefined channels, for the benefit of C
2637 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2508 2638
2509 if (ref $channel) { 2639 if (ref $channel) {
2510 # send meta info to client, if not yet sent 2640 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) { 2641 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel; 2642 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel); 2643 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg;
2514 } 2645 }
2515 2646
2516 $channel = $channel->{id}; 2647 $channel = $channel->{id};
2517 } 2648 }
2518 2649
… …
2833# the server's init and main functions 2964# the server's init and main functions
2834 2965
2835sub load_facedata($) { 2966sub load_facedata($) {
2836 my ($path) = @_; 2967 my ($path) = @_;
2837 2968
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed; 2973 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2974
2840 warn "loading facedata from $path\n"; 2975 warn "loading facedata from $path\n";
2841 2976
2842 my $facedata; 2977 my $facedata;
… …
2953 $ns->fx_want ($k, $v); 3088 $ns->fx_want ($k, $v);
2954 } 3089 }
2955}; 3090};
2956 3091
2957sub reload_regions { 3092sub reload_regions {
3093 # HACK to clear player env face cache, we need some signal framework
3094 # for this (global event?)
3095 %ext::player_env::MUSIC_FACE_CACHE = ();
3096
2958 load_resource_file "$MAPDIR/regions" 3097 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3098 or die "unable to load regions file\n";
2960 3099
2961 for (cf::region::list) { 3100 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3101 $_->{match} = qr/$_->{match}/
… …
3334 or die; 3473 or die;
3335 3474
3336 $map->width (50); 3475 $map->width (50);
3337 $map->height (50); 3476 $map->height (50);
3338 $map->alloc; 3477 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1); 3478 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3340 my $t = Event::time - $t; 3479 my $t = Event::time - $t;
3341 3480
3342 #next unless $t < 0.0013;#d# 3481 #next unless $t < 0.0013;#d#
3343 if ($t < $min) { 3482 if ($t < $min) {
3344 $min = $t; 3483 $min = $t;
… …
3387 3526
3388 }, 3527 },
3389); 3528);
3390 3529
3391{ 3530{
3531 BDB::min_parallel 8;
3392 BDB::max_poll_time $TICK * 0.1; 3532 BDB::max_poll_time $TICK * 0.1;
3393 $BDB_POLL_WATCHER = Event->io ( 3533 $BDB_POLL_WATCHER = Event->io (
3394 reentrant => 0, 3534 reentrant => 0,
3395 fd => BDB::poll_fileno, 3535 fd => BDB::poll_fileno,
3396 poll => 'r', 3536 poll => 'r',
3397 prio => 0, 3537 prio => 0,
3398 data => WF_AUTOCANCEL, 3538 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb, 3539 cb => \&BDB::poll_cb,
3400 ); 3540 );
3401 BDB::min_parallel 8;
3402 3541
3403 BDB::set_sync_prepare { 3542 BDB::set_sync_prepare {
3404 my $status; 3543 my $status;
3405 my $current = $Coro::current; 3544 my $current = $Coro::current;
3406 ( 3545 (
… …
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3566 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 3567 0666;
3429 3568
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3569 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431 3570
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3571 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3572 | BDB::LOG_AUTOREMOVE, 1);
3433 $DB_ENV->set_lk_detect; 3573 $DB_ENV->set_lk_detect;
3434 }; 3574 };
3435 3575
3436 cf::cleanup "db_env_open(db): $@" if $@; 3576 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 3577 };
3438 } 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 );
3439} 3600}
3440 3601
3441{ 3602{
3442 IO::AIO::min_parallel 8; 3603 IO::AIO::min_parallel 8;
3443 3604

Diff Legend

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