… | |
… | |
21 | use Coro::Semaphore; |
21 | use Coro::Semaphore; |
22 | use Coro::AIO; |
22 | use Coro::AIO; |
23 | use Coro::Storable; |
23 | use Coro::Storable; |
24 | use Coro::Util (); |
24 | use Coro::Util (); |
25 | |
25 | |
26 | use JSON::XS 1.4 (); |
26 | use JSON::XS (); |
27 | use BDB (); |
27 | use BDB (); |
28 | use Data::Dumper; |
28 | use Data::Dumper; |
29 | use Digest::MD5; |
29 | use Digest::MD5; |
30 | use Fcntl; |
30 | use Fcntl; |
31 | use YAML::Syck (); |
31 | use YAML::Syck (); |
… | |
… | |
87 | our %CFG; |
87 | our %CFG; |
88 | |
88 | |
89 | our $UPTIME; $UPTIME ||= time; |
89 | our $UPTIME; $UPTIME ||= time; |
90 | our $RUNTIME; |
90 | our $RUNTIME; |
91 | |
91 | |
92 | our %PLAYER; # all users |
92 | our (%PLAYER, %PLAYER_LOADING); # all users |
93 | our %MAP; # all maps |
93 | our (%MAP, %MAP_LOADING ); # all maps |
94 | our $LINK_MAP; # the special {link} map, which is always available |
94 | our $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 ∕ |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
98 | |
98 | |
… | |
… | |
272 | Wait until the given lock is available and then acquires it and returns |
272 | Wait until the given lock is available and then acquires it and returns |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
273 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
274 | for example when the coroutine gets canceled), the lock is automatically |
274 | for example when the coroutine gets canceled), the lock is automatically |
275 | returned. |
275 | returned. |
276 | |
276 | |
|
|
277 | Locks are *not* recursive, locking from the same coro twice results in a |
|
|
278 | deadlocked coro. |
|
|
279 | |
277 | Lock names should begin with a unique identifier (for example, cf::map::find |
280 | Lock names should begin with a unique identifier (for example, cf::map::find |
278 | uses map_find and cf::map::load uses map_load). |
281 | uses map_find and cf::map::load uses map_load). |
279 | |
282 | |
280 | =item $locked = cf::lock_active $string |
283 | =item $locked = cf::lock_active $string |
281 | |
284 | |
282 | Return true if the lock is currently active, i.e. somebody has locked it. |
285 | Return true if the lock is currently active, i.e. somebody has locked it. |
283 | |
286 | |
284 | =cut |
287 | =cut |
285 | |
288 | |
286 | our %LOCK; |
289 | our %LOCK; |
|
|
290 | our %LOCKER;#d# |
287 | |
291 | |
288 | sub lock_wait($) { |
292 | sub lock_wait($) { |
289 | my ($key) = @_; |
293 | my ($key) = @_; |
|
|
294 | |
|
|
295 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
296 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
297 | return;#d# |
|
|
298 | }#d# |
290 | |
299 | |
291 | # wait for lock, if any |
300 | # wait for lock, if any |
292 | while ($LOCK{$key}) { |
301 | while ($LOCK{$key}) { |
293 | push @{ $LOCK{$key} }, $Coro::current; |
302 | push @{ $LOCK{$key} }, $Coro::current; |
294 | Coro::schedule; |
303 | Coro::schedule; |
… | |
… | |
300 | |
309 | |
301 | # wait, to be sure we are not locked |
310 | # wait, to be sure we are not locked |
302 | lock_wait $key; |
311 | lock_wait $key; |
303 | |
312 | |
304 | $LOCK{$key} = []; |
313 | $LOCK{$key} = []; |
|
|
314 | $LOCKER{$key} = $Coro::current;#d# |
305 | |
315 | |
306 | Coro::guard { |
316 | Coro::guard { |
|
|
317 | delete $LOCKER{$key};#d# |
307 | # wake up all waiters, to be on the safe side |
318 | # wake up all waiters, to be on the safe side |
308 | $_->ready for @{ delete $LOCK{$key} }; |
319 | $_->ready for @{ delete $LOCK{$key} }; |
309 | } |
320 | } |
310 | } |
321 | } |
311 | |
322 | |
… | |
… | |
478 | sub fork_call(&@) { |
489 | sub fork_call(&@) { |
479 | my ($cb, @args) = @_; |
490 | my ($cb, @args) = @_; |
480 | |
491 | |
481 | # we seemingly have to make a local copy of the whole thing, |
492 | # we seemingly have to make a local copy of the whole thing, |
482 | # otherwise perl prematurely frees the stuff :/ |
493 | # otherwise perl prematurely frees the stuff :/ |
483 | # TODO: investigate and fix (liekly this will be rather laborious) |
494 | # TODO: investigate and fix (likely this will be rather laborious) |
484 | |
495 | |
485 | my @res = Coro::Util::fork_eval { |
496 | my @res = Coro::Util::fork_eval { |
486 | reset_signals; |
497 | reset_signals; |
487 | &$cb |
498 | &$cb |
488 | }, @args; |
499 | }, @args; |
… | |
… | |
575 | if (1) { |
586 | if (1) { |
576 | $md5 = |
587 | $md5 = |
577 | join "\x00", |
588 | join "\x00", |
578 | $processversion, |
589 | $processversion, |
579 | map { |
590 | map { |
580 | Coro::cede; |
591 | cf::cede_to_tick; |
581 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
592 | ($src->[$_], Digest::MD5::md5_hex $data[$_]) |
582 | } 0.. $#$src; |
593 | } 0.. $#$src; |
583 | |
594 | |
584 | |
595 | |
585 | my $dbmd5 = db_get cache => "$id/md5"; |
596 | my $dbmd5 = db_get cache => "$id/md5"; |
… | |
… | |
1001 | }, |
1012 | }, |
1002 | ); |
1013 | ); |
1003 | |
1014 | |
1004 | sub object_freezer_save { |
1015 | sub object_freezer_save { |
1005 | my ($filename, $rdata, $objs) = @_; |
1016 | my ($filename, $rdata, $objs) = @_; |
|
|
1017 | |
|
|
1018 | my $guard = cf::lock_acquire "io"; |
1006 | |
1019 | |
1007 | sync_job { |
1020 | sync_job { |
1008 | if (length $$rdata) { |
1021 | if (length $$rdata) { |
1009 | warn sprintf "saving %s (%d,%d)\n", |
1022 | warn sprintf "saving %s (%d,%d)\n", |
1010 | $filename, length $$rdata, scalar @$objs; |
1023 | $filename, length $$rdata, scalar @$objs; |
… | |
… | |
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 | |
1042 | sub object_freezer_as_string { |
1057 | sub object_freezer_as_string { |
1043 | my ($rdata, $objs) = @_; |
1058 | my ($rdata, $objs) = @_; |
1044 | |
1059 | |
… | |
… | |
1049 | |
1064 | |
1050 | sub object_thawer_load { |
1065 | sub 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 | |
1064 | warn sprintf "loading %s (%d)\n", |
1083 | warn sprintf "loading %s (%d)\n", |
1065 | $filename, length $data, scalar @{$av || []}; |
1084 | $filename, length $data, scalar @{$av || []}; |
|
|
1085 | |
1066 | return ($data, $av); |
1086 | ($data, $av) |
1067 | } |
1087 | } |
1068 | |
1088 | |
1069 | =head2 COMMAND CALLBACKS |
1089 | =head2 COMMAND CALLBACKS |
1070 | |
1090 | |
1071 | =over 4 |
1091 | =over 4 |
… | |
… | |
1301 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1321 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1302 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1322 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1303 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1323 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1304 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1324 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1305 | |
1325 | |
1306 | my $pl = load_pl path $login |
1326 | my $f = new_from_file cf::object::thawer path $login |
1307 | or return; |
1327 | or return; |
|
|
1328 | |
|
|
1329 | $f->next; |
|
|
1330 | my $pl = cf::player::load_pl $f |
|
|
1331 | or return; |
|
|
1332 | local $cf::PLAYER_LOADING{$login} = $pl; |
|
|
1333 | $f->resolve_delayed_derefs; |
1308 | $cf::PLAYER{$login} = $pl |
1334 | $cf::PLAYER{$login} = $pl |
1309 | } |
1335 | } |
1310 | } |
1336 | } |
1311 | } |
1337 | } |
1312 | |
1338 | |
… | |
… | |
1322 | |
1348 | |
1323 | aio_mkdir playerdir $pl, 0770; |
1349 | aio_mkdir playerdir $pl, 0770; |
1324 | $pl->{last_save} = $cf::RUNTIME; |
1350 | $pl->{last_save} = $cf::RUNTIME; |
1325 | |
1351 | |
1326 | $pl->save_pl ($path); |
1352 | $pl->save_pl ($path); |
1327 | Coro::cede; |
1353 | cf::cede_to_tick; |
1328 | } |
1354 | } |
1329 | |
1355 | |
1330 | sub new($) { |
1356 | sub new($) { |
1331 | my ($login) = @_; |
1357 | my ($login) = @_; |
1332 | |
1358 | |
… | |
… | |
1410 | or return []; |
1436 | or return []; |
1411 | |
1437 | |
1412 | my @logins; |
1438 | my @logins; |
1413 | |
1439 | |
1414 | for my $login (@$dirs) { |
1440 | for my $login (@$dirs) { |
|
|
1441 | my $path = path $login; |
|
|
1442 | |
|
|
1443 | # a .pst is a dead give-away for a valid player |
|
|
1444 | unless (-e "$path.pst") { |
1415 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1445 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1416 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1446 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1417 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1447 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1448 | } |
1418 | |
1449 | |
1419 | utf8::decode $login; |
1450 | utf8::decode $login; |
1420 | push @logins, $login; |
1451 | push @logins, $login; |
1421 | } |
1452 | } |
1422 | |
1453 | |
… | |
… | |
1460 | sub expand_cfpod { |
1491 | sub expand_cfpod { |
1461 | ((my $self), (local $_)) = @_; |
1492 | ((my $self), (local $_)) = @_; |
1462 | |
1493 | |
1463 | # escape & and < |
1494 | # escape & and < |
1464 | s/&/&/g; |
1495 | s/&/&/g; |
1465 | s/(?<![BIUGH])</</g; |
1496 | s/(?<![BIUGHT])</</g; |
1466 | |
1497 | |
1467 | # this is buggy, it needs to properly take care of nested <'s |
1498 | # this is buggy, it needs to properly take care of nested <'s |
1468 | |
1499 | |
1469 | 1 while |
1500 | 1 while |
1470 | # replace B<>, I<>, U<> etc. |
1501 | # replace B<>, I<>, U<> etc. |
1471 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1502 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1472 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1503 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1473 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1504 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1505 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1474 | # replace G<male|female> tags |
1506 | # replace G<male|female> tags |
1475 | || s{G<([^>|]*)\|([^>]*)>}{ |
1507 | || s{G<([^>|]*)\|([^>]*)>}{ |
1476 | $self->gender ? $2 : $1 |
1508 | $self->gender ? $2 : $1 |
1477 | }ge |
1509 | }ge |
1478 | # replace H<hint text> |
1510 | # replace H<hint text> |
… | |
… | |
1746 | |
1778 | |
1747 | sub load_header_from($) { |
1779 | sub load_header_from($) { |
1748 | my ($self, $path) = @_; |
1780 | my ($self, $path) = @_; |
1749 | |
1781 | |
1750 | utf8::encode $path; |
1782 | utf8::encode $path; |
1751 | #aio_open $path, O_RDONLY, 0 |
1783 | my $f = new_from_file cf::object::thawer $path |
1752 | # or return; |
|
|
1753 | |
|
|
1754 | $self->_load_header ($path) |
|
|
1755 | or return; |
1784 | or return; |
|
|
1785 | |
|
|
1786 | $self->_load_header ($f) |
|
|
1787 | or return; |
|
|
1788 | |
|
|
1789 | local $MAP_LOADING{$self->{path}} = $self; |
|
|
1790 | $f->resolve_delayed_derefs; |
1756 | |
1791 | |
1757 | $self->{load_path} = $path; |
1792 | $self->{load_path} = $path; |
1758 | |
1793 | |
1759 | 1 |
1794 | 1 |
1760 | } |
1795 | } |
… | |
… | |
1814 | sub find { |
1849 | sub find { |
1815 | my ($path, $origin) = @_; |
1850 | my ($path, $origin) = @_; |
1816 | |
1851 | |
1817 | $path = normalise $path, $origin && $origin->path; |
1852 | $path = normalise $path, $origin && $origin->path; |
1818 | |
1853 | |
|
|
1854 | cf::lock_wait "map_data:$path";#d#remove |
1819 | cf::lock_wait "map_find:$path"; |
1855 | cf::lock_wait "map_find:$path"; |
1820 | |
1856 | |
1821 | $cf::MAP{$path} || do { |
1857 | $cf::MAP{$path} || do { |
1822 | my $guard = cf::lock_acquire "map_find:$path"; |
1858 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
1859 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1860 | |
1823 | my $map = new_from_path cf::map $path |
1861 | my $map = new_from_path cf::map $path |
1824 | or return; |
1862 | or return; |
1825 | |
1863 | |
1826 | $map->{last_save} = $cf::RUNTIME; |
1864 | $map->{last_save} = $cf::RUNTIME; |
1827 | |
1865 | |
… | |
… | |
1829 | or return; |
1867 | or return; |
1830 | |
1868 | |
1831 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1869 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1832 | # doing this can freeze the server in a sync job, obviously |
1870 | # doing this can freeze the server in a sync job, obviously |
1833 | #$cf::WAIT_FOR_TICK->wait; |
1871 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1872 | undef $guard1; |
|
|
1873 | undef $guard2; |
1834 | $map->reset; |
1874 | $map->reset; |
1835 | undef $guard; |
|
|
1836 | return find $path; |
1875 | return find $path; |
1837 | } |
1876 | } |
1838 | |
1877 | |
1839 | $cf::MAP{$path} = $map |
1878 | $cf::MAP{$path} = $map |
1840 | } |
1879 | } |
… | |
… | |
1849 | local $self->{deny_reset} = 1; # loading can take a long time |
1888 | local $self->{deny_reset} = 1; # loading can take a long time |
1850 | |
1889 | |
1851 | my $path = $self->{path}; |
1890 | my $path = $self->{path}; |
1852 | |
1891 | |
1853 | { |
1892 | { |
1854 | my $guard = cf::lock_acquire "map_load:$path"; |
1893 | my $guard = cf::lock_acquire "map_data:$path"; |
1855 | |
1894 | |
|
|
1895 | return unless $self->valid; |
1856 | return if $self->in_memory != cf::MAP_SWAPPED; |
1896 | return if $self->in_memory != cf::MAP_SWAPPED; |
1857 | |
1897 | |
1858 | $self->in_memory (cf::MAP_LOADING); |
1898 | $self->in_memory (cf::MAP_LOADING); |
1859 | |
1899 | |
1860 | $self->alloc; |
1900 | $self->alloc; |
1861 | |
1901 | |
1862 | $self->pre_load; |
1902 | $self->pre_load; |
1863 | Coro::cede; |
1903 | cf::cede_to_tick; |
1864 | |
1904 | |
|
|
1905 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1906 | $f->skip_block; |
1865 | $self->_load_objects ($self->{load_path}, 1) |
1907 | $self->_load_objects ($f) |
1866 | or return; |
1908 | or return; |
1867 | |
1909 | |
1868 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1910 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1869 | if delete $self->{load_original}; |
1911 | if delete $self->{load_original}; |
1870 | |
1912 | |
1871 | if (my $uniq = $self->uniq_path) { |
1913 | if (my $uniq = $self->uniq_path) { |
1872 | utf8::encode $uniq; |
1914 | utf8::encode $uniq; |
1873 | if (aio_open $uniq, O_RDONLY, 0) { |
1915 | unless (aio_stat $uniq) { |
|
|
1916 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1874 | $self->clear_unique_items; |
1917 | $self->clear_unique_items; |
1875 | $self->_load_objects ($uniq, 0); |
1918 | $self->_load_objects ($f); |
|
|
1919 | $f->resolve_delayed_derefs; |
|
|
1920 | } |
1876 | } |
1921 | } |
1877 | } |
1922 | } |
1878 | |
1923 | |
1879 | Coro::cede; |
1924 | $f->resolve_delayed_derefs; |
|
|
1925 | |
|
|
1926 | cf::cede_to_tick; |
1880 | # now do the right thing for maps |
1927 | # now do the right thing for maps |
1881 | $self->link_multipart_objects; |
1928 | $self->link_multipart_objects; |
1882 | $self->difficulty ($self->estimate_difficulty) |
1929 | $self->difficulty ($self->estimate_difficulty) |
1883 | unless $self->difficulty; |
1930 | unless $self->difficulty; |
1884 | Coro::cede; |
1931 | cf::cede_to_tick; |
1885 | |
1932 | |
1886 | unless ($self->{deny_activate}) { |
1933 | unless ($self->{deny_activate}) { |
1887 | $self->decay_objects; |
1934 | $self->decay_objects; |
1888 | $self->fix_auto_apply; |
1935 | $self->fix_auto_apply; |
1889 | $self->update_buttons; |
1936 | $self->update_buttons; |
1890 | Coro::cede; |
1937 | cf::cede_to_tick; |
1891 | $self->set_darkness_map; |
1938 | $self->set_darkness_map; |
1892 | Coro::cede; |
1939 | cf::cede_to_tick; |
1893 | $self->activate; |
1940 | $self->activate; |
1894 | } |
1941 | } |
1895 | |
1942 | |
1896 | $self->{last_save} = $cf::RUNTIME; |
1943 | $self->{last_save} = $cf::RUNTIME; |
1897 | $self->last_access ($cf::RUNTIME); |
1944 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
1987 | } |
2034 | } |
1988 | |
2035 | |
1989 | sub save { |
2036 | sub save { |
1990 | my ($self) = @_; |
2037 | my ($self) = @_; |
1991 | |
2038 | |
1992 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2039 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
1993 | |
2040 | |
1994 | $self->{last_save} = $cf::RUNTIME; |
2041 | $self->{last_save} = $cf::RUNTIME; |
1995 | |
2042 | |
1996 | return unless $self->dirty; |
2043 | return unless $self->dirty; |
1997 | |
2044 | |
… | |
… | |
2020 | my ($self) = @_; |
2067 | my ($self) = @_; |
2021 | |
2068 | |
2022 | # save first because save cedes |
2069 | # save first because save cedes |
2023 | $self->save; |
2070 | $self->save; |
2024 | |
2071 | |
2025 | my $lock = cf::lock_acquire "map_data:" . $self->path; |
2072 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2026 | |
2073 | |
2027 | return if $self->players; |
2074 | return if $self->players; |
2028 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2075 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2029 | return if $self->{deny_save}; |
2076 | return if $self->{deny_save}; |
2030 | |
2077 | |
|
|
2078 | $self->deactivate; |
2031 | $self->clear; |
2079 | $self->clear; |
2032 | $self->in_memory (cf::MAP_SWAPPED); |
2080 | $self->in_memory (cf::MAP_SWAPPED); |
2033 | } |
2081 | } |
2034 | |
2082 | |
2035 | sub reset_at { |
2083 | sub reset_at { |
… | |
… | |
2069 | if $uniq; |
2117 | if $uniq; |
2070 | } |
2118 | } |
2071 | |
2119 | |
2072 | delete $cf::MAP{$self->path}; |
2120 | delete $cf::MAP{$self->path}; |
2073 | |
2121 | |
|
|
2122 | $self->deactivate; |
2074 | $self->clear; |
2123 | $self->clear; |
2075 | |
2124 | |
2076 | $_->clear_links_to ($self) for values %cf::MAP; |
2125 | $_->clear_links_to ($self) for values %cf::MAP; |
2077 | |
2126 | |
2078 | $self->unlink_save; |
2127 | $self->unlink_save; |
… | |
… | |
2082 | my $nuke_counter = "aaaa"; |
2131 | my $nuke_counter = "aaaa"; |
2083 | |
2132 | |
2084 | sub nuke { |
2133 | sub nuke { |
2085 | my ($self) = @_; |
2134 | my ($self) = @_; |
2086 | |
2135 | |
|
|
2136 | { |
|
|
2137 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
|
|
2138 | |
2087 | delete $cf::MAP{$self->path}; |
2139 | delete $cf::MAP{$self->path}; |
2088 | |
2140 | |
2089 | $self->unlink_save; |
2141 | $self->unlink_save; |
2090 | |
2142 | |
2091 | bless $self, "cf::map"; |
2143 | bless $self, "cf::map"; |
2092 | delete $self->{deny_reset}; |
2144 | delete $self->{deny_reset}; |
2093 | $self->{deny_save} = 1; |
2145 | $self->{deny_save} = 1; |
2094 | $self->reset_timeout (1); |
2146 | $self->reset_timeout (1); |
2095 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2147 | $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); |
2096 | |
2148 | |
2097 | $cf::MAP{$self->path} = $self; |
2149 | $cf::MAP{$self->path} = $self; |
|
|
2150 | } |
2098 | |
2151 | |
2099 | $self->reset; # polite request, might not happen |
2152 | $self->reset; # polite request, might not happen |
2100 | } |
2153 | } |
2101 | |
2154 | |
2102 | =item $maps = cf::map::tmp_maps |
2155 | =item $maps = cf::map::tmp_maps |
… | |
… | |
2178 | |
2231 | |
2179 | sub inv_recursive { |
2232 | sub inv_recursive { |
2180 | inv_recursive_ inv $_[0] |
2233 | inv_recursive_ inv $_[0] |
2181 | } |
2234 | } |
2182 | |
2235 | |
|
|
2236 | =item $ref = $ob->ref |
|
|
2237 | |
|
|
2238 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2239 | |
|
|
2240 | =item $ob = cf::object::deref ($refstring) |
|
|
2241 | |
|
|
2242 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2243 | even if the object actually exists. May block. |
|
|
2244 | |
|
|
2245 | =cut |
|
|
2246 | |
|
|
2247 | sub deref { |
|
|
2248 | my ($ref) = @_; |
|
|
2249 | |
|
|
2250 | # temporary compatibility#TODO#remove |
|
|
2251 | $ref =~ s{^<}{player/<}; |
|
|
2252 | |
|
|
2253 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
|
|
2254 | my ($uuid, $name) = ($1, $2); |
|
|
2255 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
|
|
2256 | or return; |
|
|
2257 | $pl->ob->uuid eq $uuid |
|
|
2258 | or return; |
|
|
2259 | |
|
|
2260 | $pl->ob |
|
|
2261 | } else { |
|
|
2262 | warn "$ref: cannot resolve object reference\n"; |
|
|
2263 | undef |
|
|
2264 | } |
|
|
2265 | } |
|
|
2266 | |
2183 | package cf; |
2267 | package cf; |
2184 | |
2268 | |
2185 | =back |
2269 | =back |
2186 | |
2270 | |
2187 | =head3 cf::object::player |
2271 | =head3 cf::object::player |
… | |
… | |
2496 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2580 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2497 | the message unless the client supports the msg packet. |
2581 | the message unless the client supports the msg packet. |
2498 | |
2582 | |
2499 | =cut |
2583 | =cut |
2500 | |
2584 | |
|
|
2585 | our %CHANNEL = ( |
|
|
2586 | "c/identify" => { |
|
|
2587 | id => "identify", |
|
|
2588 | title => "Identify", |
|
|
2589 | reply => undef, |
|
|
2590 | tooltip => "Items recently identified", |
|
|
2591 | }, |
|
|
2592 | "c/examine" => { |
|
|
2593 | id => "examine", |
|
|
2594 | title => "Examine", |
|
|
2595 | reply => undef, |
|
|
2596 | tooltip => "Signs and other items you examined", |
|
|
2597 | }, |
|
|
2598 | ); |
|
|
2599 | |
2501 | sub cf::client::send_msg { |
2600 | sub cf::client::send_msg { |
2502 | my ($self, $channel, $msg, $color, @extra) = @_; |
2601 | my ($self, $channel, $msg, $color, @extra) = @_; |
2503 | |
2602 | |
2504 | $msg = $self->pl->expand_cfpod ($msg); |
2603 | $msg = $self->pl->expand_cfpod ($msg); |
2505 | |
2604 | |
2506 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
2605 | $color &= cf::NDI_CLIENT_MASK; # just in case... |
|
|
2606 | |
|
|
2607 | # check predefined channels, for the benefit of C |
|
|
2608 | $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; |
2507 | |
2609 | |
2508 | if (ref $channel) { |
2610 | if (ref $channel) { |
2509 | # send meta info to client, if not yet sent |
2611 | # send meta info to client, if not yet sent |
2510 | unless (exists $self->{channel}{$channel->{id}}) { |
2612 | unless (exists $self->{channel}{$channel->{id}}) { |
2511 | $self->{channel}{$channel->{id}} = $channel; |
2613 | $self->{channel}{$channel->{id}} = $channel; |
2512 | $self->ext_msg (channel_info => $channel); |
2614 | $self->ext_msg (channel_info => $channel) |
|
|
2615 | if $self->can_msg; |
2513 | } |
2616 | } |
2514 | |
2617 | |
2515 | $channel = $channel->{id}; |
2618 | $channel = $channel->{id}; |
2516 | } |
2619 | } |
2517 | |
2620 | |
… | |
… | |
2558 | =cut |
2661 | =cut |
2559 | |
2662 | |
2560 | sub cf::client::ext_msg($$@) { |
2663 | sub cf::client::ext_msg($$@) { |
2561 | my ($self, $type, @msg) = @_; |
2664 | my ($self, $type, @msg) = @_; |
2562 | |
2665 | |
2563 | my $extcmd = $self->extcmd; |
|
|
2564 | |
|
|
2565 | if ($extcmd == 2) { |
2666 | if ($self->extcmd == 2) { |
2566 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2667 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2567 | } elsif ($extcmd == 1) { # TODO: remove |
2668 | } elsif ($self->extcmd == 1) { # TODO: remove |
2568 | push @msg, msgtype => "event_$type"; |
2669 | push @msg, msgtype => "event_$type"; |
2569 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2670 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2570 | } |
2671 | } |
2571 | } |
2672 | } |
2572 | |
2673 | |
… | |
… | |
2579 | sub cf::client::ext_reply($$@) { |
2680 | sub cf::client::ext_reply($$@) { |
2580 | my ($self, $id, @msg) = @_; |
2681 | my ($self, $id, @msg) = @_; |
2581 | |
2682 | |
2582 | if ($self->extcmd == 2) { |
2683 | if ($self->extcmd == 2) { |
2583 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2684 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2584 | } elsif ($self->ns->extcmd == 1) { |
2685 | } elsif ($self->extcmd == 1) { |
2585 | #TODO: version 1, remove |
2686 | #TODO: version 1, remove |
2586 | unshift @msg, msgtype => "reply", msgid => $id; |
2687 | unshift @msg, msgtype => "reply", msgid => $id; |
2587 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2688 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2588 | } |
2689 | } |
2589 | } |
2690 | } |
… | |
… | |
2834 | # the server's init and main functions |
2935 | # the server's init and main functions |
2835 | |
2936 | |
2836 | sub load_facedata($) { |
2937 | sub load_facedata($) { |
2837 | my ($path) = @_; |
2938 | my ($path) = @_; |
2838 | |
2939 | |
|
|
2940 | # HACK to clear player env face cache, we need some signal framework |
|
|
2941 | # for this (global event?) |
|
|
2942 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
2943 | |
2839 | my $enc = JSON::XS->new->utf8->canonical; |
2944 | my $enc = JSON::XS->new->utf8->canonical->relaxed; |
2840 | |
2945 | |
2841 | warn "loading facedata from $path\n"; |
2946 | warn "loading facedata from $path\n"; |
2842 | |
2947 | |
2843 | my $facedata; |
2948 | my $facedata; |
2844 | 0 < aio_load $path, $facedata |
2949 | 0 < aio_load $path, $facedata |
… | |
… | |
2954 | $ns->fx_want ($k, $v); |
3059 | $ns->fx_want ($k, $v); |
2955 | } |
3060 | } |
2956 | }; |
3061 | }; |
2957 | |
3062 | |
2958 | sub reload_regions { |
3063 | sub reload_regions { |
|
|
3064 | # HACK to clear player env face cache, we need some signal framework |
|
|
3065 | # for this (global event?) |
|
|
3066 | %ext::player_env::MUSIC_FACE_CACHE = (); |
|
|
3067 | |
2959 | load_resource_file "$MAPDIR/regions" |
3068 | load_resource_file "$MAPDIR/regions" |
2960 | or die "unable to load regions file\n"; |
3069 | or die "unable to load regions file\n"; |
2961 | |
3070 | |
2962 | for (cf::region::list) { |
3071 | for (cf::region::list) { |
2963 | $_->{match} = qr/$_->{match}/ |
3072 | $_->{match} = qr/$_->{match}/ |
… | |
… | |
2999 | |
3108 | |
3000 | sub init { |
3109 | sub init { |
3001 | reload_resources; |
3110 | reload_resources; |
3002 | } |
3111 | } |
3003 | |
3112 | |
3004 | sub cfg_load { |
3113 | sub reload_config { |
3005 | open my $fh, "<:utf8", "$CONFDIR/config" |
3114 | open my $fh, "<:utf8", "$CONFDIR/config" |
3006 | or return; |
3115 | or return; |
3007 | |
3116 | |
3008 | local $/; |
3117 | local $/; |
3009 | *CFG = YAML::Syck::Load <$fh>; |
3118 | *CFG = YAML::Syck::Load <$fh>; |
… | |
… | |
3029 | (async { |
3138 | (async { |
3030 | Event::one_event; |
3139 | Event::one_event; |
3031 | })->prio (Coro::PRIO_MAX); |
3140 | })->prio (Coro::PRIO_MAX); |
3032 | }; |
3141 | }; |
3033 | |
3142 | |
3034 | cfg_load; |
3143 | reload_config; |
3035 | db_init; |
3144 | db_init; |
3036 | load_extensions; |
3145 | load_extensions; |
3037 | |
3146 | |
3038 | $TICK_WATCHER->start; |
3147 | $TICK_WATCHER->start; |
3039 | Event::loop; |
3148 | Event::loop; |
… | |
… | |
3232 | warn "reloading cf.pm"; |
3341 | warn "reloading cf.pm"; |
3233 | require cf; |
3342 | require cf; |
3234 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3343 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3235 | |
3344 | |
3236 | warn "loading config and database again"; |
3345 | warn "loading config and database again"; |
3237 | cf::cfg_load; |
3346 | cf::reload_config; |
3238 | |
3347 | |
3239 | warn "loading extensions"; |
3348 | warn "loading extensions"; |
3240 | cf::load_extensions; |
3349 | cf::load_extensions; |
3241 | |
3350 | |
3242 | warn "reattaching attachments to objects/players"; |
3351 | warn "reattaching attachments to objects/players"; |
… | |
… | |
3335 | or die; |
3444 | or die; |
3336 | |
3445 | |
3337 | $map->width (50); |
3446 | $map->width (50); |
3338 | $map->height (50); |
3447 | $map->height (50); |
3339 | $map->alloc; |
3448 | $map->alloc; |
3340 | $map->_load_objects ("/tmp/x.map", 1); |
3449 | $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work |
3341 | my $t = Event::time - $t; |
3450 | my $t = Event::time - $t; |
3342 | |
3451 | |
3343 | #next unless $t < 0.0013;#d# |
3452 | #next unless $t < 0.0013;#d# |
3344 | if ($t < $min) { |
3453 | if ($t < $min) { |
3345 | $min = $t; |
3454 | $min = $t; |