… | |
… | |
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 | |
… | |
… | |
285 | 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. |
286 | |
286 | |
287 | =cut |
287 | =cut |
288 | |
288 | |
289 | our %LOCK; |
289 | our %LOCK; |
|
|
290 | our %LOCKER;#d# |
290 | |
291 | |
291 | sub lock_wait($) { |
292 | sub lock_wait($) { |
292 | 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# |
293 | |
299 | |
294 | # wait for lock, if any |
300 | # wait for lock, if any |
295 | while ($LOCK{$key}) { |
301 | while ($LOCK{$key}) { |
296 | push @{ $LOCK{$key} }, $Coro::current; |
302 | push @{ $LOCK{$key} }, $Coro::current; |
297 | Coro::schedule; |
303 | Coro::schedule; |
… | |
… | |
303 | |
309 | |
304 | # wait, to be sure we are not locked |
310 | # wait, to be sure we are not locked |
305 | lock_wait $key; |
311 | lock_wait $key; |
306 | |
312 | |
307 | $LOCK{$key} = []; |
313 | $LOCK{$key} = []; |
|
|
314 | $LOCKER{$key} = $Coro::current;#d# |
308 | |
315 | |
309 | Coro::guard { |
316 | Coro::guard { |
|
|
317 | delete $LOCKER{$key};#d# |
310 | # wake up all waiters, to be on the safe side |
318 | # wake up all waiters, to be on the safe side |
311 | $_->ready for @{ delete $LOCK{$key} }; |
319 | $_->ready for @{ delete $LOCK{$key} }; |
312 | } |
320 | } |
313 | } |
321 | } |
314 | |
322 | |
… | |
… | |
481 | sub fork_call(&@) { |
489 | sub fork_call(&@) { |
482 | my ($cb, @args) = @_; |
490 | my ($cb, @args) = @_; |
483 | |
491 | |
484 | # 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, |
485 | # otherwise perl prematurely frees the stuff :/ |
493 | # otherwise perl prematurely frees the stuff :/ |
486 | # TODO: investigate and fix (liekly this will be rather laborious) |
494 | # TODO: investigate and fix (likely this will be rather laborious) |
487 | |
495 | |
488 | my @res = Coro::Util::fork_eval { |
496 | my @res = Coro::Util::fork_eval { |
489 | reset_signals; |
497 | reset_signals; |
490 | &$cb |
498 | &$cb |
491 | }, @args; |
499 | }, @args; |
… | |
… | |
1004 | }, |
1012 | }, |
1005 | ); |
1013 | ); |
1006 | |
1014 | |
1007 | sub object_freezer_save { |
1015 | sub object_freezer_save { |
1008 | my ($filename, $rdata, $objs) = @_; |
1016 | my ($filename, $rdata, $objs) = @_; |
|
|
1017 | |
|
|
1018 | my $guard = cf::lock_acquire "io"; |
1009 | |
1019 | |
1010 | sync_job { |
1020 | sync_job { |
1011 | if (length $$rdata) { |
1021 | if (length $$rdata) { |
1012 | warn sprintf "saving %s (%d,%d)\n", |
1022 | warn sprintf "saving %s (%d,%d)\n", |
1013 | $filename, length $$rdata, scalar @$objs; |
1023 | $filename, length $$rdata, scalar @$objs; |
… | |
… | |
1037 | } |
1047 | } |
1038 | } else { |
1048 | } else { |
1039 | aio_unlink $filename; |
1049 | aio_unlink $filename; |
1040 | aio_unlink "$filename.pst"; |
1050 | aio_unlink "$filename.pst"; |
1041 | } |
1051 | } |
1042 | } |
1052 | }; |
|
|
1053 | |
|
|
1054 | undef $guard; |
1043 | } |
1055 | } |
1044 | |
1056 | |
1045 | sub object_freezer_as_string { |
1057 | sub object_freezer_as_string { |
1046 | my ($rdata, $objs) = @_; |
1058 | my ($rdata, $objs) = @_; |
1047 | |
1059 | |
… | |
… | |
1052 | |
1064 | |
1053 | sub object_thawer_load { |
1065 | sub object_thawer_load { |
1054 | my ($filename) = @_; |
1066 | my ($filename) = @_; |
1055 | |
1067 | |
1056 | my ($data, $av); |
1068 | my ($data, $av); |
|
|
1069 | |
|
|
1070 | my $guard = cf::lock_acquire "io"; |
1057 | |
1071 | |
1058 | (aio_load $filename, $data) >= 0 |
1072 | (aio_load $filename, $data) >= 0 |
1059 | or return; |
1073 | or return; |
1060 | |
1074 | |
1061 | unless (aio_stat "$filename.pst") { |
1075 | unless (aio_stat "$filename.pst") { |
1062 | (aio_load "$filename.pst", $av) >= 0 |
1076 | (aio_load "$filename.pst", $av) >= 0 |
1063 | or return; |
1077 | or return; |
|
|
1078 | |
|
|
1079 | undef $guard; |
1064 | $av = eval { (Storable::thaw $av)->{objs} }; |
1080 | $av = eval { (Storable::thaw $av)->{objs} }; |
1065 | } |
1081 | } |
1066 | |
1082 | |
1067 | warn sprintf "loading %s (%d)\n", |
1083 | warn sprintf "loading %s (%d)\n", |
1068 | $filename, length $data, scalar @{$av || []}; |
1084 | $filename, length $data, scalar @{$av || []}; |
|
|
1085 | |
1069 | return ($data, $av); |
1086 | ($data, $av) |
1070 | } |
1087 | } |
1071 | |
1088 | |
1072 | =head2 COMMAND CALLBACKS |
1089 | =head2 COMMAND CALLBACKS |
1073 | |
1090 | |
1074 | =over 4 |
1091 | =over 4 |
… | |
… | |
1304 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1321 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1305 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1322 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1306 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1323 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1307 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1324 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1308 | |
1325 | |
1309 | my $pl = load_pl path $login |
1326 | my $f = new_from_file cf::object::thawer path $login |
1310 | 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; |
1311 | $cf::PLAYER{$login} = $pl |
1334 | $cf::PLAYER{$login} = $pl |
1312 | } |
1335 | } |
1313 | } |
1336 | } |
1314 | } |
1337 | } |
1315 | |
1338 | |
… | |
… | |
1413 | or return []; |
1436 | or return []; |
1414 | |
1437 | |
1415 | my @logins; |
1438 | my @logins; |
1416 | |
1439 | |
1417 | 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") { |
1418 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1445 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1419 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1446 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1420 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1447 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1448 | } |
1421 | |
1449 | |
1422 | utf8::decode $login; |
1450 | utf8::decode $login; |
1423 | push @logins, $login; |
1451 | push @logins, $login; |
1424 | } |
1452 | } |
1425 | |
1453 | |
… | |
… | |
1750 | |
1778 | |
1751 | sub load_header_from($) { |
1779 | sub load_header_from($) { |
1752 | my ($self, $path) = @_; |
1780 | my ($self, $path) = @_; |
1753 | |
1781 | |
1754 | utf8::encode $path; |
1782 | utf8::encode $path; |
1755 | #aio_open $path, O_RDONLY, 0 |
1783 | my $f = new_from_file cf::object::thawer $path |
1756 | # or return; |
|
|
1757 | |
|
|
1758 | $self->_load_header ($path) |
|
|
1759 | 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; |
1760 | |
1791 | |
1761 | $self->{load_path} = $path; |
1792 | $self->{load_path} = $path; |
1762 | |
1793 | |
1763 | 1 |
1794 | 1 |
1764 | } |
1795 | } |
… | |
… | |
1818 | sub find { |
1849 | sub find { |
1819 | my ($path, $origin) = @_; |
1850 | my ($path, $origin) = @_; |
1820 | |
1851 | |
1821 | $path = normalise $path, $origin && $origin->path; |
1852 | $path = normalise $path, $origin && $origin->path; |
1822 | |
1853 | |
|
|
1854 | cf::lock_wait "map_data:$path";#d#remove |
1823 | cf::lock_wait "map_find:$path"; |
1855 | cf::lock_wait "map_find:$path"; |
1824 | |
1856 | |
1825 | $cf::MAP{$path} || do { |
1857 | $cf::MAP{$path} || do { |
1826 | 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 | |
1827 | my $map = new_from_path cf::map $path |
1861 | my $map = new_from_path cf::map $path |
1828 | or return; |
1862 | or return; |
1829 | |
1863 | |
1830 | $map->{last_save} = $cf::RUNTIME; |
1864 | $map->{last_save} = $cf::RUNTIME; |
1831 | |
1865 | |
… | |
… | |
1833 | or return; |
1867 | or return; |
1834 | |
1868 | |
1835 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1869 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1836 | # doing this can freeze the server in a sync job, obviously |
1870 | # doing this can freeze the server in a sync job, obviously |
1837 | #$cf::WAIT_FOR_TICK->wait; |
1871 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1872 | undef $guard1; |
|
|
1873 | undef $guard2; |
1838 | $map->reset; |
1874 | $map->reset; |
1839 | undef $guard; |
|
|
1840 | return find $path; |
1875 | return find $path; |
1841 | } |
1876 | } |
1842 | |
1877 | |
1843 | $cf::MAP{$path} = $map |
1878 | $cf::MAP{$path} = $map |
1844 | } |
1879 | } |
… | |
… | |
1853 | local $self->{deny_reset} = 1; # loading can take a long time |
1888 | local $self->{deny_reset} = 1; # loading can take a long time |
1854 | |
1889 | |
1855 | my $path = $self->{path}; |
1890 | my $path = $self->{path}; |
1856 | |
1891 | |
1857 | { |
1892 | { |
1858 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1893 | my $guard = cf::lock_acquire "map_data:$path"; |
1859 | my $guard2 = cf::lock_acquire "map_load:$path"; |
|
|
1860 | |
1894 | |
|
|
1895 | return unless $self->valid; |
1861 | return if $self->in_memory != cf::MAP_SWAPPED; |
1896 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1862 | |
1897 | |
1863 | $self->in_memory (cf::MAP_LOADING); |
1898 | $self->in_memory (cf::MAP_LOADING); |
1864 | |
1899 | |
1865 | $self->alloc; |
1900 | $self->alloc; |
1866 | |
1901 | |
1867 | $self->pre_load; |
1902 | $self->pre_load; |
1868 | cf::cede_to_tick; |
1903 | cf::cede_to_tick; |
1869 | |
1904 | |
|
|
1905 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1906 | $f->skip_block; |
1870 | $self->_load_objects ($self->{load_path}, 1) |
1907 | $self->_load_objects ($f) |
1871 | or return; |
1908 | or return; |
1872 | |
1909 | |
1873 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1910 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1874 | if delete $self->{load_original}; |
1911 | if delete $self->{load_original}; |
1875 | |
1912 | |
1876 | if (my $uniq = $self->uniq_path) { |
1913 | if (my $uniq = $self->uniq_path) { |
1877 | utf8::encode $uniq; |
1914 | utf8::encode $uniq; |
1878 | if (aio_open $uniq, O_RDONLY, 0) { |
1915 | unless (aio_stat $uniq) { |
|
|
1916 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1879 | $self->clear_unique_items; |
1917 | $self->clear_unique_items; |
1880 | $self->_load_objects ($uniq, 0); |
1918 | $self->_load_objects ($f); |
|
|
1919 | $f->resolve_delayed_derefs; |
|
|
1920 | } |
1881 | } |
1921 | } |
1882 | } |
1922 | } |
|
|
1923 | |
|
|
1924 | $f->resolve_delayed_derefs; |
1883 | |
1925 | |
1884 | cf::cede_to_tick; |
1926 | cf::cede_to_tick; |
1885 | # now do the right thing for maps |
1927 | # now do the right thing for maps |
1886 | $self->link_multipart_objects; |
1928 | $self->link_multipart_objects; |
1887 | $self->difficulty ($self->estimate_difficulty) |
1929 | $self->difficulty ($self->estimate_difficulty) |
… | |
… | |
2031 | |
2073 | |
2032 | return if $self->players; |
2074 | return if $self->players; |
2033 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2075 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2034 | return if $self->{deny_save}; |
2076 | return if $self->{deny_save}; |
2035 | |
2077 | |
|
|
2078 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2079 | |
|
|
2080 | $self->deactivate; |
|
|
2081 | $_->clear_links_to ($self) for values %cf::MAP; |
2036 | $self->clear; |
2082 | $self->clear; |
2037 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2038 | } |
2083 | } |
2039 | |
2084 | |
2040 | sub reset_at { |
2085 | sub reset_at { |
2041 | my ($self) = @_; |
2086 | my ($self) = @_; |
2042 | |
2087 | |
… | |
… | |
2074 | if $uniq; |
2119 | if $uniq; |
2075 | } |
2120 | } |
2076 | |
2121 | |
2077 | delete $cf::MAP{$self->path}; |
2122 | delete $cf::MAP{$self->path}; |
2078 | |
2123 | |
|
|
2124 | $self->deactivate; |
|
|
2125 | $_->clear_links_to ($self) for values %cf::MAP; |
2079 | $self->clear; |
2126 | $self->clear; |
2080 | |
|
|
2081 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2082 | |
2127 | |
2083 | $self->unlink_save; |
2128 | $self->unlink_save; |
2084 | $self->destroy; |
2129 | $self->destroy; |
2085 | } |
2130 | } |
2086 | |
2131 | |
… | |
… | |
2185 | map { $_, inv_recursive_ $_->inv } @_ |
2230 | map { $_, inv_recursive_ $_->inv } @_ |
2186 | } |
2231 | } |
2187 | |
2232 | |
2188 | sub inv_recursive { |
2233 | sub inv_recursive { |
2189 | inv_recursive_ inv $_[0] |
2234 | inv_recursive_ inv $_[0] |
|
|
2235 | } |
|
|
2236 | |
|
|
2237 | =item $ref = $ob->ref |
|
|
2238 | |
|
|
2239 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2240 | |
|
|
2241 | =item $ob = cf::object::deref ($refstring) |
|
|
2242 | |
|
|
2243 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2244 | even if the object actually exists. May block. |
|
|
2245 | |
|
|
2246 | =cut |
|
|
2247 | |
|
|
2248 | sub deref { |
|
|
2249 | my ($ref) = @_; |
|
|
2250 | |
|
|
2251 | # temporary compatibility#TODO#remove |
|
|
2252 | $ref =~ s{^<}{player/<}; |
|
|
2253 | |
|
|
2254 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
|
|
2255 | my ($uuid, $name) = ($1, $2); |
|
|
2256 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
|
|
2257 | or return; |
|
|
2258 | $pl->ob->uuid eq $uuid |
|
|
2259 | or return; |
|
|
2260 | |
|
|
2261 | $pl->ob |
|
|
2262 | } else { |
|
|
2263 | warn "$ref: cannot resolve object reference\n"; |
|
|
2264 | undef |
|
|
2265 | } |
2190 | } |
2266 | } |
2191 | |
2267 | |
2192 | package cf; |
2268 | package cf; |
2193 | |
2269 | |
2194 | =back |
2270 | =back |
… | |
… | |
3369 | or die; |
3445 | or die; |
3370 | |
3446 | |
3371 | $map->width (50); |
3447 | $map->width (50); |
3372 | $map->height (50); |
3448 | $map->height (50); |
3373 | $map->alloc; |
3449 | $map->alloc; |
3374 | $map->_load_objects ("/tmp/x.map", 1); |
3450 | $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work |
3375 | my $t = Event::time - $t; |
3451 | my $t = Event::time - $t; |
3376 | |
3452 | |
3377 | #next unless $t < 0.0013;#d# |
3453 | #next unless $t < 0.0013;#d# |
3378 | if ($t < $min) { |
3454 | if ($t < $min) { |
3379 | $min = $t; |
3455 | $min = $t; |