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.328 by root, Wed Aug 8 06:24:30 2007 UTC vs.
Revision 1.358 by root, Fri Sep 7 18:10:52 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;
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1321 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1322 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1323 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1324 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1325
1340 my $pl = load_pl path $login 1326 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1334 $cf::PLAYER{$login} = $pl
1343 } 1335 }
1344 } 1336 }
1345} 1337}
1346 1338
… …
1356 1348
1357 aio_mkdir playerdir $pl, 0770; 1349 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1350 $pl->{last_save} = $cf::RUNTIME;
1359 1351
1360 $pl->save_pl ($path); 1352 $pl->save_pl ($path);
1361 Coro::cede; 1353 cf::cede_to_tick;
1362} 1354}
1363 1355
1364sub new($) { 1356sub new($) {
1365 my ($login) = @_; 1357 my ($login) = @_;
1366 1358
… …
1370 $self->{deny_save} = 1; 1362 $self->{deny_save} = 1;
1371 1363
1372 $cf::PLAYER{$login} = $self; 1364 $cf::PLAYER{$login} = $self;
1373 1365
1374 $self 1366 $self
1367}
1368
1369=item $player->send_msg ($channel, $msg, $color, [extra...])
1370
1371=cut
1372
1373sub send_msg {
1374 my $ns = shift->ns
1375 or return;
1376 $ns->send_msg (@_);
1375} 1377}
1376 1378
1377=item $pl->quit_character 1379=item $pl->quit_character
1378 1380
1379Nukes the player without looking back. If logged in, the connection will 1381Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1436 or return [];
1435 1437
1436 my @logins; 1438 my @logins;
1437 1439
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1446 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1447 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 }
1442 1449
1443 utf8::decode $login; 1450 utf8::decode $login;
1444 push @logins, $login; 1451 push @logins, $login;
1445 } 1452 }
1446 1453
… …
1484sub expand_cfpod { 1491sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1492 ((my $self), (local $_)) = @_;
1486 1493
1487 # escape & and < 1494 # escape & and <
1488 s/&/&amp;/g; 1495 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1496 s/(?<![BIUGHT])</&lt;/g;
1490 1497
1491 # 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
1492 1499
1493 1 while 1500 1 while
1494 # replace B<>, I<>, U<> etc. 1501 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1502 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1506 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1507 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1508 $self->gender ? $2 : $1
1501 }ge 1509 }ge
1502 # replace H<hint text> 1510 # replace H<hint text>
… …
1532=cut 1540=cut
1533 1541
1534sub ext_reply($$@) { 1542sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1543 my ($self, $id, @msg) = @_;
1536 1544
1537 if ($self->ns->extcmd == 2) { 1545 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1546}
1545 1547
1546=item $player->ext_msg ($type, @msg) 1548=item $player->ext_msg ($type, @msg)
1547 1549
1548Sends an ext event to the client. 1550Sends an ext event to the client.
… …
1776 1778
1777sub load_header_from($) { 1779sub load_header_from($) {
1778 my ($self, $path) = @_; 1780 my ($self, $path) = @_;
1779 1781
1780 utf8::encode $path; 1782 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1783 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1791
1787 $self->{load_path} = $path; 1792 $self->{load_path} = $path;
1788 1793
1789 1 1794 1
1790} 1795}
… …
1844sub find { 1849sub find {
1845 my ($path, $origin) = @_; 1850 my ($path, $origin) = @_;
1846 1851
1847 $path = normalise $path, $origin && $origin->path; 1852 $path = normalise $path, $origin && $origin->path;
1848 1853
1854 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1855 cf::lock_wait "map_find:$path";
1850 1856
1851 $cf::MAP{$path} || do { 1857 $cf::MAP{$path} || do {
1852 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
1853 my $map = new_from_path cf::map $path 1861 my $map = new_from_path cf::map $path
1854 or return; 1862 or return;
1855 1863
1856 $map->{last_save} = $cf::RUNTIME; 1864 $map->{last_save} = $cf::RUNTIME;
1857 1865
… …
1859 or return; 1867 or return;
1860 1868
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1870 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1871 #$cf::WAIT_FOR_TICK->wait;
1872 undef $guard1;
1873 undef $guard2;
1864 $map->reset; 1874 $map->reset;
1865 undef $guard;
1866 return find $path; 1875 return find $path;
1867 } 1876 }
1868 1877
1869 $cf::MAP{$path} = $map 1878 $cf::MAP{$path} = $map
1870 } 1879 }
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1888 local $self->{deny_reset} = 1; # loading can take a long time
1880 1889
1881 my $path = $self->{path}; 1890 my $path = $self->{path};
1882 1891
1883 { 1892 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1893 my $guard = cf::lock_acquire "map_data:$path";
1885 1894
1895 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1896 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1897
1888 $self->in_memory (cf::MAP_LOADING); 1898 $self->in_memory (cf::MAP_LOADING);
1889 1899
1890 $self->alloc; 1900 $self->alloc;
1891 1901
1892 $self->pre_load; 1902 $self->pre_load;
1893 Coro::cede; 1903 cf::cede_to_tick;
1894 1904
1905 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 1907 $self->_load_objects ($f)
1896 or return; 1908 or return;
1897 1909
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1899 if delete $self->{load_original}; 1911 if delete $self->{load_original};
1900 1912
1901 if (my $uniq = $self->uniq_path) { 1913 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 1914 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 1915 unless (aio_stat $uniq) {
1916 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 1917 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1918 $self->_load_objects ($f);
1919 $f->resolve_delayed_derefs;
1920 }
1906 } 1921 }
1907 } 1922 }
1908 1923
1909 Coro::cede; 1924 $f->resolve_delayed_derefs;
1925
1926 cf::cede_to_tick;
1910 # now do the right thing for maps 1927 # now do the right thing for maps
1911 $self->link_multipart_objects; 1928 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1929 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1930 unless $self->difficulty;
1914 Coro::cede; 1931 cf::cede_to_tick;
1915 1932
1916 unless ($self->{deny_activate}) { 1933 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1934 $self->decay_objects;
1918 $self->fix_auto_apply; 1935 $self->fix_auto_apply;
1919 $self->update_buttons; 1936 $self->update_buttons;
1920 Coro::cede; 1937 cf::cede_to_tick;
1921 $self->set_darkness_map; 1938 $self->set_darkness_map;
1922 Coro::cede; 1939 cf::cede_to_tick;
1923 $self->activate; 1940 $self->activate;
1924 } 1941 }
1925 1942
1926 $self->{last_save} = $cf::RUNTIME; 1943 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1944 $self->last_access ($cf::RUNTIME);
… …
1943 1960
1944 $self 1961 $self
1945} 1962}
1946 1963
1947# find and load all maps in the 3x3 area around a map 1964# find and load all maps in the 3x3 area around a map
1948sub load_diag { 1965sub load_neighbours {
1949 my ($map) = @_; 1966 my ($map) = @_;
1950 1967
1951 my @diag; # diagonal neighbours 1968 my @neigh; # diagonal neighbours
1952 1969
1953 for (0 .. 3) { 1970 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1971 my $neigh = $map->tile_path ($_)
1955 or next; 1972 or next;
1956 $neigh = find $neigh, $map 1973 $neigh = find $neigh, $map
1957 or next; 1974 or next;
1958 $neigh->load; 1975 $neigh->load;
1959 1976
1977 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1978 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1979 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 1980 }
1963 1981
1964 for (@diag) { 1982 for (grep defined $_->[0], @neigh) {
1983 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 1984 my $neigh = find $path, $origin
1966 or next; 1985 or next;
1967 $neigh->load; 1986 $neigh->load;
1968 } 1987 }
1969} 1988}
1970 1989
… …
1975} 1994}
1976 1995
1977sub do_load_sync { 1996sub do_load_sync {
1978 my ($map) = @_; 1997 my ($map) = @_;
1979 1998
1999 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2000 if $Coro::current == $Coro::main;
2001
1980 cf::sync_job { $map->load }; 2002 cf::sync_job { $map->load };
1981} 2003}
1982 2004
1983our %MAP_PREFETCH; 2005our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2006our $MAP_PREFETCHER = undef;
1985 2007
1986sub find_async { 2008sub find_async {
1987 my ($path, $origin) = @_; 2009 my ($path, $origin, $load) = @_;
1988 2010
1989 $path = normalise $path, $origin && $origin->{path}; 2011 $path = normalise $path, $origin && $origin->{path};
1990 2012
1991 if (my $map = $cf::MAP{$path}) { 2013 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 2015 }
1994 2016
1995 undef $MAP_PREFETCH{$path}; 2017 $MAP_PREFETCH{$path} |= $load;
2018
1996 $MAP_PREFETCHER ||= cf::async { 2019 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 2020 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2021 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2022 if (my $map = find $k) {
2000 $map->load; 2023 $map->load if $v;
2001 } 2024 }
2002 2025
2003 delete $MAP_PREFETCH{$path}; 2026 delete $MAP_PREFETCH{$k};
2004 } 2027 }
2005 } 2028 }
2006 undef $MAP_PREFETCHER; 2029 undef $MAP_PREFETCHER;
2007 }; 2030 };
2008 $MAP_PREFETCHER->prio (6); 2031 $MAP_PREFETCHER->prio (6);
… …
2011} 2034}
2012 2035
2013sub save { 2036sub save {
2014 my ($self) = @_; 2037 my ($self) = @_;
2015 2038
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2039 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2040
2018 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2019 2042
2020 return unless $self->dirty; 2043 return unless $self->dirty;
2021 2044
… …
2044 my ($self) = @_; 2067 my ($self) = @_;
2045 2068
2046 # save first because save cedes 2069 # save first because save cedes
2047 $self->save; 2070 $self->save;
2048 2071
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2072 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2073
2051 return if $self->players; 2074 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2075 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2054 2077
2078 $self->deactivate;
2055 $self->clear; 2079 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED); 2080 $self->in_memory (cf::MAP_SWAPPED);
2057} 2081}
2058 2082
2059sub reset_at { 2083sub reset_at {
… …
2093 if $uniq; 2117 if $uniq;
2094 } 2118 }
2095 2119
2096 delete $cf::MAP{$self->path}; 2120 delete $cf::MAP{$self->path};
2097 2121
2122 $self->deactivate;
2098 $self->clear; 2123 $self->clear;
2099 2124
2100 $_->clear_links_to ($self) for values %cf::MAP; 2125 $_->clear_links_to ($self) for values %cf::MAP;
2101 2126
2102 $self->unlink_save; 2127 $self->unlink_save;
… …
2106my $nuke_counter = "aaaa"; 2131my $nuke_counter = "aaaa";
2107 2132
2108sub nuke { 2133sub nuke {
2109 my ($self) = @_; 2134 my ($self) = @_;
2110 2135
2136 {
2137 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138
2111 delete $cf::MAP{$self->path}; 2139 delete $cf::MAP{$self->path};
2112 2140
2113 $self->unlink_save; 2141 $self->unlink_save;
2114 2142
2115 bless $self, "cf::map"; 2143 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2144 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2145 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2146 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2147 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2148
2121 $cf::MAP{$self->path} = $self; 2149 $cf::MAP{$self->path} = $self;
2150 }
2122 2151
2123 $self->reset; # polite request, might not happen 2152 $self->reset; # polite request, might not happen
2124} 2153}
2125 2154
2126=item $maps = cf::map::tmp_maps 2155=item $maps = cf::map::tmp_maps
… …
2202 2231
2203sub inv_recursive { 2232sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2233 inv_recursive_ inv $_[0]
2205} 2234}
2206 2235
2236=item $ref = $ob->ref
2237
2238creates and returns a persistent reference to an objetc that can be stored as a string.
2239
2240=item $ob = cf::object::deref ($refstring)
2241
2242returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2243even if the object actually exists. May block.
2244
2245=cut
2246
2247sub 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
2207package cf; 2267package cf;
2208 2268
2209=back 2269=back
2210 2270
2211=head3 cf::object::player 2271=head3 cf::object::player
… …
2243 $self->message ($msg, $flags); 2303 $self->message ($msg, $flags);
2244 } 2304 }
2245 } 2305 }
2246} 2306}
2247 2307
2308=item $object->send_msg ($channel, $msg, $color, [extra...])
2309
2310=cut
2311
2312sub cf::object::send_msg {
2313 my $pl = shift->contr
2314 or return;
2315 $pl->send_msg (@_);
2316}
2317
2248=item $player_object->may ("access") 2318=item $player_object->may ("access")
2249 2319
2250Returns wether the given player is authorized to access resource "access" 2320Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2321(e.g. "command_wizcast").
2252 2322
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2399 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2400 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2401 if $x <=0 && $y <= 0;
2332 2402
2333 $map->load; 2403 $map->load;
2334 $map->load_diag; 2404 $map->load_neighbours;
2335 2405
2336 return unless $self->contr->active; 2406 return unless $self->contr->active;
2337 $self->activate_recursive; 2407 $self->activate_recursive;
2338 2408
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2409 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2580the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2581the message unless the client supports the msg packet.
2512 2582
2513=cut 2583=cut
2514 2584
2585our %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
2515sub cf::client::send_msg { 2600sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2601 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2602
2518 $msg = $self->pl->expand_cfpod ($msg); 2603 $msg = $self->pl->expand_cfpod ($msg);
2519 2604
2520 $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};
2521 2609
2522 if (ref $channel) { 2610 if (ref $channel) {
2523 # send meta info to client, if not yet sent 2611 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2612 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2613 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2614 $self->ext_msg (channel_info => $channel)
2615 if $self->can_msg;
2527 } 2616 }
2528 2617
2529 $channel = $channel->{id}; 2618 $channel = $channel->{id};
2530 } 2619 }
2531 2620
… …
2553 $color &= cf::NDI_COLOR_MASK; 2642 $color &= cf::NDI_COLOR_MASK;
2554 2643
2555 utf8::encode $msg; 2644 utf8::encode $msg;
2556 2645
2557 if (0 && $msg =~ /\[/) { 2646 if (0 && $msg =~ /\[/) {
2647 # COMMAND/INFO
2558 $self->send_packet ("drawextinfo $color 4 0 $msg") 2648 $self->send_packet ("drawextinfo $color 10 8 $msg")
2559 } else { 2649 } else {
2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2650 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561 $self->send_packet ("drawinfo $color $msg") 2651 $self->send_packet ("drawinfo $color $msg")
2562 } 2652 }
2563 } 2653 }
… …
2571=cut 2661=cut
2572 2662
2573sub cf::client::ext_msg($$@) { 2663sub cf::client::ext_msg($$@) {
2574 my ($self, $type, @msg) = @_; 2664 my ($self, $type, @msg) = @_;
2575 2665
2576 my $extcmd = $self->extcmd;
2577
2578 if ($extcmd == 2) { 2666 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2667 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580 } elsif ($extcmd == 1) { # TODO: remove 2668 } elsif ($self->extcmd == 1) { # TODO: remove
2581 push @msg, msgtype => "event_$type"; 2669 push @msg, msgtype => "event_$type";
2670 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2671 }
2672}
2673
2674=item $client->ext_reply ($msgid, @msg)
2675
2676Sends an ext reply to the client.
2677
2678=cut
2679
2680sub cf::client::ext_reply($$@) {
2681 my ($self, $id, @msg) = @_;
2682
2683 if ($self->extcmd == 2) {
2684 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2685 } elsif ($self->extcmd == 1) {
2686 #TODO: version 1, remove
2687 unshift @msg, msgtype => "reply", msgid => $id;
2582 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2688 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583 } 2689 }
2584} 2690}
2585 2691
2586=item $success = $client->query ($flags, "text", \&cb) 2692=item $success = $client->query ($flags, "text", \&cb)
… …
2648 my ($type, $reply, @payload) = 2754 my ($type, $reply, @payload) =
2649 "ARRAY" eq ref $msg 2755 "ARRAY" eq ref $msg
2650 ? @$msg 2756 ? @$msg
2651 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2757 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2652 2758
2759 my @reply;
2760
2653 if (my $cb = $EXTICMD{$type}) { 2761 if (my $cb = $EXTICMD{$type}) {
2654 my @reply = $cb->($ns, @payload); 2762 @reply = $cb->($ns, @payload);
2655
2656 $ns->ext_reply ($reply, @reply)
2657 if $reply;
2658 } 2763 }
2764
2765 $ns->ext_reply ($reply, @reply)
2766 if $reply;
2767
2659 } else { 2768 } else {
2660 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2769 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2661 } 2770 }
2662 2771
2663 cf::override; 2772 cf::override;
… …
2724 2833
2725The following functions and methods are available within a safe environment: 2834The following functions and methods are available within a safe environment:
2726 2835
2727 cf::object 2836 cf::object
2728 contr pay_amount pay_player map x y force_find force_add 2837 contr pay_amount pay_player map x y force_find force_add
2729 insert remove 2838 insert remove name archname title slaying race decrease_ob_nr
2730 2839
2731 cf::object::player 2840 cf::object::player
2732 player 2841 player
2733 2842
2734 cf::player 2843 cf::player
… …
2739 2848
2740=cut 2849=cut
2741 2850
2742for ( 2851for (
2743 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2852 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2744 insert remove inv)], 2853 insert remove inv name archname title slaying race
2854 decrease_ob_nr)],
2745 ["cf::object::player" => qw(player)], 2855 ["cf::object::player" => qw(player)],
2746 ["cf::player" => qw(peaceful)], 2856 ["cf::player" => qw(peaceful)],
2747 ["cf::map" => qw(trigger)], 2857 ["cf::map" => qw(trigger)],
2748) { 2858) {
2749 no strict 'refs'; 2859 no strict 'refs';
… …
2825# the server's init and main functions 2935# the server's init and main functions
2826 2936
2827sub load_facedata($) { 2937sub load_facedata($) {
2828 my ($path) = @_; 2938 my ($path) = @_;
2829 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
2944 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2945
2830 warn "loading facedata from $path\n"; 2946 warn "loading facedata from $path\n";
2831 2947
2832 my $facedata; 2948 my $facedata;
2833 0 < aio_load $path, $facedata 2949 0 < aio_load $path, $facedata
2834 or die "$path: $!"; 2950 or die "$path: $!";
2835 2951
2836 $facedata = Coro::Storable::thaw $facedata; 2952 $facedata = Coro::Storable::thaw $facedata;
2837 2953
2838 $facedata->{version} == 2 2954 $facedata->{version} == 2
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 2955 or cf::cleanup "$path: version mismatch, cannot proceed.";
2956
2957 # patch in the exptable
2958 $facedata->{resource}{"res/exp_table"} = {
2959 type => FT_RSRC,
2960 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2961 };
2962 cf::cede_to_tick;
2840 2963
2841 { 2964 {
2842 my $faces = $facedata->{faceinfo}; 2965 my $faces = $facedata->{faceinfo};
2843 2966
2844 while (my ($face, $info) = each %$faces) { 2967 while (my ($face, $info) = each %$faces) {
2845 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2968 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2846 cf::face::set_visibility $idx, $info->{visibility}; 2969 cf::face::set_visibility $idx, $info->{visibility};
2847 cf::face::set_magicmap $idx, $info->{magicmap}; 2970 cf::face::set_magicmap $idx, $info->{magicmap};
2848 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2971 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2849 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2972 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2850 2973
2851 cf::cede_to_tick; 2974 cf::cede_to_tick;
2852 } 2975 }
2853 2976
2854 while (my ($face, $info) = each %$faces) { 2977 while (my ($face, $info) = each %$faces) {
… …
2879 3002
2880 { 3003 {
2881 # TODO: for gcfclient pleasure, we should give resources 3004 # TODO: for gcfclient pleasure, we should give resources
2882 # that gcfclient doesn't grok a >10000 face index. 3005 # that gcfclient doesn't grok a >10000 face index.
2883 my $res = $facedata->{resource}; 3006 my $res = $facedata->{resource};
2884 my $enc = JSON::XS->new->utf8->canonical;
2885 3007
2886 my $soundconf = delete $res->{"res/sound.conf"}; 3008 my $soundconf = delete $res->{"res/sound.conf"};
2887 3009
2888 while (my ($name, $info) = each %$res) { 3010 while (my ($name, $info) = each %$res) {
2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3011 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3012 my $data;
2895 3013
2896 if ($info->{type} & 1) { 3014 if ($info->{type} & 1) {
2897 # prepend meta info 3015 # prepend meta info
2898 3016
3017 my $meta = $enc->encode ({
3018 name => $name,
3019 %{ $info->{meta} || {} },
3020 });
3021
2899 my $data = pack "(w/a*)*", $meta, $info->{data}; 3022 $data = pack "(w/a*)*", $meta, $info->{data};
2900 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2901
2902 cf::face::set_data $idx, 0, $data, $chk;
2903 } else { 3023 } else {
2904 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3024 $data = $info->{data};
2905 } 3025 }
2906 3026
3027 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2907 cf::face::set_type $idx, $info->{type}; 3028 cf::face::set_type $idx, $info->{type};
2908 3029
2909 cf::cede_to_tick; 3030 cf::cede_to_tick;
2910 } 3031 }
2911 3032
… …
2938 $ns->fx_want ($k, $v); 3059 $ns->fx_want ($k, $v);
2939 } 3060 }
2940}; 3061};
2941 3062
2942sub reload_regions { 3063sub 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
2943 load_resource_file "$MAPDIR/regions" 3068 load_resource_file "$MAPDIR/regions"
2944 or die "unable to load regions file\n"; 3069 or die "unable to load regions file\n";
2945 3070
2946 for (cf::region::list) { 3071 for (cf::region::list) {
2947 $_->{match} = qr/$_->{match}/ 3072 $_->{match} = qr/$_->{match}/
… …
2983 3108
2984sub init { 3109sub init {
2985 reload_resources; 3110 reload_resources;
2986} 3111}
2987 3112
2988sub cfg_load { 3113sub reload_config {
2989 open my $fh, "<:utf8", "$CONFDIR/config" 3114 open my $fh, "<:utf8", "$CONFDIR/config"
2990 or return; 3115 or return;
2991 3116
2992 local $/; 3117 local $/;
2993 *CFG = YAML::Syck::Load <$fh>; 3118 *CFG = YAML::Syck::Load <$fh>;
… …
3013 (async { 3138 (async {
3014 Event::one_event; 3139 Event::one_event;
3015 })->prio (Coro::PRIO_MAX); 3140 })->prio (Coro::PRIO_MAX);
3016 }; 3141 };
3017 3142
3018 cfg_load; 3143 reload_config;
3019 db_init; 3144 db_init;
3020 load_extensions; 3145 load_extensions;
3021 3146
3022 $TICK_WATCHER->start; 3147 $TICK_WATCHER->start;
3023 Event::loop; 3148 Event::loop;
… …
3216 warn "reloading cf.pm"; 3341 warn "reloading cf.pm";
3217 require cf; 3342 require cf;
3218 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3343 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3219 3344
3220 warn "loading config and database again"; 3345 warn "loading config and database again";
3221 cf::cfg_load; 3346 cf::reload_config;
3222 3347
3223 warn "loading extensions"; 3348 warn "loading extensions";
3224 cf::load_extensions; 3349 cf::load_extensions;
3225 3350
3226 warn "reattaching attachments to objects/players"; 3351 warn "reattaching attachments to objects/players";
… …
3319 or die; 3444 or die;
3320 3445
3321 $map->width (50); 3446 $map->width (50);
3322 $map->height (50); 3447 $map->height (50);
3323 $map->alloc; 3448 $map->alloc;
3324 $map->_load_objects ("/tmp/x.map", 1); 3449 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3325 my $t = Event::time - $t; 3450 my $t = Event::time - $t;
3326 3451
3327 #next unless $t < 0.0013;#d# 3452 #next unless $t < 0.0013;#d#
3328 if ($t < $min) { 3453 if ($t < $min) {
3329 $min = $t; 3454 $min = $t;

Diff Legend

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