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.338 by root, Tue Aug 21 01:07:47 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
… …
1257 1278
1258=head3 cf::player 1279=head3 cf::player
1259 1280
1260=over 4 1281=over 4
1261 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
1262=item cf::player::find $login 1297=item cf::player::find $login
1263 1298
1264Returns the given player object, loading it if necessary (might block). 1299Returns the given player object, loading it if necessary (might block).
1265 1300
1266=cut 1301=cut
… …
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1336 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1337 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1338 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1339 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1340
1306 my $pl = load_pl path $login 1341 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1349 $cf::PLAYER{$login} = $pl
1309 } 1350 }
1310 } 1351 }
1311} 1352}
1312 1353
… …
1322 1363
1323 aio_mkdir playerdir $pl, 0770; 1364 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1365 $pl->{last_save} = $cf::RUNTIME;
1325 1366
1326 $pl->save_pl ($path); 1367 $pl->save_pl ($path);
1327 Coro::cede; 1368 cf::cede_to_tick;
1328} 1369}
1329 1370
1330sub new($) { 1371sub new($) {
1331 my ($login) = @_; 1372 my ($login) = @_;
1332 1373
… …
1410 or return []; 1451 or return [];
1411 1452
1412 my @logins; 1453 my @logins;
1413 1454
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1460 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1461 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1462 $buf !~ /^password -------------$/m or next; # official not-valid tag
1463 }
1418 1464
1419 utf8::decode $login; 1465 utf8::decode $login;
1420 push @logins, $login; 1466 push @logins, $login;
1421 } 1467 }
1422 1468
… …
1460sub expand_cfpod { 1506sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1507 ((my $self), (local $_)) = @_;
1462 1508
1463 # escape & and < 1509 # escape & and <
1464 s/&/&amp;/g; 1510 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1511 s/(?<![BIUGHT])</&lt;/g;
1466 1512
1467 # 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
1468 1514
1469 1 while 1515 1 while
1470 # replace B<>, I<>, U<> etc. 1516 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1517 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1518 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1519 || s/U<([^\>]*)>/<u>$1<\/u>/
1520 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1521 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1522 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1523 $self->gender ? $2 : $1
1477 }ge 1524 }ge
1478 # replace H<hint text> 1525 # replace H<hint text>
… …
1746 1793
1747sub load_header_from($) { 1794sub load_header_from($) {
1748 my ($self, $path) = @_; 1795 my ($self, $path) = @_;
1749 1796
1750 utf8::encode $path; 1797 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1798 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 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;
1756 1806
1757 $self->{load_path} = $path; 1807 $self->{load_path} = $path;
1758 1808
1759 1 1809 1
1760} 1810}
… …
1814sub find { 1864sub find {
1815 my ($path, $origin) = @_; 1865 my ($path, $origin) = @_;
1816 1866
1817 $path = normalise $path, $origin && $origin->path; 1867 $path = normalise $path, $origin && $origin->path;
1818 1868
1869 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1870 cf::lock_wait "map_find:$path";
1820 1871
1821 $cf::MAP{$path} || do { 1872 $cf::MAP{$path} || do {
1822 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
1823 my $map = new_from_path cf::map $path 1876 my $map = new_from_path cf::map $path
1824 or return; 1877 or return;
1825 1878
1826 $map->{last_save} = $cf::RUNTIME; 1879 $map->{last_save} = $cf::RUNTIME;
1827 1880
… …
1829 or return; 1882 or return;
1830 1883
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1884 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1885 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1886 #$cf::WAIT_FOR_TICK->wait;
1887 undef $guard1;
1888 undef $guard2;
1834 $map->reset; 1889 $map->reset;
1835 undef $guard;
1836 return find $path; 1890 return find $path;
1837 } 1891 }
1838 1892
1839 $cf::MAP{$path} = $map 1893 $cf::MAP{$path} = $map
1840 } 1894 }
… …
1849 local $self->{deny_reset} = 1; # loading can take a long time 1903 local $self->{deny_reset} = 1; # loading can take a long time
1850 1904
1851 my $path = $self->{path}; 1905 my $path = $self->{path};
1852 1906
1853 { 1907 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 1908 my $guard = cf::lock_acquire "map_data:$path";
1855 1909
1910 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 1911 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 1912
1858 $self->in_memory (cf::MAP_LOADING); 1913 $self->in_memory (cf::MAP_LOADING);
1859 1914
1860 $self->alloc; 1915 $self->alloc;
1861 1916
1862 $self->pre_load; 1917 $self->pre_load;
1863 Coro::cede; 1918 cf::cede_to_tick;
1864 1919
1920 my $f = new_from_file cf::object::thawer $self->{load_path};
1921 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 1922 $self->_load_objects ($f)
1866 or return; 1923 or return;
1867 1924
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1925 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1869 if delete $self->{load_original}; 1926 if delete $self->{load_original};
1870 1927
1871 if (my $uniq = $self->uniq_path) { 1928 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 1929 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 1930 unless (aio_stat $uniq) {
1931 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 1932 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 1933 $self->_load_objects ($f);
1934 $f->resolve_delayed_derefs;
1935 }
1876 } 1936 }
1877 } 1937 }
1878 1938
1879 Coro::cede; 1939 $f->resolve_delayed_derefs;
1940
1941 cf::cede_to_tick;
1880 # now do the right thing for maps 1942 # now do the right thing for maps
1881 $self->link_multipart_objects; 1943 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 1944 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 1945 unless $self->difficulty;
1884 Coro::cede; 1946 cf::cede_to_tick;
1885 1947
1886 unless ($self->{deny_activate}) { 1948 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 1949 $self->decay_objects;
1888 $self->fix_auto_apply; 1950 $self->fix_auto_apply;
1889 $self->update_buttons; 1951 $self->update_buttons;
1890 Coro::cede; 1952 cf::cede_to_tick;
1891 $self->set_darkness_map; 1953 $self->set_darkness_map;
1892 Coro::cede; 1954 cf::cede_to_tick;
1893 $self->activate; 1955 $self->activate;
1894 } 1956 }
1895 1957
1896 $self->{last_save} = $cf::RUNTIME; 1958 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 1959 $self->last_access ($cf::RUNTIME);
… …
1947} 2009}
1948 2010
1949sub do_load_sync { 2011sub do_load_sync {
1950 my ($map) = @_; 2012 my ($map) = @_;
1951 2013
2014 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2015 if $Coro::current == $Coro::main;
2016
1952 cf::sync_job { $map->load }; 2017 cf::sync_job { $map->load };
1953} 2018}
1954 2019
1955our %MAP_PREFETCH; 2020our %MAP_PREFETCH;
1956our $MAP_PREFETCHER = undef; 2021our $MAP_PREFETCHER = undef;
1957 2022
1958sub find_async { 2023sub find_async {
1959 my ($path, $origin) = @_; 2024 my ($path, $origin, $load) = @_;
1960 2025
1961 $path = normalise $path, $origin && $origin->{path}; 2026 $path = normalise $path, $origin && $origin->{path};
1962 2027
1963 if (my $map = $cf::MAP{$path}) { 2028 if (my $map = $cf::MAP{$path}) {
1964 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2029 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1965 } 2030 }
1966 2031
1967 undef $MAP_PREFETCH{$path}; 2032 $MAP_PREFETCH{$path} |= $load;
2033
1968 $MAP_PREFETCHER ||= cf::async { 2034 $MAP_PREFETCHER ||= cf::async {
1969 while (%MAP_PREFETCH) { 2035 while (%MAP_PREFETCH) {
1970 for my $path (keys %MAP_PREFETCH) { 2036 while (my ($k, $v) = each %MAP_PREFETCH) {
1971 if (my $map = find $path) { 2037 if (my $map = find $k) {
1972 $map->load; 2038 $map->load if $v;
1973 } 2039 }
1974 2040
1975 delete $MAP_PREFETCH{$path}; 2041 delete $MAP_PREFETCH{$k};
1976 } 2042 }
1977 } 2043 }
1978 undef $MAP_PREFETCHER; 2044 undef $MAP_PREFETCHER;
1979 }; 2045 };
1980 $MAP_PREFETCHER->prio (6); 2046 $MAP_PREFETCHER->prio (6);
… …
1983} 2049}
1984 2050
1985sub save { 2051sub save {
1986 my ($self) = @_; 2052 my ($self) = @_;
1987 2053
1988 my $lock = cf::lock_acquire "map_data:" . $self->path; 2054 my $lock = cf::lock_acquire "map_data:$self->{path}";
1989 2055
1990 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1991 2057
1992 return unless $self->dirty; 2058 return unless $self->dirty;
1993 2059
… …
2016 my ($self) = @_; 2082 my ($self) = @_;
2017 2083
2018 # save first because save cedes 2084 # save first because save cedes
2019 $self->save; 2085 $self->save;
2020 2086
2021 my $lock = cf::lock_acquire "map_data:" . $self->path; 2087 my $lock = cf::lock_acquire "map_data:$self->{path}";
2022 2088
2023 return if $self->players; 2089 return if $self->players;
2024 return if $self->in_memory != cf::MAP_IN_MEMORY; 2090 return if $self->in_memory != cf::MAP_IN_MEMORY;
2025 return if $self->{deny_save}; 2091 return if $self->{deny_save};
2026 2092
2093 $self->in_memory (cf::MAP_SWAPPED);
2094
2095 $self->deactivate;
2096 $_->clear_links_to ($self) for values %cf::MAP;
2027 $self->clear; 2097 $self->clear;
2028 $self->in_memory (cf::MAP_SWAPPED);
2029} 2098}
2030 2099
2031sub reset_at { 2100sub reset_at {
2032 my ($self) = @_; 2101 my ($self) = @_;
2033 2102
… …
2065 if $uniq; 2134 if $uniq;
2066 } 2135 }
2067 2136
2068 delete $cf::MAP{$self->path}; 2137 delete $cf::MAP{$self->path};
2069 2138
2139 $self->deactivate;
2140 $_->clear_links_to ($self) for values %cf::MAP;
2070 $self->clear; 2141 $self->clear;
2071
2072 $_->clear_links_to ($self) for values %cf::MAP;
2073 2142
2074 $self->unlink_save; 2143 $self->unlink_save;
2075 $self->destroy; 2144 $self->destroy;
2076} 2145}
2077 2146
2078my $nuke_counter = "aaaa"; 2147my $nuke_counter = "aaaa";
2079 2148
2080sub nuke { 2149sub nuke {
2081 my ($self) = @_; 2150 my ($self) = @_;
2082 2151
2152 {
2153 my $lock = cf::lock_acquire "map_data:$self->{path}";
2154
2083 delete $cf::MAP{$self->path}; 2155 delete $cf::MAP{$self->path};
2084 2156
2085 $self->unlink_save; 2157 $self->unlink_save;
2086 2158
2087 bless $self, "cf::map"; 2159 bless $self, "cf::map";
2088 delete $self->{deny_reset}; 2160 delete $self->{deny_reset};
2089 $self->{deny_save} = 1; 2161 $self->{deny_save} = 1;
2090 $self->reset_timeout (1); 2162 $self->reset_timeout (1);
2091 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2163 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2092 2164
2093 $cf::MAP{$self->path} = $self; 2165 $cf::MAP{$self->path} = $self;
2166 }
2094 2167
2095 $self->reset; # polite request, might not happen 2168 $self->reset; # polite request, might not happen
2096} 2169}
2097 2170
2098=item $maps = cf::map::tmp_maps 2171=item $maps = cf::map::tmp_maps
… …
2174 2247
2175sub inv_recursive { 2248sub inv_recursive {
2176 inv_recursive_ inv $_[0] 2249 inv_recursive_ inv $_[0]
2177} 2250}
2178 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
2179package cf; 2283package cf;
2180 2284
2181=back 2285=back
2182 2286
2183=head3 cf::object::player 2287=head3 cf::object::player
… …
2492the 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
2493the message unless the client supports the msg packet. 2597the message unless the client supports the msg packet.
2494 2598
2495=cut 2599=cut
2496 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
2497sub cf::client::send_msg { 2616sub cf::client::send_msg {
2498 my ($self, $channel, $msg, $color, @extra) = @_; 2617 my ($self, $channel, $msg, $color, @extra) = @_;
2499 2618
2500 $msg = $self->pl->expand_cfpod ($msg); 2619 $msg = $self->pl->expand_cfpod ($msg);
2501 2620
2502 $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};
2503 2625
2504 if (ref $channel) { 2626 if (ref $channel) {
2505 # send meta info to client, if not yet sent 2627 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) { 2628 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel; 2629 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel); 2630 $self->ext_msg (channel_info => $channel)
2631 if $self->can_msg;
2509 } 2632 }
2510 2633
2511 $channel = $channel->{id}; 2634 $channel = $channel->{id};
2512 } 2635 }
2513 2636
… …
2554=cut 2677=cut
2555 2678
2556sub cf::client::ext_msg($$@) { 2679sub cf::client::ext_msg($$@) {
2557 my ($self, $type, @msg) = @_; 2680 my ($self, $type, @msg) = @_;
2558 2681
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) { 2682 if ($self->extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2683 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove 2684 } elsif ($self->extcmd == 1) { # TODO: remove
2564 push @msg, msgtype => "event_$type"; 2685 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2686 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 } 2687 }
2567} 2688}
2568 2689
… …
2575sub cf::client::ext_reply($$@) { 2696sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_; 2697 my ($self, $id, @msg) = @_;
2577 2698
2578 if ($self->extcmd == 2) { 2699 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2700 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) { 2701 } elsif ($self->extcmd == 1) {
2581 #TODO: version 1, remove 2702 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id; 2703 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2704 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 } 2705 }
2585} 2706}
… …
2728 2849
2729The following functions and methods are available within a safe environment: 2850The following functions and methods are available within a safe environment:
2730 2851
2731 cf::object 2852 cf::object
2732 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
2733 insert remove name archname title slaying race 2854 insert remove name archname title slaying race decrease_ob_nr
2734 2855
2735 cf::object::player 2856 cf::object::player
2736 player 2857 player
2737 2858
2738 cf::player 2859 cf::player
… …
2743 2864
2744=cut 2865=cut
2745 2866
2746for ( 2867for (
2747 ["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
2748 insert remove inv name archname title slaying race)], 2869 insert remove inv name archname title slaying race
2870 decrease_ob_nr)],
2749 ["cf::object::player" => qw(player)], 2871 ["cf::object::player" => qw(player)],
2750 ["cf::player" => qw(peaceful)], 2872 ["cf::player" => qw(peaceful)],
2751 ["cf::map" => qw(trigger)], 2873 ["cf::map" => qw(trigger)],
2752) { 2874) {
2753 no strict 'refs'; 2875 no strict 'refs';
… …
2829# the server's init and main functions 2951# the server's init and main functions
2830 2952
2831sub load_facedata($) { 2953sub load_facedata($) {
2832 my ($path) = @_; 2954 my ($path) = @_;
2833 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
2834 my $enc = JSON::XS->new->utf8->canonical; 2960 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2835 2961
2836 warn "loading facedata from $path\n"; 2962 warn "loading facedata from $path\n";
2837 2963
2838 my $facedata; 2964 my $facedata;
2839 0 < aio_load $path, $facedata 2965 0 < aio_load $path, $facedata
… …
2949 $ns->fx_want ($k, $v); 3075 $ns->fx_want ($k, $v);
2950 } 3076 }
2951}; 3077};
2952 3078
2953sub 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
2954 load_resource_file "$MAPDIR/regions" 3084 load_resource_file "$MAPDIR/regions"
2955 or die "unable to load regions file\n"; 3085 or die "unable to load regions file\n";
2956 3086
2957 for (cf::region::list) { 3087 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/ 3088 $_->{match} = qr/$_->{match}/
… …
2994 3124
2995sub init { 3125sub init {
2996 reload_resources; 3126 reload_resources;
2997} 3127}
2998 3128
2999sub cfg_load { 3129sub reload_config {
3000 open my $fh, "<:utf8", "$CONFDIR/config" 3130 open my $fh, "<:utf8", "$CONFDIR/config"
3001 or return; 3131 or return;
3002 3132
3003 local $/; 3133 local $/;
3004 *CFG = YAML::Syck::Load <$fh>; 3134 *CFG = YAML::Syck::Load <$fh>;
… …
3024 (async { 3154 (async {
3025 Event::one_event; 3155 Event::one_event;
3026 })->prio (Coro::PRIO_MAX); 3156 })->prio (Coro::PRIO_MAX);
3027 }; 3157 };
3028 3158
3029 cfg_load; 3159 reload_config;
3030 db_init; 3160 db_init;
3031 load_extensions; 3161 load_extensions;
3032 3162
3033 $TICK_WATCHER->start; 3163 $TICK_WATCHER->start;
3034 Event::loop; 3164 Event::loop;
… …
3227 warn "reloading cf.pm"; 3357 warn "reloading cf.pm";
3228 require cf; 3358 require cf;
3229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3359 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3230 3360
3231 warn "loading config and database again"; 3361 warn "loading config and database again";
3232 cf::cfg_load; 3362 cf::reload_config;
3233 3363
3234 warn "loading extensions"; 3364 warn "loading extensions";
3235 cf::load_extensions; 3365 cf::load_extensions;
3236 3366
3237 warn "reattaching attachments to objects/players"; 3367 warn "reattaching attachments to objects/players";
… …
3330 or die; 3460 or die;
3331 3461
3332 $map->width (50); 3462 $map->width (50);
3333 $map->height (50); 3463 $map->height (50);
3334 $map->alloc; 3464 $map->alloc;
3335 $map->_load_objects ("/tmp/x.map", 1); 3465 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3336 my $t = Event::time - $t; 3466 my $t = Event::time - $t;
3337 3467
3338 #next unless $t < 0.0013;#d# 3468 #next unless $t < 0.0013;#d#
3339 if ($t < $min) { 3469 if ($t < $min) {
3340 $min = $t; 3470 $min = $t;

Diff Legend

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