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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.361 by root, Sun Sep 9 12:52:48 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
86our %CFG; 87our %CFG;
87 88
88our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 90our $RUNTIME;
90 91
91our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
94 95
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 98
… …
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
281Return true if the lock is currently active, i.e. somebody has locked it. 285Return true if the lock is currently active, i.e. somebody has locked it.
282 286
283=cut 287=cut
284 288
285our %LOCK; 289our %LOCK;
290our %LOCKER;#d#
286 291
287sub lock_wait($) { 292sub lock_wait($) {
288 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#
289 299
290 # wait for lock, if any 300 # wait for lock, if any
291 while ($LOCK{$key}) { 301 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 302 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 303 Coro::schedule;
… …
299 309
300 # wait, to be sure we are not locked 310 # wait, to be sure we are not locked
301 lock_wait $key; 311 lock_wait $key;
302 312
303 $LOCK{$key} = []; 313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
304 315
305 Coro::guard { 316 Coro::guard {
317 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 318 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 319 $_->ready for @{ delete $LOCK{$key} };
308 } 320 }
309} 321}
310 322
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 484Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 485never block itself or use any form of Event handling.
474 486
475=cut 487=cut
476 488
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 489sub fork_call(&@) {
487 my ($cb, @args) = @_; 490 my ($cb, @args) = @_;
488 491
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 492 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 493 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 494 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 495
494 if (my $pid = fork) { 496 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 497 reset_signals;
508 local $SIG{__WARN__}; 498 &$cb
509 local $SIG{__DIE__}; 499 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 500
516 eval { 501 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 502}
529 503
530=item $value = cf::db_get $family => $key 504=item $value = cf::db_get $family => $key
531 505
532Returns a single value from the environment database. 506Returns a single value from the environment database.
… …
612 if (1) { 586 if (1) {
613 $md5 = 587 $md5 =
614 join "\x00", 588 join "\x00",
615 $processversion, 589 $processversion,
616 map { 590 map {
617 Coro::cede; 591 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 592 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 593 } 0.. $#$src;
620 594
621 595
622 my $dbmd5 = db_get cache => "$id/md5"; 596 my $dbmd5 = db_get cache => "$id/md5";
… …
1038 }, 1012 },
1039); 1013);
1040 1014
1041sub object_freezer_save { 1015sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1016 my ($filename, $rdata, $objs) = @_;
1017
1018 my $guard = cf::lock_acquire "io";
1043 1019
1044 sync_job { 1020 sync_job {
1045 if (length $$rdata) { 1021 if (length $$rdata) {
1046 warn sprintf "saving %s (%d,%d)\n", 1022 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1023 $filename, length $$rdata, scalar @$objs;
… …
1071 } 1047 }
1072 } else { 1048 } else {
1073 aio_unlink $filename; 1049 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1050 aio_unlink "$filename.pst";
1075 } 1051 }
1076 } 1052 };
1053
1054 undef $guard;
1077} 1055}
1078 1056
1079sub object_freezer_as_string { 1057sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1058 my ($rdata, $objs) = @_;
1081 1059
… …
1086 1064
1087sub object_thawer_load { 1065sub object_thawer_load {
1088 my ($filename) = @_; 1066 my ($filename) = @_;
1089 1067
1090 my ($data, $av); 1068 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1091 1071
1092 (aio_load $filename, $data) >= 0 1072 (aio_load $filename, $data) >= 0
1093 or return; 1073 or return;
1094 1074
1095 unless (aio_stat "$filename.pst") { 1075 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1076 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1077 or return;
1078
1079 undef $guard;
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1080 $av = eval { (Storable::thaw $av)->{objs} };
1099 } 1081 }
1100 1082
1101 warn sprintf "loading %s (%d)\n", 1083 warn sprintf "loading %s (%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1084 $filename, length $data, scalar @{$av || []};
1085
1103 return ($data, $av); 1086 ($data, $av)
1104} 1087}
1105 1088
1106=head2 COMMAND CALLBACKS 1089=head2 COMMAND CALLBACKS
1107 1090
1108=over 4 1091=over 4
… …
1186 my ($type, $reply, @payload) = 1169 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1170 "ARRAY" eq ref $msg
1188 ? @$msg 1171 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1172 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1173
1174 my @reply;
1175
1191 if (my $cb = $EXTCMD{$type}) { 1176 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1177 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1178 }
1179
1180 $pl->ext_reply ($reply, @reply)
1181 if $reply;
1182
1197 } else { 1183 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1184 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1185 }
1200 1186
1201 cf::override; 1187 cf::override;
… …
1291 1277
1292=head3 cf::player 1278=head3 cf::player
1293 1279
1294=over 4 1280=over 4
1295 1281
1282=item cf::player::num_playing
1283
1284Returns the official number of playing players, as per the Crossfire metaserver rules.
1285
1286=cut
1287
1288sub num_playing {
1289 scalar grep
1290 $_->ob->map
1291 && !$_->hidden
1292 && !$_->ob->flag (cf::FLAG_WIZ),
1293 cf::player::list
1294}
1295
1296=item cf::player::find $login 1296=item cf::player::find $login
1297 1297
1298Returns the given player object, loading it if necessary (might block). 1298Returns the given player object, loading it if necessary (might block).
1299 1299
1300=cut 1300=cut
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1337 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1338 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1339
1340 my $pl = load_pl path $login 1340 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1341 or return;
1342
1343 $f->next;
1344 my $pl = cf::player::load_pl $f
1345 or return;
1346 local $cf::PLAYER_LOADING{$login} = $pl;
1347 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1348 $cf::PLAYER{$login} = $pl
1343 } 1349 }
1344 } 1350 }
1345} 1351}
1346 1352
… …
1356 1362
1357 aio_mkdir playerdir $pl, 0770; 1363 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1364 $pl->{last_save} = $cf::RUNTIME;
1359 1365
1360 $pl->save_pl ($path); 1366 $pl->save_pl ($path);
1361 Coro::cede; 1367 cf::cede_to_tick;
1362} 1368}
1363 1369
1364sub new($) { 1370sub new($) {
1365 my ($login) = @_; 1371 my ($login) = @_;
1366 1372
… …
1444 or return []; 1450 or return [];
1445 1451
1446 my @logins; 1452 my @logins;
1447 1453
1448 for my $login (@$dirs) { 1454 for my $login (@$dirs) {
1455 my $path = path $login;
1456
1457 # a .pst is a dead give-away for a valid player
1458 unless (-e "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1459 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1460 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1461 $buf !~ /^password -------------$/m or next; # official not-valid tag
1462 }
1452 1463
1453 utf8::decode $login; 1464 utf8::decode $login;
1454 push @logins, $login; 1465 push @logins, $login;
1455 } 1466 }
1456 1467
… …
1494sub expand_cfpod { 1505sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1506 ((my $self), (local $_)) = @_;
1496 1507
1497 # escape & and < 1508 # escape & and <
1498 s/&/&amp;/g; 1509 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1510 s/(?<![BIUGHT])</&lt;/g;
1500 1511
1501 # this is buggy, it needs to properly take care of nested <'s 1512 # this is buggy, it needs to properly take care of nested <'s
1502 1513
1503 1 while 1514 1 while
1504 # replace B<>, I<>, U<> etc. 1515 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1516 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1517 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1518 || s/U<([^\>]*)>/<u>$1<\/u>/
1519 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1520 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1521 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1522 $self->gender ? $2 : $1
1511 }ge 1523 }ge
1512 # replace H<hint text> 1524 # replace H<hint text>
… …
1542=cut 1554=cut
1543 1555
1544sub ext_reply($$@) { 1556sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1557 my ($self, $id, @msg) = @_;
1546 1558
1547 if ($self->ns->extcmd == 2) { 1559 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1560}
1555 1561
1556=item $player->ext_msg ($type, @msg) 1562=item $player->ext_msg ($type, @msg)
1557 1563
1558Sends an ext event to the client. 1564Sends an ext event to the client.
… …
1786 1792
1787sub load_header_from($) { 1793sub load_header_from($) {
1788 my ($self, $path) = @_; 1794 my ($self, $path) = @_;
1789 1795
1790 utf8::encode $path; 1796 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1797 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1798 or return;
1799
1800 $self->_load_header ($f)
1801 or return;
1802
1803 local $MAP_LOADING{$self->{path}} = $self;
1804 $f->resolve_delayed_derefs;
1796 1805
1797 $self->{load_path} = $path; 1806 $self->{load_path} = $path;
1798 1807
1799 1 1808 1
1800} 1809}
… …
1854sub find { 1863sub find {
1855 my ($path, $origin) = @_; 1864 my ($path, $origin) = @_;
1856 1865
1857 $path = normalise $path, $origin && $origin->path; 1866 $path = normalise $path, $origin && $origin->path;
1858 1867
1868 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1869 cf::lock_wait "map_find:$path";
1860 1870
1861 $cf::MAP{$path} || do { 1871 $cf::MAP{$path} || do {
1862 my $guard = cf::lock_acquire "map_find:$path"; 1872 my $guard1 = cf::lock_acquire "map_find:$path";
1873 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1874
1863 my $map = new_from_path cf::map $path 1875 my $map = new_from_path cf::map $path
1864 or return; 1876 or return;
1865 1877
1866 $map->{last_save} = $cf::RUNTIME; 1878 $map->{last_save} = $cf::RUNTIME;
1867 1879
… …
1869 or return; 1881 or return;
1870 1882
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1883 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1884 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1885 #$cf::WAIT_FOR_TICK->wait;
1886 undef $guard1;
1887 undef $guard2;
1874 $map->reset; 1888 $map->reset;
1875 undef $guard;
1876 return find $path; 1889 return find $path;
1877 } 1890 }
1878 1891
1879 $cf::MAP{$path} = $map 1892 $cf::MAP{$path} = $map
1880 } 1893 }
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1902 local $self->{deny_reset} = 1; # loading can take a long time
1890 1903
1891 my $path = $self->{path}; 1904 my $path = $self->{path};
1892 1905
1893 { 1906 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 1907 my $guard = cf::lock_acquire "map_data:$path";
1895 1908
1909 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1910 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 1911
1898 $self->in_memory (cf::MAP_LOADING); 1912 $self->in_memory (cf::MAP_LOADING);
1899 1913
1900 $self->alloc; 1914 $self->alloc;
1901 1915
1902 $self->pre_load; 1916 $self->pre_load;
1903 Coro::cede; 1917 cf::cede_to_tick;
1904 1918
1919 my $f = new_from_file cf::object::thawer $self->{load_path};
1920 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 1921 $self->_load_objects ($f)
1906 or return; 1922 or return;
1907 1923
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1924 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1909 if delete $self->{load_original}; 1925 if delete $self->{load_original};
1910 1926
1911 if (my $uniq = $self->uniq_path) { 1927 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 1928 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 1929 unless (aio_stat $uniq) {
1930 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 1931 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1932 $self->_load_objects ($f);
1933 $f->resolve_delayed_derefs;
1934 }
1916 } 1935 }
1917 } 1936 }
1918 1937
1919 Coro::cede; 1938 $f->resolve_delayed_derefs;
1939
1940 cf::cede_to_tick;
1920 # now do the right thing for maps 1941 # now do the right thing for maps
1921 $self->link_multipart_objects; 1942 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1943 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1944 unless $self->difficulty;
1924 Coro::cede; 1945 cf::cede_to_tick;
1925 1946
1926 unless ($self->{deny_activate}) { 1947 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1948 $self->decay_objects;
1928 $self->fix_auto_apply; 1949 $self->fix_auto_apply;
1929 $self->update_buttons; 1950 $self->update_buttons;
1930 Coro::cede; 1951 cf::cede_to_tick;
1931 $self->set_darkness_map; 1952 $self->set_darkness_map;
1932 Coro::cede; 1953 cf::cede_to_tick;
1933 $self->activate; 1954 $self->activate;
1934 } 1955 }
1935 1956
1936 $self->{last_save} = $cf::RUNTIME; 1957 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1958 $self->last_access ($cf::RUNTIME);
… …
1953 1974
1954 $self 1975 $self
1955} 1976}
1956 1977
1957# find and load all maps in the 3x3 area around a map 1978# find and load all maps in the 3x3 area around a map
1958sub load_diag { 1979sub load_neighbours {
1959 my ($map) = @_; 1980 my ($map) = @_;
1960 1981
1961 my @diag; # diagonal neighbours 1982 my @neigh; # diagonal neighbours
1962 1983
1963 for (0 .. 3) { 1984 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1985 my $neigh = $map->tile_path ($_)
1965 or next; 1986 or next;
1966 $neigh = find $neigh, $map 1987 $neigh = find $neigh, $map
1967 or next; 1988 or next;
1968 $neigh->load; 1989 $neigh->load;
1969 1990
1991 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1992 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1993 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1994 }
1973 1995
1974 for (@diag) { 1996 for (grep defined $_->[0], @neigh) {
1997 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1998 my $neigh = find $path, $origin
1976 or next; 1999 or next;
1977 $neigh->load; 2000 $neigh->load;
1978 } 2001 }
1979} 2002}
1980 2003
… …
1985} 2008}
1986 2009
1987sub do_load_sync { 2010sub do_load_sync {
1988 my ($map) = @_; 2011 my ($map) = @_;
1989 2012
2013 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2014 if $Coro::current == $Coro::main;
2015
1990 cf::sync_job { $map->load }; 2016 cf::sync_job { $map->load };
1991} 2017}
1992 2018
1993our %MAP_PREFETCH; 2019our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2020our $MAP_PREFETCHER = undef;
1995 2021
1996sub find_async { 2022sub find_async {
1997 my ($path, $origin) = @_; 2023 my ($path, $origin, $load) = @_;
1998 2024
1999 $path = normalise $path, $origin && $origin->{path}; 2025 $path = normalise $path, $origin && $origin->{path};
2000 2026
2001 if (my $map = $cf::MAP{$path}) { 2027 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2028 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 2029 }
2004 2030
2005 undef $MAP_PREFETCH{$path}; 2031 $MAP_PREFETCH{$path} |= $load;
2032
2006 $MAP_PREFETCHER ||= cf::async { 2033 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 2034 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2035 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2036 if (my $map = find $k) {
2010 $map->load; 2037 $map->load if $v;
2011 } 2038 }
2012 2039
2013 delete $MAP_PREFETCH{$path}; 2040 delete $MAP_PREFETCH{$k};
2014 } 2041 }
2015 } 2042 }
2016 undef $MAP_PREFETCHER; 2043 undef $MAP_PREFETCHER;
2017 }; 2044 };
2018 $MAP_PREFETCHER->prio (6); 2045 $MAP_PREFETCHER->prio (6);
… …
2021} 2048}
2022 2049
2023sub save { 2050sub save {
2024 my ($self) = @_; 2051 my ($self) = @_;
2025 2052
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2054
2028 $self->{last_save} = $cf::RUNTIME; 2055 $self->{last_save} = $cf::RUNTIME;
2029 2056
2030 return unless $self->dirty; 2057 return unless $self->dirty;
2031 2058
… …
2054 my ($self) = @_; 2081 my ($self) = @_;
2055 2082
2056 # save first because save cedes 2083 # save first because save cedes
2057 $self->save; 2084 $self->save;
2058 2085
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2086 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2087
2061 return if $self->players; 2088 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2089 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2090 return if $self->{deny_save};
2064 2091
2092 $self->in_memory (cf::MAP_SWAPPED);
2093
2094 $self->deactivate;
2095 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2096 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2097}
2068 2098
2069sub reset_at { 2099sub reset_at {
2070 my ($self) = @_; 2100 my ($self) = @_;
2071 2101
… …
2103 if $uniq; 2133 if $uniq;
2104 } 2134 }
2105 2135
2106 delete $cf::MAP{$self->path}; 2136 delete $cf::MAP{$self->path};
2107 2137
2138 $self->deactivate;
2139 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2140 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2141
2112 $self->unlink_save; 2142 $self->unlink_save;
2113 $self->destroy; 2143 $self->destroy;
2114} 2144}
2115 2145
2116my $nuke_counter = "aaaa"; 2146my $nuke_counter = "aaaa";
2117 2147
2118sub nuke { 2148sub nuke {
2119 my ($self) = @_; 2149 my ($self) = @_;
2120 2150
2151 {
2152 my $lock = cf::lock_acquire "map_data:$self->{path}";
2153
2121 delete $cf::MAP{$self->path}; 2154 delete $cf::MAP{$self->path};
2122 2155
2123 $self->unlink_save; 2156 $self->unlink_save;
2124 2157
2125 bless $self, "cf::map"; 2158 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2159 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2160 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2161 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2162 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2163
2131 $cf::MAP{$self->path} = $self; 2164 $cf::MAP{$self->path} = $self;
2165 }
2132 2166
2133 $self->reset; # polite request, might not happen 2167 $self->reset; # polite request, might not happen
2134} 2168}
2135 2169
2136=item $maps = cf::map::tmp_maps 2170=item $maps = cf::map::tmp_maps
… …
2212 2246
2213sub inv_recursive { 2247sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2248 inv_recursive_ inv $_[0]
2215} 2249}
2216 2250
2251=item $ref = $ob->ref
2252
2253creates and returns a persistent reference to an objetc that can be stored as a string.
2254
2255=item $ob = cf::object::deref ($refstring)
2256
2257returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2258even if the object actually exists. May block.
2259
2260=cut
2261
2262sub deref {
2263 my ($ref) = @_;
2264
2265 # temporary compatibility#TODO#remove
2266 $ref =~ s{^<}{player/<};
2267
2268 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) {
2269 my ($uuid, $name) = ($1, $2);
2270 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2271 or return;
2272 $pl->ob->uuid eq $uuid
2273 or return;
2274
2275 $pl->ob
2276 } else {
2277 warn "$ref: cannot resolve object reference\n";
2278 undef
2279 }
2280}
2281
2217package cf; 2282package cf;
2218 2283
2219=back 2284=back
2220 2285
2221=head3 cf::object::player 2286=head3 cf::object::player
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2414 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2415 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2416 if $x <=0 && $y <= 0;
2352 2417
2353 $map->load; 2418 $map->load;
2354 $map->load_diag; 2419 $map->load_neighbours;
2355 2420
2356 return unless $self->contr->active; 2421 return unless $self->contr->active;
2357 $self->activate_recursive; 2422 $self->activate_recursive;
2358 2423
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2424 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2595the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2596the message unless the client supports the msg packet.
2532 2597
2533=cut 2598=cut
2534 2599
2600our %CHANNEL = (
2601 "c/identify" => {
2602 id => "identify",
2603 title => "Identify",
2604 reply => undef,
2605 tooltip => "Items recently identified",
2606 },
2607 "c/examine" => {
2608 id => "examine",
2609 title => "Examine",
2610 reply => undef,
2611 tooltip => "Signs and other items you examined",
2612 },
2613);
2614
2535sub cf::client::send_msg { 2615sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2616 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2617
2538 $msg = $self->pl->expand_cfpod ($msg); 2618 $msg = $self->pl->expand_cfpod ($msg);
2539 2619
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2620 $color &= cf::NDI_CLIENT_MASK; # just in case...
2621
2622 # check predefined channels, for the benefit of C
2623 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2541 2624
2542 if (ref $channel) { 2625 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2626 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2627 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2628 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2629 $self->ext_msg (channel_info => $channel)
2630 if $self->can_msg;
2547 } 2631 }
2548 2632
2549 $channel = $channel->{id}; 2633 $channel = $channel->{id};
2550 } 2634 }
2551 2635
… …
2592=cut 2676=cut
2593 2677
2594sub cf::client::ext_msg($$@) { 2678sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2679 my ($self, $type, @msg) = @_;
2596 2680
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2681 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2682 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2683 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2684 push @msg, msgtype => "event_$type";
2685 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2686 }
2687}
2688
2689=item $client->ext_reply ($msgid, @msg)
2690
2691Sends an ext reply to the client.
2692
2693=cut
2694
2695sub cf::client::ext_reply($$@) {
2696 my ($self, $id, @msg) = @_;
2697
2698 if ($self->extcmd == 2) {
2699 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2700 } elsif ($self->extcmd == 1) {
2701 #TODO: version 1, remove
2702 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2703 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2704 }
2605} 2705}
2606 2706
2607=item $success = $client->query ($flags, "text", \&cb) 2707=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2769 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2770 "ARRAY" eq ref $msg
2671 ? @$msg 2771 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2772 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2773
2774 my @reply;
2775
2674 if (my $cb = $EXTICMD{$type}) { 2776 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2777 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2778 }
2779
2780 $ns->ext_reply ($reply, @reply)
2781 if $reply;
2782
2680 } else { 2783 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2784 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2785 }
2683 2786
2684 cf::override; 2787 cf::override;
… …
2745 2848
2746The following functions and methods are available within a safe environment: 2849The following functions and methods are available within a safe environment:
2747 2850
2748 cf::object 2851 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2852 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2853 insert remove name archname title slaying race decrease_ob_nr
2751 2854
2752 cf::object::player 2855 cf::object::player
2753 player 2856 player
2754 2857
2755 cf::player 2858 cf::player
… …
2760 2863
2761=cut 2864=cut
2762 2865
2763for ( 2866for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2867 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2868 insert remove inv name archname title slaying race
2869 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2870 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2871 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2872 ["cf::map" => qw(trigger)],
2769) { 2873) {
2770 no strict 'refs'; 2874 no strict 'refs';
… …
2846# the server's init and main functions 2950# the server's init and main functions
2847 2951
2848sub load_facedata($) { 2952sub load_facedata($) {
2849 my ($path) = @_; 2953 my ($path) = @_;
2850 2954
2955 # HACK to clear player env face cache, we need some signal framework
2956 # for this (global event?)
2957 %ext::player_env::MUSIC_FACE_CACHE = ();
2958
2959 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2960
2851 warn "loading facedata from $path\n"; 2961 warn "loading facedata from $path\n";
2852 2962
2853 my $facedata; 2963 my $facedata;
2854 0 < aio_load $path, $facedata 2964 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2965 or die "$path: $!";
2856 2966
2857 $facedata = Coro::Storable::thaw $facedata; 2967 $facedata = Coro::Storable::thaw $facedata;
2858 2968
2859 $facedata->{version} == 2 2969 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 2970 or cf::cleanup "$path: version mismatch, cannot proceed.";
2971
2972 # patch in the exptable
2973 $facedata->{resource}{"res/exp_table"} = {
2974 type => FT_RSRC,
2975 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2976 };
2977 cf::cede_to_tick;
2861 2978
2862 { 2979 {
2863 my $faces = $facedata->{faceinfo}; 2980 my $faces = $facedata->{faceinfo};
2864 2981
2865 while (my ($face, $info) = each %$faces) { 2982 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2983 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 2984 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 2985 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2986 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2987 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 2988
2872 cf::cede_to_tick; 2989 cf::cede_to_tick;
2873 } 2990 }
2874 2991
2875 while (my ($face, $info) = each %$faces) { 2992 while (my ($face, $info) = each %$faces) {
… …
2900 3017
2901 { 3018 {
2902 # TODO: for gcfclient pleasure, we should give resources 3019 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3020 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3021 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 3022
2907 my $soundconf = delete $res->{"res/sound.conf"}; 3023 my $soundconf = delete $res->{"res/sound.conf"};
2908 3024
2909 while (my ($name, $info) = each %$res) { 3025 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3026 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3027 my $data;
2916 3028
2917 if ($info->{type} & 1) { 3029 if ($info->{type} & 1) {
2918 # prepend meta info 3030 # prepend meta info
2919 3031
3032 my $meta = $enc->encode ({
3033 name => $name,
3034 %{ $info->{meta} || {} },
3035 });
3036
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3037 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 3038 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3039 $data = $info->{data};
2926 } 3040 }
2927 3041
3042 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 3043 cf::face::set_type $idx, $info->{type};
2929 3044
2930 cf::cede_to_tick; 3045 cf::cede_to_tick;
2931 } 3046 }
2932 3047
… …
2959 $ns->fx_want ($k, $v); 3074 $ns->fx_want ($k, $v);
2960 } 3075 }
2961}; 3076};
2962 3077
2963sub reload_regions { 3078sub reload_regions {
3079 # HACK to clear player env face cache, we need some signal framework
3080 # for this (global event?)
3081 %ext::player_env::MUSIC_FACE_CACHE = ();
3082
2964 load_resource_file "$MAPDIR/regions" 3083 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3084 or die "unable to load regions file\n";
2966 3085
2967 for (cf::region::list) { 3086 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3087 $_->{match} = qr/$_->{match}/
… …
3004 3123
3005sub init { 3124sub init {
3006 reload_resources; 3125 reload_resources;
3007} 3126}
3008 3127
3009sub cfg_load { 3128sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3129 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3130 or return;
3012 3131
3013 local $/; 3132 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3133 *CFG = YAML::Syck::Load <$fh>;
… …
3034 (async { 3153 (async {
3035 Event::one_event; 3154 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3155 })->prio (Coro::PRIO_MAX);
3037 }; 3156 };
3038 3157
3039 cfg_load; 3158 reload_config;
3040 db_init; 3159 db_init;
3041 load_extensions; 3160 load_extensions;
3042 3161
3043 $TICK_WATCHER->start; 3162 $TICK_WATCHER->start;
3044 Event::loop; 3163 Event::loop;
… …
3237 warn "reloading cf.pm"; 3356 warn "reloading cf.pm";
3238 require cf; 3357 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3358 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3359
3241 warn "loading config and database again"; 3360 warn "loading config and database again";
3242 cf::cfg_load; 3361 cf::reload_config;
3243 3362
3244 warn "loading extensions"; 3363 warn "loading extensions";
3245 cf::load_extensions; 3364 cf::load_extensions;
3246 3365
3247 warn "reattaching attachments to objects/players"; 3366 warn "reattaching attachments to objects/players";
… …
3340 or die; 3459 or die;
3341 3460
3342 $map->width (50); 3461 $map->width (50);
3343 $map->height (50); 3462 $map->height (50);
3344 $map->alloc; 3463 $map->alloc;
3345 $map->_load_objects ("/tmp/x.map", 1); 3464 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3346 my $t = Event::time - $t; 3465 my $t = Event::time - $t;
3347 3466
3348 #next unless $t < 0.0013;#d# 3467 #next unless $t < 0.0013;#d#
3349 if ($t < $min) { 3468 if ($t < $min) {
3350 $min = $t; 3469 $min = $t;

Diff Legend

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