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.289 by root, Sat Jun 30 03:00:54 2007 UTC vs.
Revision 1.346 by root, Tue Aug 28 19:38:40 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 ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
250 258
251=cut 259=cut
252 260
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 262
255sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
257 265
258=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
313 my $guard = Coro::guard { 321 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
315 }; 323 };
316 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
317 $guard 325 $guard
326}
327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
318} 382}
319 383
320=item cf::async { BLOCK } 384=item cf::async { BLOCK }
321 385
322Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
… …
412=cut 476=cut
413 477
414sub fork_call(&@) { 478sub fork_call(&@) {
415 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
416 480
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 484
422 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 486 reset_signals;
435 local $SIG{__WARN__}; 487 &$cb
436 local $SIG{__DIE__}; 488 }, @args;
437 eval {
438 close $fh1;
439 489
440 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 491}
448 492
449=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
450 494
451Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
531 if (1) { 575 if (1) {
532 $md5 = 576 $md5 =
533 join "\x00", 577 join "\x00",
534 $processversion, 578 $processversion,
535 map { 579 map {
536 Coro::cede; 580 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 582 } 0.. $#$src;
539 583
540 584
541 my $dbmd5 = db_get cache => "$id/md5"; 585 my $dbmd5 = db_get cache => "$id/md5";
… …
847 "; 891 ";
848 die if $@; 892 die if $@;
849} 893}
850 894
851our $override; 895our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 897
854sub override { 898sub override {
855 $override = 1; 899 $override = 1;
856 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
857} 901}
858 902
859sub do_invoke { 903sub do_invoke {
860 my $event = shift; 904 my $event = shift;
861 my $callbacks = shift; 905 my $callbacks = shift;
862 906
863 @invoke_results = (); 907 @INVOKE_RESULTS = ();
864 908
865 local $override; 909 local $override;
866 910
867 for (@$callbacks) { 911 for (@$callbacks) {
868 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
885 929
886Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
887 931
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 935
892=back 936=back
893 937
894=cut 938=cut
895 939
896############################################################################# 940#############################################################################
897# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
898 953
899sub reattach { 954sub reattach {
900 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 956 my ($obj) = @_;
902 957
… …
1086 cf::override; 1141 cf::override;
1087 }, 1142 },
1088 on_extcmd => sub { 1143 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1090 1145
1091 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1147
1093 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1099 } else { 1163 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1165 }
1102 1166
1103 cf::override; 1167 cf::override;
… …
1258 1322
1259 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1261 1325
1262 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1263 Coro::cede; 1327 cf::cede_to_tick;
1264} 1328}
1265 1329
1266sub new($) { 1330sub new($) {
1267 my ($login) = @_; 1331 my ($login) = @_;
1268 1332
… …
1272 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1273 1337
1274 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1275 1339
1276 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1277} 1351}
1278 1352
1279=item $pl->quit_character 1353=item $pl->quit_character
1280 1354
1281Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1400 # replace G<male|female> tags 1474 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1475 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1476 $self->gender ? $2 : $1
1403 }ge 1477 }ge
1404 # replace H<hint text> 1478 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1406 1486
1407 # create single paragraphs (very hackish) 1487 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1488 s/(?<=\S)\n(?=\w)/ /g;
1409 1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1410 $_ 1496 $_
1411} 1497}
1412 1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1413=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1414 1505
1415Sends an ext reply to the player. 1506Sends an ext reply to the player.
1416 1507
1417=cut 1508=cut
1418 1509
1419sub ext_reply($$%) { 1510sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1421 1512
1422 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1514}
1425 1515
1426=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1427 1517
1428Sends an ext event to the client. 1518Sends an ext event to the client.
1429 1519
1430=cut 1520=cut
1431 1521
1432sub ext_event($$%) { 1522sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1434 1524
1435 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1436} 1526}
1437 1527
1438=head3 cf::region 1528=head3 cf::region
1439 1529
1440=over 4 1530=over 4
… …
1453 my ($path) = @_; 1543 my ($path) = @_;
1454 1544
1455 my ($match, $specificity); 1545 my ($match, $specificity);
1456 1546
1457 for my $region (list) { 1547 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1461 } 1551 }
1462 } 1552 }
1463 1553
… …
1583 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1584 return $self; 1674 return $self;
1585 } 1675 }
1586 } 1676 }
1587 1677
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1679 ()
1590} 1680}
1591 1681
1592sub init { 1682sub init {
1593 my ($self) = @_; 1683 my ($self) = @_;
… …
1759 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1760 1850
1761 my $path = $self->{path}; 1851 my $path = $self->{path};
1762 1852
1763 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1764 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1765 1856
1766 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1767 1858
1768 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1769 1860
1770 $self->alloc; 1861 $self->alloc;
1771 1862
1772 $self->pre_load; 1863 $self->pre_load;
1773 Coro::cede; 1864 cf::cede_to_tick;
1774 1865
1775 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1776 or return; 1867 or return;
1777 1868
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1784 $self->clear_unique_items; 1875 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1786 } 1877 }
1787 } 1878 }
1788 1879
1789 Coro::cede; 1880 cf::cede_to_tick;
1790 # now do the right thing for maps 1881 # now do the right thing for maps
1791 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 1884 unless $self->difficulty;
1794 Coro::cede; 1885 cf::cede_to_tick;
1795 1886
1796 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 1888 $self->decay_objects;
1798 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1799 $self->update_buttons; 1890 $self->update_buttons;
1800 Coro::cede; 1891 cf::cede_to_tick;
1801 $self->set_darkness_map; 1892 $self->set_darkness_map;
1802 Coro::cede; 1893 cf::cede_to_tick;
1803 $self->activate; 1894 $self->activate;
1804 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1805 1899
1806 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 1901 }
1808 1902
1809 $self->post_load; 1903 $self->post_load;
… …
1820 1914
1821 $self 1915 $self
1822} 1916}
1823 1917
1824# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1825sub load_diag { 1919sub load_neighbours {
1826 my ($map) = @_; 1920 my ($map) = @_;
1827 1921
1828 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1829 1923
1830 for (0 .. 3) { 1924 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1832 or next; 1926 or next;
1833 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1834 or next; 1928 or next;
1835 $neigh->load; 1929 $neigh->load;
1836 1930
1931 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 1934 }
1840 1935
1841 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1843 or next; 1939 or next;
1844 $neigh->load; 1940 $neigh->load;
1845 } 1941 }
1846} 1942}
1847 1943
… …
1852} 1948}
1853 1949
1854sub do_load_sync { 1950sub do_load_sync {
1855 my ($map) = @_; 1951 my ($map) = @_;
1856 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1857 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1858} 1957}
1859 1958
1860our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1862 1961
1863sub find_async { 1962sub find_async {
1864 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1865 1964
1866 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1867 1966
1868 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1870 } 1969 }
1871 1970
1872 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1873 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 1976 if (my $map = find $k) {
1877 or next;
1878 $map->load; 1977 $map->load if $v;
1978 }
1879 1979
1880 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1881 } 1981 }
1882 } 1982 }
1883 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1884 }; 1984 };
1885 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1888} 1988}
1889 1989
1890sub save { 1990sub save {
1891 my ($self) = @_; 1991 my ($self) = @_;
1892 1992
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 1994
1895 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1896 1996
1897 return unless $self->dirty; 1997 return unless $self->dirty;
1898 1998
… …
1921 my ($self) = @_; 2021 my ($self) = @_;
1922 2022
1923 # save first because save cedes 2023 # save first because save cedes
1924 $self->save; 2024 $self->save;
1925 2025
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2027
1928 return if $self->players; 2028 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1931 2031
… …
2110 2210
2111 } else { 2211 } else {
2112 my $pl = $self->contr; 2212 my $pl = $self->contr;
2113 2213
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2217
2123 } else { 2218 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2126 } 2221 }
2127 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
2128} 2233}
2129 2234
2130=item $player_object->may ("access") 2235=item $player_object->may ("access")
2131 2236
2132Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2214 2319
2215 $map->load; 2320 $map->load;
2216 $map->load_diag; 2321 $map->load_neighbours;
2217 2322
2218 return unless $self->contr->active; 2323 return unless $self->contr->active;
2219 $self->activate_recursive; 2324 $self->activate_recursive;
2220 2325
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
2223} 2328}
2224 2329
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2331
2227Moves the player to the given map-path and coordinates by first freezing 2332Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2333her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on 2334that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position. 2335the new (success) or old (failed) map position. In either case, $done will
2336be called at the end of this process.
2231 2337
2232=cut 2338=cut
2233 2339
2234our $GOTOGEN; 2340our $GOTOGEN;
2235 2341
2236sub cf::object::player::goto { 2342sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2344
2239 # do generation counting so two concurrent goto's will be executed in-order 2345 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2347
2242 $self->enter_link; 2348 $self->enter_link;
… …
2262 2368
2263 if ($gen == $self->{_goto_generation}) { 2369 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2370 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2266 } 2372 }
2373
2374 $done->() if $done;
2267 })->prio (1); 2375 })->prio (1);
2268} 2376}
2269 2377
2270=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
2271 2379
… …
2340 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
2342 2450
2343 $self->enter_link; 2451 $self->enter_link;
2344 2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
2456
2345 (async { 2457 (async {
2346 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2459 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
2349 2461
… …
2376 2488
2377 utf8::encode $text; 2489 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2491}
2380 2492
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2494
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2495Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2496client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress 2497the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet. 2498the message unless the client supports the msg packet.
2387 2499
2388=cut 2500=cut
2389 2501
2390sub cf::client::send_msg { 2502sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2503 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2504
2393 $msg = $self->pl->expand_cfpod ($msg); 2505 $msg = $self->pl->expand_cfpod ($msg);
2394 2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2395 if ($self->can_msg) { 2521 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397 } else { 2528 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) { 2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2409 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2547 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2414 } 2550 }
2415 } 2551 }
2416 } 2552 }
2417} 2553}
2418 2554
2419=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2420 2556
2421Sends an ext event to the client. 2557Sends an ext event to the client.
2422 2558
2423=cut 2559=cut
2424 2560
2425sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2427 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2430} 2588}
2431 2589
2432=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2433 2591
2434Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
… …
2457 2615
2458 1 2616 1
2459} 2617}
2460 2618
2461cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2462 on_reply => sub { 2625 on_reply => sub {
2463 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2464 2627
2465 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2466 # get handled first 2629 # get handled first
… …
2481 } 2644 }
2482 }, 2645 },
2483 on_exticmd => sub { 2646 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2647 my ($ns, $buf) = @_;
2485 2648
2486 my $msg = eval { from_json $buf }; 2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2650
2488 if (ref $msg) { 2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2659 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2660 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2495 } else { 2666 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 } 2668 }
2498 2669
2499 cf::override; 2670 cf::override;
… …
2546our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2548 2719
2549$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2550 2721
2551$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2552 2727
2553# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2554 2729
2555=pod 2730=pod
2556 2731
2557The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2558 2733
2559 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2560 cf::object::player player 2738 cf::object::player
2561 cf::player peaceful 2739 player
2562 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2563 2746
2564=cut 2747=cut
2565 2748
2566for ( 2749for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2568 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2571) { 2756) {
2572 no strict 'refs'; 2757 no strict 'refs';
… …
2648# the server's init and main functions 2833# the server's init and main functions
2649 2834
2650sub load_facedata($) { 2835sub load_facedata($) {
2651 my ($path) = @_; 2836 my ($path) = @_;
2652 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2653 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2654 2841
2655 my $facedata; 2842 my $facedata;
2656 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 2844 or die "$path: $!";
… …
2659 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2660 2847
2661 $facedata->{version} == 2 2848 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2664 { 2858 {
2665 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2666 2860
2667 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 2867
2868 cf::cede_to_tick;
2673 } 2869 }
2674 2870
2675 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2677 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2678 or next; 2874 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 2878 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 2880 }
2684 Coro::cede; 2881
2882 cf::cede_to_tick;
2685 } 2883 }
2686 } 2884 }
2687 2885
2688 { 2886 {
2689 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2690 2888
2691 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 2891 cf::cede_to_tick;
2694 } 2892 }
2695 2893
2696 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2697 } 2895 }
2698 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2699 1 2946 1
2700} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2701 2956
2702sub reload_regions { 2957sub reload_regions {
2703 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2705} 2965}
2706 2966
2707sub reload_facedata { 2967sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
… …
2738 2998
2739sub init { 2999sub init {
2740 reload_resources; 3000 reload_resources;
2741} 3001}
2742 3002
2743sub cfg_load { 3003sub reload_config {
2744 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2745 or return; 3005 or return;
2746 3006
2747 local $/; 3007 local $/;
2748 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2768 (async { 3028 (async {
2769 Event::one_event; 3029 Event::one_event;
2770 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2771 }; 3031 };
2772 3032
2773 cfg_load; 3033 reload_config;
2774 db_init; 3034 db_init;
2775 load_extensions; 3035 load_extensions;
2776 3036
2777 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2778 Event::loop; 3038 Event::loop;
… …
2971 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2972 require cf; 3232 require cf;
2973 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2974 3234
2975 warn "loading config and database again"; 3235 warn "loading config and database again";
2976 cf::cfg_load; 3236 cf::reload_config;
2977 3237
2978 warn "loading extensions"; 3238 warn "loading extensions";
2979 cf::load_extensions; 3239 cf::load_extensions;
2980 3240
2981 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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