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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.364 by root, Tue Sep 11 08:41:11 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
80our $NEXT_TICK; 80our $NEXT_TICK;
81our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
83 83
84our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_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
… …
575 if (1) { 598 if (1) {
576 $md5 = 599 $md5 =
577 join "\x00", 600 join "\x00",
578 $processversion, 601 $processversion,
579 map { 602 map {
580 Coro::cede; 603 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 604 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 605 } 0.. $#$src;
583 606
584 607
585 my $dbmd5 = db_get cache => "$id/md5"; 608 my $dbmd5 = db_get cache => "$id/md5";
… …
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
… …
1149 my ($type, $reply, @payload) = 1183 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1184 "ARRAY" eq ref $msg
1151 ? @$msg 1185 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1186 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1187
1188 my @reply;
1189
1154 if (my $cb = $EXTCMD{$type}) { 1190 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1191 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1192 }
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196
1160 } else { 1197 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1199 }
1163 1200
1164 cf::override; 1201 cf::override;
… …
1254 1291
1255=head3 cf::player 1292=head3 cf::player
1256 1293
1257=over 4 1294=over 4
1258 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
1259=item cf::player::find $login 1310=item cf::player::find $login
1260 1311
1261Returns the given player object, loading it if necessary (might block). 1312Returns the given player object, loading it if necessary (might block).
1262 1313
1263=cut 1314=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1349 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1350 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1351 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1352 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1353
1303 my $pl = load_pl path $login 1354 my $f = new_from_file cf::object::thawer path $login
1304 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;
1305 $cf::PLAYER{$login} = $pl 1362 $cf::PLAYER{$login} = $pl
1306 } 1363 }
1307 } 1364 }
1308} 1365}
1309 1366
… …
1319 1376
1320 aio_mkdir playerdir $pl, 0770; 1377 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1378 $pl->{last_save} = $cf::RUNTIME;
1322 1379
1323 $pl->save_pl ($path); 1380 $pl->save_pl ($path);
1324 Coro::cede; 1381 cf::cede_to_tick;
1325} 1382}
1326 1383
1327sub new($) { 1384sub new($) {
1328 my ($login) = @_; 1385 my ($login) = @_;
1329 1386
… …
1407 or return []; 1464 or return [];
1408 1465
1409 my @logins; 1466 my @logins;
1410 1467
1411 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") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1474 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1475 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 }
1415 1477
1416 utf8::decode $login; 1478 utf8::decode $login;
1417 push @logins, $login; 1479 push @logins, $login;
1418 } 1480 }
1419 1481
… …
1457sub expand_cfpod { 1519sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1520 ((my $self), (local $_)) = @_;
1459 1521
1460 # escape & and < 1522 # escape & and <
1461 s/&/&amp;/g; 1523 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1524 s/(?<![BIUGHT])</&lt;/g;
1463 1525
1464 # 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
1465 1527
1466 1 while 1528 1 while
1467 # replace B<>, I<>, U<> etc. 1529 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1530 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1534 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1535 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1536 $self->gender ? $2 : $1
1474 }ge 1537 }ge
1475 # replace H<hint text> 1538 # replace H<hint text>
… …
1743 1806
1744sub load_header_from($) { 1807sub load_header_from($) {
1745 my ($self, $path) = @_; 1808 my ($self, $path) = @_;
1746 1809
1747 utf8::encode $path; 1810 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1811 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 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;
1753 1819
1754 $self->{load_path} = $path; 1820 $self->{load_path} = $path;
1755 1821
1756 1 1822 1
1757} 1823}
… …
1811sub find { 1877sub find {
1812 my ($path, $origin) = @_; 1878 my ($path, $origin) = @_;
1813 1879
1814 $path = normalise $path, $origin && $origin->path; 1880 $path = normalise $path, $origin && $origin->path;
1815 1881
1882 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1883 cf::lock_wait "map_find:$path";
1817 1884
1818 $cf::MAP{$path} || do { 1885 $cf::MAP{$path} || do {
1819 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
1820 my $map = new_from_path cf::map $path 1889 my $map = new_from_path cf::map $path
1821 or return; 1890 or return;
1822 1891
1823 $map->{last_save} = $cf::RUNTIME; 1892 $map->{last_save} = $cf::RUNTIME;
1824 1893
… …
1826 or return; 1895 or return;
1827 1896
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1898 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1899 #$cf::WAIT_FOR_TICK->wait;
1900 undef $guard1;
1901 undef $guard2;
1831 $map->reset; 1902 $map->reset;
1832 undef $guard;
1833 return find $path; 1903 return find $path;
1834 } 1904 }
1835 1905
1836 $cf::MAP{$path} = $map 1906 $cf::MAP{$path} = $map
1837 } 1907 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1916 local $self->{deny_reset} = 1; # loading can take a long time
1847 1917
1848 my $path = $self->{path}; 1918 my $path = $self->{path};
1849 1919
1850 { 1920 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1921 my $guard = cf::lock_acquire "map_data:$path";
1852 1922
1923 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1924 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1925
1855 $self->in_memory (cf::MAP_LOADING); 1926 $self->in_memory (cf::MAP_LOADING);
1856 1927
1857 $self->alloc; 1928 $self->alloc;
1858 1929
1859 $self->pre_load; 1930 $self->pre_load;
1860 Coro::cede; 1931 cf::cede_to_tick;
1861 1932
1933 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1935 $self->_load_objects ($f)
1863 or return; 1936 or return;
1864 1937
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1939 if delete $self->{load_original};
1867 1940
1868 if (my $uniq = $self->uniq_path) { 1941 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1942 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1943 unless (aio_stat $uniq) {
1944 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1945 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1946 $self->_load_objects ($f);
1947 $f->resolve_delayed_derefs;
1948 }
1873 } 1949 }
1874 } 1950 }
1875 1951
1876 Coro::cede; 1952 $f->resolve_delayed_derefs;
1953
1954 cf::cede_to_tick;
1877 # now do the right thing for maps 1955 # now do the right thing for maps
1878 $self->link_multipart_objects; 1956 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1957 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1958 unless $self->difficulty;
1881 Coro::cede; 1959 cf::cede_to_tick;
1882 1960
1883 unless ($self->{deny_activate}) { 1961 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1962 $self->decay_objects;
1885 $self->fix_auto_apply; 1963 $self->fix_auto_apply;
1886 $self->update_buttons; 1964 $self->update_buttons;
1887 Coro::cede; 1965 cf::cede_to_tick;
1888 $self->set_darkness_map; 1966 $self->set_darkness_map;
1889 Coro::cede; 1967 cf::cede_to_tick;
1890 $self->activate; 1968 $self->activate;
1891 } 1969 }
1892 1970
1893 $self->{last_save} = $cf::RUNTIME; 1971 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1972 $self->last_access ($cf::RUNTIME);
… …
1944} 2022}
1945 2023
1946sub do_load_sync { 2024sub do_load_sync {
1947 my ($map) = @_; 2025 my ($map) = @_;
1948 2026
2027 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2028 if $Coro::current == $Coro::main;
2029
1949 cf::sync_job { $map->load }; 2030 cf::sync_job { $map->load };
1950} 2031}
1951 2032
1952our %MAP_PREFETCH; 2033our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2034our $MAP_PREFETCHER = undef;
1954 2035
1955sub find_async { 2036sub find_async {
1956 my ($path, $origin) = @_; 2037 my ($path, $origin, $load) = @_;
1957 2038
1958 $path = normalise $path, $origin && $origin->{path}; 2039 $path = normalise $path, $origin && $origin->{path};
1959 2040
1960 if (my $map = $cf::MAP{$path}) { 2041 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2043 }
1963 2044
1964 undef $MAP_PREFETCH{$path}; 2045 $MAP_PREFETCH{$path} |= $load;
2046
1965 $MAP_PREFETCHER ||= cf::async { 2047 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 2048 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2049 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2050 if (my $map = find $k) {
1969 $map->load; 2051 $map->load if $v;
1970 } 2052 }
1971 2053
1972 delete $MAP_PREFETCH{$path}; 2054 delete $MAP_PREFETCH{$k};
1973 } 2055 }
1974 } 2056 }
1975 undef $MAP_PREFETCHER; 2057 undef $MAP_PREFETCHER;
1976 }; 2058 };
1977 $MAP_PREFETCHER->prio (6); 2059 $MAP_PREFETCHER->prio (6);
… …
1980} 2062}
1981 2063
1982sub save { 2064sub save {
1983 my ($self) = @_; 2065 my ($self) = @_;
1984 2066
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2068
1987 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
1988 2070
1989 return unless $self->dirty; 2071 return unless $self->dirty;
1990 2072
… …
2013 my ($self) = @_; 2095 my ($self) = @_;
2014 2096
2015 # save first because save cedes 2097 # save first because save cedes
2016 $self->save; 2098 $self->save;
2017 2099
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2101
2020 return if $self->players; 2102 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2104 return if $self->{deny_save};
2023 2105
2106 $self->in_memory (cf::MAP_SWAPPED);
2107
2108 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2110 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2111}
2027 2112
2028sub reset_at { 2113sub reset_at {
2029 my ($self) = @_; 2114 my ($self) = @_;
2030 2115
… …
2062 if $uniq; 2147 if $uniq;
2063 } 2148 }
2064 2149
2065 delete $cf::MAP{$self->path}; 2150 delete $cf::MAP{$self->path};
2066 2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2154 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2155
2071 $self->unlink_save; 2156 $self->unlink_save;
2072 $self->destroy; 2157 $self->destroy;
2073} 2158}
2074 2159
2075my $nuke_counter = "aaaa"; 2160my $nuke_counter = "aaaa";
2076 2161
2077sub nuke { 2162sub nuke {
2078 my ($self) = @_; 2163 my ($self) = @_;
2079 2164
2165 {
2166 my $lock = cf::lock_acquire "map_data:$self->{path}";
2167
2080 delete $cf::MAP{$self->path}; 2168 delete $cf::MAP{$self->path};
2081 2169
2082 $self->unlink_save; 2170 $self->unlink_save;
2083 2171
2084 bless $self, "cf::map"; 2172 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2173 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2174 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2175 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2177
2090 $cf::MAP{$self->path} = $self; 2178 $cf::MAP{$self->path} = $self;
2179 }
2091 2180
2092 $self->reset; # polite request, might not happen 2181 $self->reset; # polite request, might not happen
2093} 2182}
2094 2183
2095=item $maps = cf::map::tmp_maps 2184=item $maps = cf::map::tmp_maps
… …
2171 2260
2172sub inv_recursive { 2261sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2262 inv_recursive_ inv $_[0]
2174} 2263}
2175 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
2176package cf; 2296package cf;
2177 2297
2178=back 2298=back
2179 2299
2180=head3 cf::object::player 2300=head3 cf::object::player
… …
2489the 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
2490the message unless the client supports the msg packet. 2610the message unless the client supports the msg packet.
2491 2611
2492=cut 2612=cut
2493 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
2494sub cf::client::send_msg { 2629sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2630 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2631
2497 $msg = $self->pl->expand_cfpod ($msg); 2632 $msg = $self->pl->expand_cfpod ($msg);
2498 2633
2499 $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};
2500 2638
2501 if (ref $channel) { 2639 if (ref $channel) {
2502 # send meta info to client, if not yet sent 2640 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2641 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2642 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2643 $self->ext_msg (channel_info => $channel)
2644 if $self->can_msg;
2506 } 2645 }
2507 2646
2508 $channel = $channel->{id}; 2647 $channel = $channel->{id};
2509 } 2648 }
2510 2649
… …
2551=cut 2690=cut
2552 2691
2553sub cf::client::ext_msg($$@) { 2692sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2693 my ($self, $type, @msg) = @_;
2555 2694
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2695 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2696 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2697 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2698 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2699 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2700 }
2564} 2701}
2565 2702
… …
2572sub cf::client::ext_reply($$@) { 2709sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2710 my ($self, $id, @msg) = @_;
2574 2711
2575 if ($self->extcmd == 2) { 2712 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2713 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2714 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2715 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2716 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2717 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2718 }
2582} 2719}
… …
2646 my ($type, $reply, @payload) = 2783 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2784 "ARRAY" eq ref $msg
2648 ? @$msg 2785 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2786 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2787
2788 my @reply;
2789
2651 if (my $cb = $EXTICMD{$type}) { 2790 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2791 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2792 }
2793
2794 $ns->ext_reply ($reply, @reply)
2795 if $reply;
2796
2657 } else { 2797 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2798 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2799 }
2660 2800
2661 cf::override; 2801 cf::override;
… …
2722 2862
2723The following functions and methods are available within a safe environment: 2863The following functions and methods are available within a safe environment:
2724 2864
2725 cf::object 2865 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2866 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2867 insert remove name archname title slaying race decrease_ob_nr
2728 2868
2729 cf::object::player 2869 cf::object::player
2730 player 2870 player
2731 2871
2732 cf::player 2872 cf::player
… …
2737 2877
2738=cut 2878=cut
2739 2879
2740for ( 2880for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2881 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2882 insert remove inv name archname title slaying race
2883 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2884 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2885 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2886 ["cf::map" => qw(trigger)],
2746) { 2887) {
2747 no strict 'refs'; 2888 no strict 'refs';
… …
2823# the server's init and main functions 2964# the server's init and main functions
2824 2965
2825sub load_facedata($) { 2966sub load_facedata($) {
2826 my ($path) = @_; 2967 my ($path) = @_;
2827 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
2828 my $enc = JSON::XS->new->utf8->canonical; 2973 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2974
2830 warn "loading facedata from $path\n"; 2975 warn "loading facedata from $path\n";
2831 2976
2832 my $facedata; 2977 my $facedata;
2833 0 < aio_load $path, $facedata 2978 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 2984 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 2985
2841 # patch in the exptable 2986 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 2987 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 2988 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2989 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 2990 };
2846 cf::cede_to_tick; 2991 cf::cede_to_tick;
2847 2992
2848 { 2993 {
2849 my $faces = $facedata->{faceinfo}; 2994 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 3047 name => $name,
2903 %{ $info->{meta} || {} }, 3048 %{ $info->{meta} || {} },
2904 }); 3049 });
2905 3050
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3051 $data = pack "(w/a*)*", $meta, $info->{data};
3052 } else {
3053 $data = $info->{data};
2907 } 3054 }
2908 3055
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3056 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 3057 cf::face::set_type $idx, $info->{type};
2911 3058
… …
2941 $ns->fx_want ($k, $v); 3088 $ns->fx_want ($k, $v);
2942 } 3089 }
2943}; 3090};
2944 3091
2945sub 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
2946 load_resource_file "$MAPDIR/regions" 3097 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3098 or die "unable to load regions file\n";
2948 3099
2949 for (cf::region::list) { 3100 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3101 $_->{match} = qr/$_->{match}/
… …
2986 3137
2987sub init { 3138sub init {
2988 reload_resources; 3139 reload_resources;
2989} 3140}
2990 3141
2991sub cfg_load { 3142sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3143 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3144 or return;
2994 3145
2995 local $/; 3146 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3147 *CFG = YAML::Syck::Load <$fh>;
… …
3016 (async { 3167 (async {
3017 Event::one_event; 3168 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3169 })->prio (Coro::PRIO_MAX);
3019 }; 3170 };
3020 3171
3021 cfg_load; 3172 reload_config;
3022 db_init; 3173 db_init;
3023 load_extensions; 3174 load_extensions;
3024 3175
3025 $TICK_WATCHER->start; 3176 $TICK_WATCHER->start;
3026 Event::loop; 3177 Event::loop;
… …
3219 warn "reloading cf.pm"; 3370 warn "reloading cf.pm";
3220 require cf; 3371 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3372 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3373
3223 warn "loading config and database again"; 3374 warn "loading config and database again";
3224 cf::cfg_load; 3375 cf::reload_config;
3225 3376
3226 warn "loading extensions"; 3377 warn "loading extensions";
3227 cf::load_extensions; 3378 cf::load_extensions;
3228 3379
3229 warn "reattaching attachments to objects/players"; 3380 warn "reattaching attachments to objects/players";
… …
3294 my $signal = new Coro::Signal; 3445 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 3446 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 3447 $signal->wait;
3297} 3448}
3298 3449
3299 my $min = 1e6;#d# 3450our $stat_fh;
3300 my $avg = 10; 3451sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3452
3301$TICK_WATCHER = Event->timer ( 3453$TICK_WATCHER = Event->timer (
3302 reentrant => 0, 3454 reentrant => 0,
3303 parked => 1, 3455 parked => 1,
3304 prio => 0, 3456 prio => 0,
3305 at => $NEXT_TICK || $TICK, 3457 at => $NEXT_TICK || $TICK,
… …
3309 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3461 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3310 unless ++$bug_warning > 10; 3462 unless ++$bug_warning > 10;
3311 return; 3463 return;
3312 } 3464 }
3313 3465
3466 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3467
3314 $NOW = $tick_start = Event::time; 3468 $NOW = $tick_start = Event::time;
3315 3469
3316 cf::server_tick; # one server iteration 3470 cf::server_tick; # one server iteration
3317
3318 0 && sync_job {#d#
3319 for(1..10) {
3320 my $t = Event::time;
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3322 or die;
3323
3324 $map->width (50);
3325 $map->height (50);
3326 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1);
3328 my $t = Event::time - $t;
3329
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 };
3340 3471
3341 $RUNTIME += $TICK; 3472 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK; 3473 $NEXT_TICK += $TICK;
3343 3474
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3475 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
3370 $LOAD = ($NOW - $tick_start) / $TICK; 3501 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3502 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 3503
3373 _post_tick; 3504 _post_tick;
3374 3505
3375 3506 # gather some statistics#d#
3507 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3508 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3376 }, 3509 },
3377); 3510);
3378 3511
3379{ 3512{
3513 BDB::min_parallel 8;
3380 BDB::max_poll_time $TICK * 0.1; 3514 BDB::max_poll_time $TICK * 0.1;
3381 $BDB_POLL_WATCHER = Event->io ( 3515 $BDB_POLL_WATCHER = Event->io (
3382 reentrant => 0, 3516 reentrant => 0,
3383 fd => BDB::poll_fileno, 3517 fd => BDB::poll_fileno,
3384 poll => 'r', 3518 poll => 'r',
3385 prio => 0, 3519 prio => 0,
3386 data => WF_AUTOCANCEL, 3520 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb, 3521 cb => \&BDB::poll_cb,
3388 ); 3522 );
3389 BDB::min_parallel 8;
3390 3523
3391 BDB::set_sync_prepare { 3524 BDB::set_sync_prepare {
3392 my $status; 3525 my $status;
3393 my $current = $Coro::current; 3526 my $current = $Coro::current;
3394 ( 3527 (
… …
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3548 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 3549 0666;
3417 3550
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3551 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419 3552
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3553 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3554 | BDB::LOG_AUTOREMOVE, 1);
3421 $DB_ENV->set_lk_detect; 3555 $DB_ENV->set_lk_detect;
3422 }; 3556 };
3423 3557
3424 cf::cleanup "db_env_open(db): $@" if $@; 3558 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 3559 };
3426 } 3560 }
3561
3562 $BDB_CHECKPOINT_WATCHER = Event->timer (
3563 after => 11,
3564 interval => 60,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3570 },
3571 );
3572 $BDB_TRICKLE_WATCHER = Event->timer (
3573 after => 5,
3574 interval => 10,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3580 },
3581 );
3427} 3582}
3428 3583
3429{ 3584{
3430 IO::AIO::min_parallel 8; 3585 IO::AIO::min_parallel 8;
3431 3586

Diff Legend

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