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.362 by root, Mon Sep 10 12:44:06 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 ();
… …
87our %CFG; 87our %CFG;
88 88
89our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 90our $RUNTIME;
91 91
92our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
95 95
96# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 98
… …
187 $msg .= "\n" 187 $msg .= "\n"
188 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
189 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 191
192 utf8::encode $msg;
193 LOG llevError, $msg; 192 LOG llevError, $msg;
194 }; 193 };
195} 194}
196 195
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
272Wait until the given lock is available and then acquires it and returns 271Wait 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, 272a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 273for example when the coroutine gets canceled), the lock is automatically
275returned. 274returned.
276 275
276Locks are *not* recursive, locking from the same coro twice results in a
277deadlocked coro.
278
277Lock names should begin with a unique identifier (for example, cf::map::find 279Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 280uses map_find and cf::map::load uses map_load).
279 281
280=item $locked = cf::lock_active $string 282=item $locked = cf::lock_active $string
281 283
282Return true if the lock is currently active, i.e. somebody has locked it. 284Return true if the lock is currently active, i.e. somebody has locked it.
283 285
284=cut 286=cut
285 287
286our %LOCK; 288our %LOCK;
289our %LOCKER;#d#
287 290
288sub lock_wait($) { 291sub lock_wait($) {
289 my ($key) = @_; 292 my ($key) = @_;
293
294 if ($LOCKER{$key} == $Coro::current) {#d#
295 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
296 return;#d#
297 }#d#
290 298
291 # wait for lock, if any 299 # wait for lock, if any
292 while ($LOCK{$key}) { 300 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 301 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 302 Coro::schedule;
… …
300 308
301 # wait, to be sure we are not locked 309 # wait, to be sure we are not locked
302 lock_wait $key; 310 lock_wait $key;
303 311
304 $LOCK{$key} = []; 312 $LOCK{$key} = [];
313 $LOCKER{$key} = $Coro::current;#d#
305 314
306 Coro::guard { 315 Coro::guard {
316 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 317 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 318 $_->ready for @{ delete $LOCK{$key} };
309 } 319 }
310} 320}
311 321
… …
478sub fork_call(&@) { 488sub fork_call(&@) {
479 my ($cb, @args) = @_; 489 my ($cb, @args) = @_;
480 490
481 # we seemingly have to make a local copy of the whole thing, 491 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 492 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 493 # TODO: investigate and fix (likely this will be rather laborious)
484 494
485 my @res = Coro::Util::fork_eval { 495 my @res = Coro::Util::fork_eval {
486 reset_signals; 496 reset_signals;
487 &$cb 497 &$cb
488 }, @args; 498 }, @args;
… …
575 if (1) { 585 if (1) {
576 $md5 = 586 $md5 =
577 join "\x00", 587 join "\x00",
578 $processversion, 588 $processversion,
579 map { 589 map {
580 Coro::cede; 590 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 591 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 592 } 0.. $#$src;
583 593
584 594
585 my $dbmd5 = db_get cache => "$id/md5"; 595 my $dbmd5 = db_get cache => "$id/md5";
… …
1002); 1012);
1003 1013
1004sub object_freezer_save { 1014sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1015 my ($filename, $rdata, $objs) = @_;
1006 1016
1017 my $guard = cf::lock_acquire "io";
1018
1007 sync_job { 1019 sync_job {
1008 if (length $$rdata) { 1020 if (length $$rdata) {
1021 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1023 $decname, length $$rdata, scalar @$objs;
1011 1024
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1026 chmod SAVE_MODE, $fh;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1028 aio_fsync $fh if $cf::USE_FSYNC;
… …
1034 } 1047 }
1035 } else { 1048 } else {
1036 aio_unlink $filename; 1049 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1038 } 1051 }
1039 } 1052 };
1053
1054 undef $guard;
1040} 1055}
1041 1056
1042sub object_freezer_as_string { 1057sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1044 1059
… …
1049 1064
1050sub object_thawer_load { 1065sub object_thawer_load {
1051 my ($filename) = @_; 1066 my ($filename) = @_;
1052 1067
1053 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1054 1071
1055 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1056 or return; 1073 or return;
1057 1074
1058 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1077 or return;
1078
1079 undef $guard;
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1062 } 1081 }
1063 1082
1083 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1084 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1085 $decname, length $data, scalar @{$av || []};
1086
1066 return ($data, $av); 1087 ($data, $av)
1067} 1088}
1068 1089
1069=head2 COMMAND CALLBACKS 1090=head2 COMMAND CALLBACKS
1070 1091
1071=over 4 1092=over 4
… …
1149 my ($type, $reply, @payload) = 1170 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1171 "ARRAY" eq ref $msg
1151 ? @$msg 1172 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1173 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1174
1175 my @reply;
1176
1154 if (my $cb = $EXTCMD{$type}) { 1177 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1178 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1179 }
1180
1181 $pl->ext_reply ($reply, @reply)
1182 if $reply;
1183
1160 } else { 1184 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1185 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1186 }
1163 1187
1164 cf::override; 1188 cf::override;
… …
1254 1278
1255=head3 cf::player 1279=head3 cf::player
1256 1280
1257=over 4 1281=over 4
1258 1282
1283=item cf::player::num_playing
1284
1285Returns the official number of playing players, as per the Crossfire metaserver rules.
1286
1287=cut
1288
1289sub num_playing {
1290 scalar grep
1291 $_->ob->map
1292 && !$_->hidden
1293 && !$_->ob->flag (cf::FLAG_WIZ),
1294 cf::player::list
1295}
1296
1259=item cf::player::find $login 1297=item cf::player::find $login
1260 1298
1261Returns the given player object, loading it if necessary (might block). 1299Returns the given player object, loading it if necessary (might block).
1262 1300
1263=cut 1301=cut
… …
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1336 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1337 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1338 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1339 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1340
1303 my $pl = load_pl path $login 1341 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1342 or return;
1343
1344 $f->next;
1345 my $pl = cf::player::load_pl $f
1346 or return;
1347 local $cf::PLAYER_LOADING{$login} = $pl;
1348 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1349 $cf::PLAYER{$login} = $pl
1306 } 1350 }
1307 } 1351 }
1308} 1352}
1309 1353
… …
1319 1363
1320 aio_mkdir playerdir $pl, 0770; 1364 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1365 $pl->{last_save} = $cf::RUNTIME;
1322 1366
1323 $pl->save_pl ($path); 1367 $pl->save_pl ($path);
1324 Coro::cede; 1368 cf::cede_to_tick;
1325} 1369}
1326 1370
1327sub new($) { 1371sub new($) {
1328 my ($login) = @_; 1372 my ($login) = @_;
1329 1373
… …
1407 or return []; 1451 or return [];
1408 1452
1409 my @logins; 1453 my @logins;
1410 1454
1411 for my $login (@$dirs) { 1455 for my $login (@$dirs) {
1456 my $path = path $login;
1457
1458 # a .pst is a dead give-away for a valid player
1459 unless (-e "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1461 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1462 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 }
1415 1464
1416 utf8::decode $login; 1465 utf8::decode $login;
1417 push @logins, $login; 1466 push @logins, $login;
1418 } 1467 }
1419 1468
… …
1457sub expand_cfpod { 1506sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1507 ((my $self), (local $_)) = @_;
1459 1508
1460 # escape & and < 1509 # escape & and <
1461 s/&/&amp;/g; 1510 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g; 1511 s/(?<![BIUGHT])</&lt;/g;
1463 1512
1464 # this is buggy, it needs to properly take care of nested <'s 1513 # this is buggy, it needs to properly take care of nested <'s
1465 1514
1466 1 while 1515 1 while
1467 # replace B<>, I<>, U<> etc. 1516 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1517 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1471 # replace G<male|female> tags 1521 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1522 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1 1523 $self->gender ? $2 : $1
1474 }ge 1524 }ge
1475 # replace H<hint text> 1525 # replace H<hint text>
… …
1743 1793
1744sub load_header_from($) { 1794sub load_header_from($) {
1745 my ($self, $path) = @_; 1795 my ($self, $path) = @_;
1746 1796
1747 utf8::encode $path; 1797 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1798 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1799 or return;
1800
1801 $self->_load_header ($f)
1802 or return;
1803
1804 local $MAP_LOADING{$self->{path}} = $self;
1805 $f->resolve_delayed_derefs;
1753 1806
1754 $self->{load_path} = $path; 1807 $self->{load_path} = $path;
1755 1808
1756 1 1809 1
1757} 1810}
… …
1811sub find { 1864sub find {
1812 my ($path, $origin) = @_; 1865 my ($path, $origin) = @_;
1813 1866
1814 $path = normalise $path, $origin && $origin->path; 1867 $path = normalise $path, $origin && $origin->path;
1815 1868
1869 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1870 cf::lock_wait "map_find:$path";
1817 1871
1818 $cf::MAP{$path} || do { 1872 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path"; 1873 my $guard1 = cf::lock_acquire "map_find:$path";
1874 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1875
1820 my $map = new_from_path cf::map $path 1876 my $map = new_from_path cf::map $path
1821 or return; 1877 or return;
1822 1878
1823 $map->{last_save} = $cf::RUNTIME; 1879 $map->{last_save} = $cf::RUNTIME;
1824 1880
… …
1826 or return; 1882 or return;
1827 1883
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1885 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1886 #$cf::WAIT_FOR_TICK->wait;
1887 undef $guard1;
1888 undef $guard2;
1831 $map->reset; 1889 $map->reset;
1832 undef $guard;
1833 return find $path; 1890 return find $path;
1834 } 1891 }
1835 1892
1836 $cf::MAP{$path} = $map 1893 $cf::MAP{$path} = $map
1837 } 1894 }
… …
1846 local $self->{deny_reset} = 1; # loading can take a long time 1903 local $self->{deny_reset} = 1; # loading can take a long time
1847 1904
1848 my $path = $self->{path}; 1905 my $path = $self->{path};
1849 1906
1850 { 1907 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 1908 my $guard = cf::lock_acquire "map_data:$path";
1852 1909
1910 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 1911 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 1912
1855 $self->in_memory (cf::MAP_LOADING); 1913 $self->in_memory (cf::MAP_LOADING);
1856 1914
1857 $self->alloc; 1915 $self->alloc;
1858 1916
1859 $self->pre_load; 1917 $self->pre_load;
1860 Coro::cede; 1918 cf::cede_to_tick;
1861 1919
1920 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 1922 $self->_load_objects ($f)
1863 or return; 1923 or return;
1864 1924
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1866 if delete $self->{load_original}; 1926 if delete $self->{load_original};
1867 1927
1868 if (my $uniq = $self->uniq_path) { 1928 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 1929 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 1930 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 1932 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 1933 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs;
1935 }
1873 } 1936 }
1874 } 1937 }
1875 1938
1876 Coro::cede; 1939 $f->resolve_delayed_derefs;
1940
1941 cf::cede_to_tick;
1877 # now do the right thing for maps 1942 # now do the right thing for maps
1878 $self->link_multipart_objects; 1943 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 1944 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 1945 unless $self->difficulty;
1881 Coro::cede; 1946 cf::cede_to_tick;
1882 1947
1883 unless ($self->{deny_activate}) { 1948 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 1949 $self->decay_objects;
1885 $self->fix_auto_apply; 1950 $self->fix_auto_apply;
1886 $self->update_buttons; 1951 $self->update_buttons;
1887 Coro::cede; 1952 cf::cede_to_tick;
1888 $self->set_darkness_map; 1953 $self->set_darkness_map;
1889 Coro::cede; 1954 cf::cede_to_tick;
1890 $self->activate; 1955 $self->activate;
1891 } 1956 }
1892 1957
1893 $self->{last_save} = $cf::RUNTIME; 1958 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 1959 $self->last_access ($cf::RUNTIME);
… …
1944} 2009}
1945 2010
1946sub do_load_sync { 2011sub do_load_sync {
1947 my ($map) = @_; 2012 my ($map) = @_;
1948 2013
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main;
2016
1949 cf::sync_job { $map->load }; 2017 cf::sync_job { $map->load };
1950} 2018}
1951 2019
1952our %MAP_PREFETCH; 2020our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2021our $MAP_PREFETCHER = undef;
1954 2022
1955sub find_async { 2023sub find_async {
1956 my ($path, $origin) = @_; 2024 my ($path, $origin, $load) = @_;
1957 2025
1958 $path = normalise $path, $origin && $origin->{path}; 2026 $path = normalise $path, $origin && $origin->{path};
1959 2027
1960 if (my $map = $cf::MAP{$path}) { 2028 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1962 } 2030 }
1963 2031
1964 undef $MAP_PREFETCH{$path}; 2032 $MAP_PREFETCH{$path} |= $load;
2033
1965 $MAP_PREFETCHER ||= cf::async { 2034 $MAP_PREFETCHER ||= cf::async {
1966 while (%MAP_PREFETCH) { 2035 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2036 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2037 if (my $map = find $k) {
1969 $map->load; 2038 $map->load if $v;
1970 } 2039 }
1971 2040
1972 delete $MAP_PREFETCH{$path}; 2041 delete $MAP_PREFETCH{$k};
1973 } 2042 }
1974 } 2043 }
1975 undef $MAP_PREFETCHER; 2044 undef $MAP_PREFETCHER;
1976 }; 2045 };
1977 $MAP_PREFETCHER->prio (6); 2046 $MAP_PREFETCHER->prio (6);
… …
1980} 2049}
1981 2050
1982sub save { 2051sub save {
1983 my ($self) = @_; 2052 my ($self) = @_;
1984 2053
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2055
1987 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1988 2057
1989 return unless $self->dirty; 2058 return unless $self->dirty;
1990 2059
… …
2013 my ($self) = @_; 2082 my ($self) = @_;
2014 2083
2015 # save first because save cedes 2084 # save first because save cedes
2016 $self->save; 2085 $self->save;
2017 2086
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2087 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2088
2020 return if $self->players; 2089 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
2022 return if $self->{deny_save}; 2091 return if $self->{deny_save};
2023 2092
2093 $self->in_memory (cf::MAP_SWAPPED);
2094
2095 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2097 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2098}
2027 2099
2028sub reset_at { 2100sub reset_at {
2029 my ($self) = @_; 2101 my ($self) = @_;
2030 2102
… …
2062 if $uniq; 2134 if $uniq;
2063 } 2135 }
2064 2136
2065 delete $cf::MAP{$self->path}; 2137 delete $cf::MAP{$self->path};
2066 2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2141 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2142
2071 $self->unlink_save; 2143 $self->unlink_save;
2072 $self->destroy; 2144 $self->destroy;
2073} 2145}
2074 2146
2075my $nuke_counter = "aaaa"; 2147my $nuke_counter = "aaaa";
2076 2148
2077sub nuke { 2149sub nuke {
2078 my ($self) = @_; 2150 my ($self) = @_;
2079 2151
2152 {
2153 my $lock = cf::lock_acquire "map_data:$self->{path}";
2154
2080 delete $cf::MAP{$self->path}; 2155 delete $cf::MAP{$self->path};
2081 2156
2082 $self->unlink_save; 2157 $self->unlink_save;
2083 2158
2084 bless $self, "cf::map"; 2159 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2160 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2161 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2162 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2164
2090 $cf::MAP{$self->path} = $self; 2165 $cf::MAP{$self->path} = $self;
2166 }
2091 2167
2092 $self->reset; # polite request, might not happen 2168 $self->reset; # polite request, might not happen
2093} 2169}
2094 2170
2095=item $maps = cf::map::tmp_maps 2171=item $maps = cf::map::tmp_maps
… …
2171 2247
2172sub inv_recursive { 2248sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2249 inv_recursive_ inv $_[0]
2174} 2250}
2175 2251
2252=item $ref = $ob->ref
2253
2254creates and returns a persistent reference to an objetc that can be stored as a string.
2255
2256=item $ob = cf::object::deref ($refstring)
2257
2258returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2259even if the object actually exists. May block.
2260
2261=cut
2262
2263sub deref {
2264 my ($ref) = @_;
2265
2266 # temporary compatibility#TODO#remove
2267 $ref =~ s{^<}{player/<};
2268
2269 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2270 my ($uuid, $name) = ($1, $2);
2271 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2272 or return;
2273 $pl->ob->uuid eq $uuid
2274 or return;
2275
2276 $pl->ob
2277 } else {
2278 warn "$ref: cannot resolve object reference\n";
2279 undef
2280 }
2281}
2282
2176package cf; 2283package cf;
2177 2284
2178=back 2285=back
2179 2286
2180=head3 cf::object::player 2287=head3 cf::object::player
… …
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2596the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2597the message unless the client supports the msg packet.
2491 2598
2492=cut 2599=cut
2493 2600
2601our %CHANNEL = (
2602 "c/identify" => {
2603 id => "identify",
2604 title => "Identify",
2605 reply => undef,
2606 tooltip => "Items recently identified",
2607 },
2608 "c/examine" => {
2609 id => "examine",
2610 title => "Examine",
2611 reply => undef,
2612 tooltip => "Signs and other items you examined",
2613 },
2614);
2615
2494sub cf::client::send_msg { 2616sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2617 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2618
2497 $msg = $self->pl->expand_cfpod ($msg); 2619 $msg = $self->pl->expand_cfpod ($msg);
2498 2620
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2621 $color &= cf::NDI_CLIENT_MASK; # just in case...
2622
2623 # check predefined channels, for the benefit of C
2624 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2500 2625
2501 if (ref $channel) { 2626 if (ref $channel) {
2502 # send meta info to client, if not yet sent 2627 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2628 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2629 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2630 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg;
2506 } 2632 }
2507 2633
2508 $channel = $channel->{id}; 2634 $channel = $channel->{id};
2509 } 2635 }
2510 2636
… …
2551=cut 2677=cut
2552 2678
2553sub cf::client::ext_msg($$@) { 2679sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2680 my ($self, $type, @msg) = @_;
2555 2681
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2682 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2684 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2685 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2687 }
2564} 2688}
2565 2689
… …
2572sub cf::client::ext_reply($$@) { 2696sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2697 my ($self, $id, @msg) = @_;
2574 2698
2575 if ($self->extcmd == 2) { 2699 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2701 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2702 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2703 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2705 }
2582} 2706}
… …
2646 my ($type, $reply, @payload) = 2770 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2771 "ARRAY" eq ref $msg
2648 ? @$msg 2772 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2773 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2774
2775 my @reply;
2776
2651 if (my $cb = $EXTICMD{$type}) { 2777 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2778 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2779 }
2780
2781 $ns->ext_reply ($reply, @reply)
2782 if $reply;
2783
2657 } else { 2784 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2785 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2786 }
2660 2787
2661 cf::override; 2788 cf::override;
… …
2722 2849
2723The following functions and methods are available within a safe environment: 2850The following functions and methods are available within a safe environment:
2724 2851
2725 cf::object 2852 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 2853 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race 2854 insert remove name archname title slaying race decrease_ob_nr
2728 2855
2729 cf::object::player 2856 cf::object::player
2730 player 2857 player
2731 2858
2732 cf::player 2859 cf::player
… …
2737 2864
2738=cut 2865=cut
2739 2866
2740for ( 2867for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2868 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 2869 insert remove inv name archname title slaying race
2870 decrease_ob_nr)],
2743 ["cf::object::player" => qw(player)], 2871 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 2872 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 2873 ["cf::map" => qw(trigger)],
2746) { 2874) {
2747 no strict 'refs'; 2875 no strict 'refs';
… …
2823# the server's init and main functions 2951# the server's init and main functions
2824 2952
2825sub load_facedata($) { 2953sub load_facedata($) {
2826 my ($path) = @_; 2954 my ($path) = @_;
2827 2955
2956 # HACK to clear player env face cache, we need some signal framework
2957 # for this (global event?)
2958 %ext::player_env::MUSIC_FACE_CACHE = ();
2959
2828 my $enc = JSON::XS->new->utf8->canonical; 2960 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 2961
2830 warn "loading facedata from $path\n"; 2962 warn "loading facedata from $path\n";
2831 2963
2832 my $facedata; 2964 my $facedata;
2833 0 < aio_load $path, $facedata 2965 0 < aio_load $path, $facedata
… …
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 2971 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 2972
2841 # patch in the exptable 2973 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 2974 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 2975 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 2976 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 2977 };
2846 cf::cede_to_tick; 2978 cf::cede_to_tick;
2847 2979
2848 { 2980 {
2849 my $faces = $facedata->{faceinfo}; 2981 my $faces = $facedata->{faceinfo};
… …
2902 name => $name, 3034 name => $name,
2903 %{ $info->{meta} || {} }, 3035 %{ $info->{meta} || {} },
2904 }); 3036 });
2905 3037
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3038 $data = pack "(w/a*)*", $meta, $info->{data};
3039 } else {
3040 $data = $info->{data};
2907 } 3041 }
2908 3042
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; 3043 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type}; 3044 cf::face::set_type $idx, $info->{type};
2911 3045
… …
2941 $ns->fx_want ($k, $v); 3075 $ns->fx_want ($k, $v);
2942 } 3076 }
2943}; 3077};
2944 3078
2945sub reload_regions { 3079sub reload_regions {
3080 # HACK to clear player env face cache, we need some signal framework
3081 # for this (global event?)
3082 %ext::player_env::MUSIC_FACE_CACHE = ();
3083
2946 load_resource_file "$MAPDIR/regions" 3084 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3085 or die "unable to load regions file\n";
2948 3086
2949 for (cf::region::list) { 3087 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3088 $_->{match} = qr/$_->{match}/
… …
2986 3124
2987sub init { 3125sub init {
2988 reload_resources; 3126 reload_resources;
2989} 3127}
2990 3128
2991sub cfg_load { 3129sub reload_config {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3130 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3131 or return;
2994 3132
2995 local $/; 3133 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3134 *CFG = YAML::Syck::Load <$fh>;
… …
3016 (async { 3154 (async {
3017 Event::one_event; 3155 Event::one_event;
3018 })->prio (Coro::PRIO_MAX); 3156 })->prio (Coro::PRIO_MAX);
3019 }; 3157 };
3020 3158
3021 cfg_load; 3159 reload_config;
3022 db_init; 3160 db_init;
3023 load_extensions; 3161 load_extensions;
3024 3162
3025 $TICK_WATCHER->start; 3163 $TICK_WATCHER->start;
3026 Event::loop; 3164 Event::loop;
… …
3219 warn "reloading cf.pm"; 3357 warn "reloading cf.pm";
3220 require cf; 3358 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3360
3223 warn "loading config and database again"; 3361 warn "loading config and database again";
3224 cf::cfg_load; 3362 cf::reload_config;
3225 3363
3226 warn "loading extensions"; 3364 warn "loading extensions";
3227 cf::load_extensions; 3365 cf::load_extensions;
3228 3366
3229 warn "reattaching attachments to objects/players"; 3367 warn "reattaching attachments to objects/players";
… …
3322 or die; 3460 or die;
3323 3461
3324 $map->width (50); 3462 $map->width (50);
3325 $map->height (50); 3463 $map->height (50);
3326 $map->alloc; 3464 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1); 3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3328 my $t = Event::time - $t; 3466 my $t = Event::time - $t;
3329 3467
3330 #next unless $t < 0.0013;#d# 3468 #next unless $t < 0.0013;#d#
3331 if ($t < $min) { 3469 if ($t < $min) {
3332 $min = $t; 3470 $min = $t;

Diff Legend

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