… | |
… | |
80 | our $NEXT_TICK; |
80 | our $NEXT_TICK; |
81 | our $NOW; |
81 | our $NOW; |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
82 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
83 | |
83 | |
84 | our $BDB_POLL_WATCHER; |
84 | our $BDB_POLL_WATCHER; |
|
|
85 | our $BDB_CHECKPOINT_WATCHER; |
|
|
86 | our $BDB_TRICKLE_WATCHER; |
85 | our $DB_ENV; |
87 | our $DB_ENV; |
86 | |
88 | |
87 | our %CFG; |
89 | our %CFG; |
88 | |
90 | |
89 | our $UPTIME; $UPTIME ||= time; |
91 | our $UPTIME; $UPTIME ||= time; |
90 | our $RUNTIME; |
92 | our $RUNTIME; |
91 | |
93 | |
92 | our %PLAYER; # all users |
94 | our (%PLAYER, %PLAYER_LOADING); # all users |
93 | our %MAP; # all maps |
95 | our (%MAP, %MAP_LOADING ); # all maps |
94 | our $LINK_MAP; # the special {link} map, which is always available |
96 | our $LINK_MAP; # the special {link} map, which is always available |
95 | |
97 | |
96 | # used to convert map paths into valid unix filenames by replacing / by ∕ |
98 | # used to convert map paths into valid unix filenames by replacing / by ∕ |
97 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
99 | our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons |
98 | |
100 | |
… | |
… | |
187 | $msg .= "\n" |
189 | $msg .= "\n" |
188 | unless $msg =~ /\n$/; |
190 | unless $msg =~ /\n$/; |
189 | |
191 | |
190 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
192 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
191 | |
193 | |
192 | utf8::encode $msg; |
|
|
193 | LOG llevError, $msg; |
194 | LOG llevError, $msg; |
194 | }; |
195 | }; |
195 | } |
196 | } |
196 | |
197 | |
197 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
198 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
… | |
… | |
285 | Return true if the lock is currently active, i.e. somebody has locked it. |
286 | Return true if the lock is currently active, i.e. somebody has locked it. |
286 | |
287 | |
287 | =cut |
288 | =cut |
288 | |
289 | |
289 | our %LOCK; |
290 | our %LOCK; |
|
|
291 | our %LOCKER;#d# |
290 | |
292 | |
291 | sub lock_wait($) { |
293 | sub lock_wait($) { |
292 | my ($key) = @_; |
294 | my ($key) = @_; |
|
|
295 | |
|
|
296 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
297 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
298 | return;#d# |
|
|
299 | }#d# |
293 | |
300 | |
294 | # wait for lock, if any |
301 | # wait for lock, if any |
295 | while ($LOCK{$key}) { |
302 | while ($LOCK{$key}) { |
296 | push @{ $LOCK{$key} }, $Coro::current; |
303 | push @{ $LOCK{$key} }, $Coro::current; |
297 | Coro::schedule; |
304 | Coro::schedule; |
… | |
… | |
303 | |
310 | |
304 | # wait, to be sure we are not locked |
311 | # wait, to be sure we are not locked |
305 | lock_wait $key; |
312 | lock_wait $key; |
306 | |
313 | |
307 | $LOCK{$key} = []; |
314 | $LOCK{$key} = []; |
|
|
315 | $LOCKER{$key} = $Coro::current;#d# |
308 | |
316 | |
309 | Coro::guard { |
317 | Coro::guard { |
|
|
318 | delete $LOCKER{$key};#d# |
310 | # wake up all waiters, to be on the safe side |
319 | # wake up all waiters, to be on the safe side |
311 | $_->ready for @{ delete $LOCK{$key} }; |
320 | $_->ready for @{ delete $LOCK{$key} }; |
312 | } |
321 | } |
313 | } |
322 | } |
314 | |
323 | |
… | |
… | |
481 | sub fork_call(&@) { |
490 | sub fork_call(&@) { |
482 | my ($cb, @args) = @_; |
491 | my ($cb, @args) = @_; |
483 | |
492 | |
484 | # we seemingly have to make a local copy of the whole thing, |
493 | # we seemingly have to make a local copy of the whole thing, |
485 | # otherwise perl prematurely frees the stuff :/ |
494 | # otherwise perl prematurely frees the stuff :/ |
486 | # TODO: investigate and fix (liekly this will be rather laborious) |
495 | # TODO: investigate and fix (likely this will be rather laborious) |
487 | |
496 | |
488 | my @res = Coro::Util::fork_eval { |
497 | my @res = Coro::Util::fork_eval { |
489 | reset_signals; |
498 | reset_signals; |
490 | &$cb |
499 | &$cb |
491 | }, @args; |
500 | }, @args; |
… | |
… | |
500 | =item cf::db_put $family => $key => $value |
509 | =item cf::db_put $family => $key => $value |
501 | |
510 | |
502 | Stores the given C<$value> in the family. It can currently store binary |
511 | Stores the given C<$value> in the family. It can currently store binary |
503 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
512 | data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). |
504 | |
513 | |
|
|
514 | =item $db = cf::db_table "name" |
|
|
515 | |
|
|
516 | Create and/or open a new database table. The string must not be "db" and must be unique |
|
|
517 | within each server. |
|
|
518 | |
505 | =cut |
519 | =cut |
|
|
520 | |
|
|
521 | sub db_table($) { |
|
|
522 | my ($name) = @_; |
|
|
523 | my $db = BDB::db_create $DB_ENV; |
|
|
524 | |
|
|
525 | eval { |
|
|
526 | $db->set_flags (BDB::CHKSUM); |
|
|
527 | |
|
|
528 | utf8::encode $name; |
|
|
529 | BDB::db_open $db, undef, $name, undef, BDB::BTREE, |
|
|
530 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
531 | cf::cleanup "db_open(db): $!" if $!; |
|
|
532 | }; |
|
|
533 | cf::cleanup "db_open(db): $@" if $@; |
|
|
534 | |
|
|
535 | $db |
|
|
536 | } |
506 | |
537 | |
507 | our $DB; |
538 | our $DB; |
508 | |
539 | |
509 | sub db_init { |
540 | sub db_init { |
510 | unless ($DB) { |
|
|
511 | $DB = BDB::db_create $DB_ENV; |
|
|
512 | |
|
|
513 | cf::sync_job { |
541 | cf::sync_job { |
514 | eval { |
542 | $DB ||= db_table "db"; |
515 | $DB->set_flags (BDB::CHKSUM); |
|
|
516 | |
|
|
517 | BDB::db_open $DB, undef, "db", undef, BDB::BTREE, |
|
|
518 | BDB::CREATE | BDB::AUTO_COMMIT, 0666; |
|
|
519 | cf::cleanup "db_open(db): $!" if $!; |
|
|
520 | }; |
|
|
521 | cf::cleanup "db_open(db): $@" if $@; |
|
|
522 | }; |
|
|
523 | } |
543 | }; |
524 | } |
544 | } |
525 | |
545 | |
526 | sub db_get($$) { |
546 | sub db_get($$) { |
527 | my $key = "$_[0]/$_[1]"; |
547 | my $key = "$_[0]/$_[1]"; |
528 | |
548 | |
… | |
… | |
1005 | ); |
1025 | ); |
1006 | |
1026 | |
1007 | sub object_freezer_save { |
1027 | sub object_freezer_save { |
1008 | my ($filename, $rdata, $objs) = @_; |
1028 | my ($filename, $rdata, $objs) = @_; |
1009 | |
1029 | |
|
|
1030 | my $guard = cf::lock_acquire "io"; |
|
|
1031 | |
1010 | sync_job { |
1032 | sync_job { |
1011 | if (length $$rdata) { |
1033 | if (length $$rdata) { |
|
|
1034 | utf8::decode (my $decname = $filename); |
1012 | warn sprintf "saving %s (%d,%d)\n", |
1035 | warn sprintf "saving %s (%d,%d)\n", |
1013 | $filename, length $$rdata, scalar @$objs; |
1036 | $decname, length $$rdata, scalar @$objs; |
1014 | |
1037 | |
1015 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1038 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1016 | chmod SAVE_MODE, $fh; |
1039 | chmod SAVE_MODE, $fh; |
1017 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1040 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1018 | aio_fsync $fh if $cf::USE_FSYNC; |
1041 | aio_fsync $fh if $cf::USE_FSYNC; |
… | |
… | |
1037 | } |
1060 | } |
1038 | } else { |
1061 | } else { |
1039 | aio_unlink $filename; |
1062 | aio_unlink $filename; |
1040 | aio_unlink "$filename.pst"; |
1063 | aio_unlink "$filename.pst"; |
1041 | } |
1064 | } |
1042 | } |
1065 | }; |
|
|
1066 | |
|
|
1067 | undef $guard; |
1043 | } |
1068 | } |
1044 | |
1069 | |
1045 | sub object_freezer_as_string { |
1070 | sub object_freezer_as_string { |
1046 | my ($rdata, $objs) = @_; |
1071 | my ($rdata, $objs) = @_; |
1047 | |
1072 | |
… | |
… | |
1052 | |
1077 | |
1053 | sub object_thawer_load { |
1078 | sub object_thawer_load { |
1054 | my ($filename) = @_; |
1079 | my ($filename) = @_; |
1055 | |
1080 | |
1056 | my ($data, $av); |
1081 | my ($data, $av); |
|
|
1082 | |
|
|
1083 | my $guard = cf::lock_acquire "io"; |
1057 | |
1084 | |
1058 | (aio_load $filename, $data) >= 0 |
1085 | (aio_load $filename, $data) >= 0 |
1059 | or return; |
1086 | or return; |
1060 | |
1087 | |
1061 | unless (aio_stat "$filename.pst") { |
1088 | unless (aio_stat "$filename.pst") { |
1062 | (aio_load "$filename.pst", $av) >= 0 |
1089 | (aio_load "$filename.pst", $av) >= 0 |
1063 | or return; |
1090 | or return; |
|
|
1091 | |
|
|
1092 | undef $guard; |
1064 | $av = eval { (Storable::thaw $av)->{objs} }; |
1093 | $av = eval { (Storable::thaw $av)->{objs} }; |
1065 | } |
1094 | } |
1066 | |
1095 | |
|
|
1096 | utf8::decode (my $decname = $filename); |
1067 | warn sprintf "loading %s (%d)\n", |
1097 | warn sprintf "loading %s (%d,%d)\n", |
1068 | $filename, length $data, scalar @{$av || []}; |
1098 | $decname, length $data, scalar @{$av || []}; |
|
|
1099 | |
1069 | return ($data, $av); |
1100 | ($data, $av) |
1070 | } |
1101 | } |
1071 | |
1102 | |
1072 | =head2 COMMAND CALLBACKS |
1103 | =head2 COMMAND CALLBACKS |
1073 | |
1104 | |
1074 | =over 4 |
1105 | =over 4 |
… | |
… | |
1260 | |
1291 | |
1261 | =head3 cf::player |
1292 | =head3 cf::player |
1262 | |
1293 | |
1263 | =over 4 |
1294 | =over 4 |
1264 | |
1295 | |
|
|
1296 | =item cf::player::num_playing |
|
|
1297 | |
|
|
1298 | Returns the official number of playing players, as per the Crossfire metaserver rules. |
|
|
1299 | |
|
|
1300 | =cut |
|
|
1301 | |
|
|
1302 | sub num_playing { |
|
|
1303 | scalar grep |
|
|
1304 | $_->ob->map |
|
|
1305 | && !$_->hidden |
|
|
1306 | && !$_->ob->flag (cf::FLAG_WIZ), |
|
|
1307 | cf::player::list |
|
|
1308 | } |
|
|
1309 | |
1265 | =item cf::player::find $login |
1310 | =item cf::player::find $login |
1266 | |
1311 | |
1267 | Returns the given player object, loading it if necessary (might block). |
1312 | Returns the given player object, loading it if necessary (might block). |
1268 | |
1313 | |
1269 | =cut |
1314 | =cut |
… | |
… | |
1304 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1349 | aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; |
1305 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1350 | aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; |
1306 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1351 | aio_unlink +(playerdir $login) . "/$login.pl.pst"; |
1307 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1352 | aio_unlink +(playerdir $login) . "/$login.pl"; |
1308 | |
1353 | |
1309 | my $pl = load_pl path $login |
1354 | my $f = new_from_file cf::object::thawer path $login |
1310 | or return; |
1355 | or return; |
|
|
1356 | |
|
|
1357 | $f->next; |
|
|
1358 | my $pl = cf::player::load_pl $f |
|
|
1359 | or return; |
|
|
1360 | local $cf::PLAYER_LOADING{$login} = $pl; |
|
|
1361 | $f->resolve_delayed_derefs; |
1311 | $cf::PLAYER{$login} = $pl |
1362 | $cf::PLAYER{$login} = $pl |
1312 | } |
1363 | } |
1313 | } |
1364 | } |
1314 | } |
1365 | } |
1315 | |
1366 | |
… | |
… | |
1413 | or return []; |
1464 | or return []; |
1414 | |
1465 | |
1415 | my @logins; |
1466 | my @logins; |
1416 | |
1467 | |
1417 | for my $login (@$dirs) { |
1468 | for my $login (@$dirs) { |
|
|
1469 | my $path = path $login; |
|
|
1470 | |
|
|
1471 | # a .pst is a dead give-away for a valid player |
|
|
1472 | unless (-e "$path.pst") { |
1418 | my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; |
1473 | my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; |
1419 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1474 | aio_read $fh, 0, 512, my $buf, 0 or next; |
1420 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
1475 | $buf !~ /^password -------------$/m or next; # official not-valid tag |
|
|
1476 | } |
1421 | |
1477 | |
1422 | utf8::decode $login; |
1478 | utf8::decode $login; |
1423 | push @logins, $login; |
1479 | push @logins, $login; |
1424 | } |
1480 | } |
1425 | |
1481 | |
… | |
… | |
1463 | sub expand_cfpod { |
1519 | sub expand_cfpod { |
1464 | ((my $self), (local $_)) = @_; |
1520 | ((my $self), (local $_)) = @_; |
1465 | |
1521 | |
1466 | # escape & and < |
1522 | # escape & and < |
1467 | s/&/&/g; |
1523 | s/&/&/g; |
1468 | s/(?<![BIUGH])</</g; |
1524 | s/(?<![BIUGHT])</</g; |
1469 | |
1525 | |
1470 | # this is buggy, it needs to properly take care of nested <'s |
1526 | # this is buggy, it needs to properly take care of nested <'s |
1471 | |
1527 | |
1472 | 1 while |
1528 | 1 while |
1473 | # replace B<>, I<>, U<> etc. |
1529 | # replace B<>, I<>, U<> etc. |
1474 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1530 | s/B<([^\>]*)>/<b>$1<\/b>/ |
1475 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1531 | || s/I<([^\>]*)>/<i>$1<\/i>/ |
1476 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
1532 | || s/U<([^\>]*)>/<u>$1<\/u>/ |
|
|
1533 | || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/ |
1477 | # replace G<male|female> tags |
1534 | # replace G<male|female> tags |
1478 | || s{G<([^>|]*)\|([^>]*)>}{ |
1535 | || s{G<([^>|]*)\|([^>]*)>}{ |
1479 | $self->gender ? $2 : $1 |
1536 | $self->gender ? $2 : $1 |
1480 | }ge |
1537 | }ge |
1481 | # replace H<hint text> |
1538 | # replace H<hint text> |
… | |
… | |
1749 | |
1806 | |
1750 | sub load_header_from($) { |
1807 | sub load_header_from($) { |
1751 | my ($self, $path) = @_; |
1808 | my ($self, $path) = @_; |
1752 | |
1809 | |
1753 | utf8::encode $path; |
1810 | utf8::encode $path; |
1754 | #aio_open $path, O_RDONLY, 0 |
1811 | my $f = new_from_file cf::object::thawer $path |
1755 | # or return; |
|
|
1756 | |
|
|
1757 | $self->_load_header ($path) |
|
|
1758 | or return; |
1812 | or return; |
|
|
1813 | |
|
|
1814 | $self->_load_header ($f) |
|
|
1815 | or return; |
|
|
1816 | |
|
|
1817 | local $MAP_LOADING{$self->{path}} = $self; |
|
|
1818 | $f->resolve_delayed_derefs; |
1759 | |
1819 | |
1760 | $self->{load_path} = $path; |
1820 | $self->{load_path} = $path; |
1761 | |
1821 | |
1762 | 1 |
1822 | 1 |
1763 | } |
1823 | } |
… | |
… | |
1817 | sub find { |
1877 | sub find { |
1818 | my ($path, $origin) = @_; |
1878 | my ($path, $origin) = @_; |
1819 | |
1879 | |
1820 | $path = normalise $path, $origin && $origin->path; |
1880 | $path = normalise $path, $origin && $origin->path; |
1821 | |
1881 | |
|
|
1882 | cf::lock_wait "map_data:$path";#d#remove |
1822 | cf::lock_wait "map_find:$path"; |
1883 | cf::lock_wait "map_find:$path"; |
1823 | |
1884 | |
1824 | $cf::MAP{$path} || do { |
1885 | $cf::MAP{$path} || do { |
1825 | my $guard = cf::lock_acquire "map_find:$path"; |
1886 | my $guard1 = cf::lock_acquire "map_find:$path"; |
|
|
1887 | my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1888 | |
1826 | my $map = new_from_path cf::map $path |
1889 | my $map = new_from_path cf::map $path |
1827 | or return; |
1890 | or return; |
1828 | |
1891 | |
1829 | $map->{last_save} = $cf::RUNTIME; |
1892 | $map->{last_save} = $cf::RUNTIME; |
1830 | |
1893 | |
… | |
… | |
1832 | or return; |
1895 | or return; |
1833 | |
1896 | |
1834 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1897 | if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) |
1835 | # doing this can freeze the server in a sync job, obviously |
1898 | # doing this can freeze the server in a sync job, obviously |
1836 | #$cf::WAIT_FOR_TICK->wait; |
1899 | #$cf::WAIT_FOR_TICK->wait; |
|
|
1900 | undef $guard1; |
|
|
1901 | undef $guard2; |
1837 | $map->reset; |
1902 | $map->reset; |
1838 | undef $guard; |
|
|
1839 | return find $path; |
1903 | return find $path; |
1840 | } |
1904 | } |
1841 | |
1905 | |
1842 | $cf::MAP{$path} = $map |
1906 | $cf::MAP{$path} = $map |
1843 | } |
1907 | } |
… | |
… | |
1852 | local $self->{deny_reset} = 1; # loading can take a long time |
1916 | local $self->{deny_reset} = 1; # loading can take a long time |
1853 | |
1917 | |
1854 | my $path = $self->{path}; |
1918 | my $path = $self->{path}; |
1855 | |
1919 | |
1856 | { |
1920 | { |
1857 | my $guard1 = cf::lock_acquire "map_data:$path"; |
1921 | my $guard = cf::lock_acquire "map_data:$path"; |
1858 | my $guard2 = cf::lock_acquire "map_load:$path"; |
|
|
1859 | |
1922 | |
|
|
1923 | return unless $self->valid; |
1860 | return if $self->in_memory != cf::MAP_SWAPPED; |
1924 | return unless $self->in_memory == cf::MAP_SWAPPED; |
1861 | |
1925 | |
1862 | $self->in_memory (cf::MAP_LOADING); |
1926 | $self->in_memory (cf::MAP_LOADING); |
1863 | |
1927 | |
1864 | $self->alloc; |
1928 | $self->alloc; |
1865 | |
1929 | |
1866 | $self->pre_load; |
1930 | $self->pre_load; |
1867 | cf::cede_to_tick; |
1931 | cf::cede_to_tick; |
1868 | |
1932 | |
|
|
1933 | my $f = new_from_file cf::object::thawer $self->{load_path}; |
|
|
1934 | $f->skip_block; |
1869 | $self->_load_objects ($self->{load_path}, 1) |
1935 | $self->_load_objects ($f) |
1870 | or return; |
1936 | or return; |
1871 | |
1937 | |
1872 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1938 | $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) |
1873 | if delete $self->{load_original}; |
1939 | if delete $self->{load_original}; |
1874 | |
1940 | |
1875 | if (my $uniq = $self->uniq_path) { |
1941 | if (my $uniq = $self->uniq_path) { |
1876 | utf8::encode $uniq; |
1942 | utf8::encode $uniq; |
1877 | if (aio_open $uniq, O_RDONLY, 0) { |
1943 | unless (aio_stat $uniq) { |
|
|
1944 | if (my $f = new_from_file cf::object::thawer $uniq) { |
1878 | $self->clear_unique_items; |
1945 | $self->clear_unique_items; |
1879 | $self->_load_objects ($uniq, 0); |
1946 | $self->_load_objects ($f); |
|
|
1947 | $f->resolve_delayed_derefs; |
|
|
1948 | } |
1880 | } |
1949 | } |
1881 | } |
1950 | } |
|
|
1951 | |
|
|
1952 | $f->resolve_delayed_derefs; |
1882 | |
1953 | |
1883 | cf::cede_to_tick; |
1954 | cf::cede_to_tick; |
1884 | # now do the right thing for maps |
1955 | # now do the right thing for maps |
1885 | $self->link_multipart_objects; |
1956 | $self->link_multipart_objects; |
1886 | $self->difficulty ($self->estimate_difficulty) |
1957 | $self->difficulty ($self->estimate_difficulty) |
… | |
… | |
2030 | |
2101 | |
2031 | return if $self->players; |
2102 | return if $self->players; |
2032 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2103 | return if $self->in_memory != cf::MAP_IN_MEMORY; |
2033 | return if $self->{deny_save}; |
2104 | return if $self->{deny_save}; |
2034 | |
2105 | |
|
|
2106 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2107 | |
|
|
2108 | $self->deactivate; |
|
|
2109 | $_->clear_links_to ($self) for values %cf::MAP; |
2035 | $self->clear; |
2110 | $self->clear; |
2036 | $self->in_memory (cf::MAP_SWAPPED); |
|
|
2037 | } |
2111 | } |
2038 | |
2112 | |
2039 | sub reset_at { |
2113 | sub reset_at { |
2040 | my ($self) = @_; |
2114 | my ($self) = @_; |
2041 | |
2115 | |
… | |
… | |
2073 | if $uniq; |
2147 | if $uniq; |
2074 | } |
2148 | } |
2075 | |
2149 | |
2076 | delete $cf::MAP{$self->path}; |
2150 | delete $cf::MAP{$self->path}; |
2077 | |
2151 | |
|
|
2152 | $self->deactivate; |
|
|
2153 | $_->clear_links_to ($self) for values %cf::MAP; |
2078 | $self->clear; |
2154 | $self->clear; |
2079 | |
|
|
2080 | $_->clear_links_to ($self) for values %cf::MAP; |
|
|
2081 | |
2155 | |
2082 | $self->unlink_save; |
2156 | $self->unlink_save; |
2083 | $self->destroy; |
2157 | $self->destroy; |
2084 | } |
2158 | } |
2085 | |
2159 | |
… | |
… | |
2186 | |
2260 | |
2187 | sub inv_recursive { |
2261 | sub inv_recursive { |
2188 | inv_recursive_ inv $_[0] |
2262 | inv_recursive_ inv $_[0] |
2189 | } |
2263 | } |
2190 | |
2264 | |
|
|
2265 | =item $ref = $ob->ref |
|
|
2266 | |
|
|
2267 | creates and returns a persistent reference to an objetc that can be stored as a string. |
|
|
2268 | |
|
|
2269 | =item $ob = cf::object::deref ($refstring) |
|
|
2270 | |
|
|
2271 | returns the objetc referenced by refstring. may return undef when it cnanot find the object, |
|
|
2272 | even if the object actually exists. May block. |
|
|
2273 | |
|
|
2274 | =cut |
|
|
2275 | |
|
|
2276 | sub deref { |
|
|
2277 | my ($ref) = @_; |
|
|
2278 | |
|
|
2279 | # temporary compatibility#TODO#remove |
|
|
2280 | $ref =~ s{^<}{player/<}; |
|
|
2281 | |
|
|
2282 | if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { |
|
|
2283 | my ($uuid, $name) = ($1, $2); |
|
|
2284 | my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name |
|
|
2285 | or return; |
|
|
2286 | $pl->ob->uuid eq $uuid |
|
|
2287 | or return; |
|
|
2288 | |
|
|
2289 | $pl->ob |
|
|
2290 | } else { |
|
|
2291 | warn "$ref: cannot resolve object reference\n"; |
|
|
2292 | undef |
|
|
2293 | } |
|
|
2294 | } |
|
|
2295 | |
2191 | package cf; |
2296 | package cf; |
2192 | |
2297 | |
2193 | =back |
2298 | =back |
2194 | |
2299 | |
2195 | =head3 cf::object::player |
2300 | =head3 cf::object::player |
… | |
… | |
2353 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2458 | my $gen = $self->{_goto_generation} = ++$GOTOGEN; |
2354 | |
2459 | |
2355 | $self->enter_link; |
2460 | $self->enter_link; |
2356 | |
2461 | |
2357 | (async { |
2462 | (async { |
|
|
2463 | # *tag paths override both path and x|y |
|
|
2464 | if ($path =~ /^\*(.*)$/) { |
|
|
2465 | if (my @obs = grep $_->map, ext::map_tags::find $1) { |
|
|
2466 | my $ob = $obs[rand @obs]; |
|
|
2467 | |
|
|
2468 | # see if we actually can go there |
|
|
2469 | if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { |
|
|
2470 | $ob = $obs[rand @obs]; |
|
|
2471 | } else { |
|
|
2472 | $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED); |
|
|
2473 | } |
|
|
2474 | # else put us there anyways for now #d# |
|
|
2475 | |
|
|
2476 | ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); |
|
|
2477 | } else { |
|
|
2478 | ($path, $x, $y) = (undef, undef, undef); |
|
|
2479 | } |
|
|
2480 | } |
|
|
2481 | |
2358 | my $map = eval { |
2482 | my $map = eval { |
2359 | my $map = cf::map::find $path; |
2483 | my $map = defined $path ? cf::map::find $path : undef; |
2360 | |
2484 | |
2361 | if ($map) { |
2485 | if ($map) { |
2362 | $map = $map->customise_for ($self); |
2486 | $map = $map->customise_for ($self); |
2363 | $map = $check->($map) if $check && $map; |
2487 | $map = $check->($map) if $check && $map; |
2364 | } else { |
2488 | } else { |
2365 | $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); |
2489 | $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); |
2366 | } |
2490 | } |
2367 | |
2491 | |
2368 | $map |
2492 | $map |
2369 | }; |
2493 | }; |
2370 | |
2494 | |
… | |
… | |
2511 | id => "identify", |
2635 | id => "identify", |
2512 | title => "Identify", |
2636 | title => "Identify", |
2513 | reply => undef, |
2637 | reply => undef, |
2514 | tooltip => "Items recently identified", |
2638 | tooltip => "Items recently identified", |
2515 | }, |
2639 | }, |
|
|
2640 | "c/examine" => { |
|
|
2641 | id => "examine", |
|
|
2642 | title => "Examine", |
|
|
2643 | reply => undef, |
|
|
2644 | tooltip => "Signs and other items you examined", |
|
|
2645 | }, |
2516 | ); |
2646 | ); |
2517 | |
2647 | |
2518 | sub cf::client::send_msg { |
2648 | sub cf::client::send_msg { |
2519 | my ($self, $channel, $msg, $color, @extra) = @_; |
2649 | my ($self, $channel, $msg, $color, @extra) = @_; |
2520 | |
2650 | |
… | |
… | |
2527 | |
2657 | |
2528 | if (ref $channel) { |
2658 | if (ref $channel) { |
2529 | # send meta info to client, if not yet sent |
2659 | # send meta info to client, if not yet sent |
2530 | unless (exists $self->{channel}{$channel->{id}}) { |
2660 | unless (exists $self->{channel}{$channel->{id}}) { |
2531 | $self->{channel}{$channel->{id}} = $channel; |
2661 | $self->{channel}{$channel->{id}} = $channel; |
2532 | $self->ext_msg (channel_info => $channel); |
2662 | $self->ext_msg (channel_info => $channel) |
|
|
2663 | if $self->can_msg; |
2533 | } |
2664 | } |
2534 | |
2665 | |
2535 | $channel = $channel->{id}; |
2666 | $channel = $channel->{id}; |
2536 | } |
2667 | } |
2537 | |
2668 | |
… | |
… | |
3333 | my $signal = new Coro::Signal; |
3464 | my $signal = new Coro::Signal; |
3334 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3465 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3335 | $signal->wait; |
3466 | $signal->wait; |
3336 | } |
3467 | } |
3337 | |
3468 | |
3338 | my $min = 1e6;#d# |
|
|
3339 | my $avg = 10; |
|
|
3340 | $TICK_WATCHER = Event->timer ( |
3469 | $TICK_WATCHER = Event->timer ( |
3341 | reentrant => 0, |
3470 | reentrant => 0, |
3342 | parked => 1, |
3471 | parked => 1, |
3343 | prio => 0, |
3472 | prio => 0, |
3344 | at => $NEXT_TICK || $TICK, |
3473 | at => $NEXT_TICK || $TICK, |
… | |
… | |
3352 | |
3481 | |
3353 | $NOW = $tick_start = Event::time; |
3482 | $NOW = $tick_start = Event::time; |
3354 | |
3483 | |
3355 | cf::server_tick; # one server iteration |
3484 | cf::server_tick; # one server iteration |
3356 | |
3485 | |
3357 | 0 && sync_job {#d# |
|
|
3358 | for(1..10) { |
|
|
3359 | my $t = Event::time; |
|
|
3360 | my $map = my $map = new_from_path cf::map "/tmp/x.map" |
|
|
3361 | or die; |
|
|
3362 | |
|
|
3363 | $map->width (50); |
|
|
3364 | $map->height (50); |
|
|
3365 | $map->alloc; |
|
|
3366 | $map->_load_objects ("/tmp/x.map", 1); |
|
|
3367 | my $t = Event::time - $t; |
|
|
3368 | |
|
|
3369 | #next unless $t < 0.0013;#d# |
|
|
3370 | if ($t < $min) { |
|
|
3371 | $min = $t; |
|
|
3372 | } |
|
|
3373 | $avg = $avg * 0.99 + $t * 0.01; |
|
|
3374 | } |
|
|
3375 | warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d# |
|
|
3376 | exit 0; |
|
|
3377 | # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477 |
|
|
3378 | }; |
|
|
3379 | |
|
|
3380 | $RUNTIME += $TICK; |
3486 | $RUNTIME += $TICK; |
3381 | $NEXT_TICK += $TICK; |
3487 | $NEXT_TICK += $TICK; |
3382 | |
3488 | |
3383 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3489 | if ($NOW >= $NEXT_RUNTIME_WRITE) { |
3384 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
3490 | $NEXT_RUNTIME_WRITE = $NOW + 10; |
… | |
… | |
3386 | write_runtime |
3492 | write_runtime |
3387 | or warn "ERROR: unable to write runtime file: $!"; |
3493 | or warn "ERROR: unable to write runtime file: $!"; |
3388 | }; |
3494 | }; |
3389 | } |
3495 | } |
3390 | |
3496 | |
3391 | # my $AFTER = Event::time; |
|
|
3392 | # warn $AFTER - $NOW;#d# |
|
|
3393 | |
|
|
3394 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3497 | if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { |
3395 | $sig->send; |
3498 | $sig->send; |
3396 | } |
3499 | } |
3397 | while (my $sig = shift @WAIT_FOR_TICK) { |
3500 | while (my $sig = shift @WAIT_FOR_TICK) { |
3398 | $sig->send; |
3501 | $sig->send; |
… | |
… | |
3408 | |
3511 | |
3409 | $LOAD = ($NOW - $tick_start) / $TICK; |
3512 | $LOAD = ($NOW - $tick_start) / $TICK; |
3410 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3513 | $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; |
3411 | |
3514 | |
3412 | _post_tick; |
3515 | _post_tick; |
3413 | |
|
|
3414 | |
|
|
3415 | }, |
3516 | }, |
3416 | ); |
3517 | ); |
3417 | |
3518 | |
3418 | { |
3519 | { |
|
|
3520 | BDB::min_parallel 8; |
3419 | BDB::max_poll_time $TICK * 0.1; |
3521 | BDB::max_poll_time $TICK * 0.1; |
3420 | $BDB_POLL_WATCHER = Event->io ( |
3522 | $BDB_POLL_WATCHER = Event->io ( |
3421 | reentrant => 0, |
3523 | reentrant => 0, |
3422 | fd => BDB::poll_fileno, |
3524 | fd => BDB::poll_fileno, |
3423 | poll => 'r', |
3525 | poll => 'r', |
3424 | prio => 0, |
3526 | prio => 0, |
3425 | data => WF_AUTOCANCEL, |
3527 | data => WF_AUTOCANCEL, |
3426 | cb => \&BDB::poll_cb, |
3528 | cb => \&BDB::poll_cb, |
3427 | ); |
3529 | ); |
3428 | BDB::min_parallel 8; |
|
|
3429 | |
3530 | |
3430 | BDB::set_sync_prepare { |
3531 | BDB::set_sync_prepare { |
3431 | my $status; |
3532 | my $status; |
3432 | my $current = $Coro::current; |
3533 | my $current = $Coro::current; |
3433 | ( |
3534 | ( |
… | |
… | |
3454 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3555 | | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, |
3455 | 0666; |
3556 | 0666; |
3456 | |
3557 | |
3457 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3558 | cf::cleanup "db_env_open($BDBDIR): $!" if $!; |
3458 | |
3559 | |
3459 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); |
3560 | $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC |
|
|
3561 | | BDB::LOG_AUTOREMOVE, 1); |
3460 | $DB_ENV->set_lk_detect; |
3562 | $DB_ENV->set_lk_detect; |
3461 | }; |
3563 | }; |
3462 | |
3564 | |
3463 | cf::cleanup "db_env_open(db): $@" if $@; |
3565 | cf::cleanup "db_env_open(db): $@" if $@; |
3464 | }; |
3566 | }; |
3465 | } |
3567 | } |
|
|
3568 | |
|
|
3569 | $BDB_CHECKPOINT_WATCHER = Event->timer ( |
|
|
3570 | after => 11, |
|
|
3571 | interval => 60, |
|
|
3572 | hard => 1, |
|
|
3573 | prio => 0, |
|
|
3574 | data => WF_AUTOCANCEL, |
|
|
3575 | cb => sub { |
|
|
3576 | BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; |
|
|
3577 | }, |
|
|
3578 | ); |
|
|
3579 | $BDB_TRICKLE_WATCHER = Event->timer ( |
|
|
3580 | after => 5, |
|
|
3581 | interval => 10, |
|
|
3582 | hard => 1, |
|
|
3583 | prio => 0, |
|
|
3584 | data => WF_AUTOCANCEL, |
|
|
3585 | cb => sub { |
|
|
3586 | BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; |
|
|
3587 | }, |
|
|
3588 | ); |
3466 | } |
3589 | } |
3467 | |
3590 | |
3468 | { |
3591 | { |
3469 | IO::AIO::min_parallel 8; |
3592 | IO::AIO::min_parallel 8; |
3470 | |
3593 | |