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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.348 by root, Thu Aug 30 08:34: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
… …
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
267returned. 275returned.
268 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
269Lock 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
270uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
271 282
272=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
273 284
… …
313 my $guard = Coro::guard { 324 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
315 }; 326 };
316 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
317 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
318} 385}
319 386
320=item cf::async { BLOCK } 387=item cf::async { BLOCK }
321 388
322Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
412=cut 479=cut
413 480
414sub fork_call(&@) { 481sub fork_call(&@) {
415 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
416 483
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 487
422 if (my $pid = fork) { 488 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; 489 reset_signals;
435 local $SIG{__WARN__}; 490 &$cb
436 local $SIG{__DIE__}; 491 }, @args;
437 eval {
438 close $fh1;
439 492
440 my @res = eval { $cb->(@args) }; 493 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 494}
448 495
449=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
450 497
451Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
531 if (1) { 578 if (1) {
532 $md5 = 579 $md5 =
533 join "\x00", 580 join "\x00",
534 $processversion, 581 $processversion,
535 map { 582 map {
536 Coro::cede; 583 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 585 } 0.. $#$src;
539 586
540 587
541 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
847 "; 894 ";
848 die if $@; 895 die if $@;
849} 896}
850 897
851our $override; 898our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 900
854sub override { 901sub override {
855 $override = 1; 902 $override = 1;
856 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
857} 904}
858 905
859sub do_invoke { 906sub do_invoke {
860 my $event = shift; 907 my $event = shift;
861 my $callbacks = shift; 908 my $callbacks = shift;
862 909
863 @invoke_results = (); 910 @INVOKE_RESULTS = ();
864 911
865 local $override; 912 local $override;
866 913
867 for (@$callbacks) { 914 for (@$callbacks) {
868 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
885 932
886Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
887 934
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This 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 936removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 938
892=back 939=back
893 940
894=cut 941=cut
895 942
896############################################################################# 943#############################################################################
897# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
898 956
899sub reattach { 957sub reattach {
900 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 959 my ($obj) = @_;
902 960
… …
1089 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1090 1148
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1150
1093 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1099 } else { 1166 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1168 }
1102 1169
1103 cf::override; 1170 cf::override;
… …
1258 1325
1259 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1261 1328
1262 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1263 Coro::cede; 1330 cf::cede_to_tick;
1264} 1331}
1265 1332
1266sub new($) { 1333sub new($) {
1267 my ($login) = @_; 1334 my ($login) = @_;
1268 1335
… …
1272 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1273 1340
1274 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1275 1342
1276 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1277} 1354}
1278 1355
1279=item $pl->quit_character 1356=item $pl->quit_character
1280 1357
1281Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1412 1489
1413 # create single paragraphs (very hackish) 1490 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1491 s/(?<=\S)\n(?=\w)/ /g;
1415 1492
1416 # compress some whitespace 1493 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1494 s/\s+\n/\n/g; # ws line-ends
1495 s/\n\n+/\n/g; # double lines
1496 s/^\n+//; # beginning lines
1497 s/\n+$//; # ending lines
1418 1498
1419 $_ 1499 $_
1420} 1500}
1421 1501
1422sub hintmode { 1502sub hintmode {
1423 warn "hm<$_[0] $_[1]>\n";#d#
1424 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1425 $_[0]{hintmode} 1504 $_[0]{hintmode}
1426} 1505}
1427 1506
1428=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1429 1508
1430Sends an ext reply to the player. 1509Sends an ext reply to the player.
1431 1510
1432=cut 1511=cut
1433 1512
1434sub ext_reply($$%) { 1513sub ext_reply($$@) {
1435 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1436 1515
1437 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1438 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1439} 1517}
1440 1518
1441=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1442 1520
1443Sends an ext event to the client. 1521Sends an ext event to the client.
1444 1522
1445=cut 1523=cut
1446 1524
1447sub ext_event($$%) { 1525sub ext_msg($$@) {
1448 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1449 1527
1450 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1451} 1529}
1452 1530
1453=head3 cf::region 1531=head3 cf::region
1454 1532
1455=over 4 1533=over 4
… …
1468 my ($path) = @_; 1546 my ($path) = @_;
1469 1547
1470 my ($match, $specificity); 1548 my ($match, $specificity);
1471 1549
1472 for my $region (list) { 1550 for my $region (list) {
1473 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1474 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1475 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1476 } 1554 }
1477 } 1555 }
1478 1556
… …
1598 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1599 return $self; 1677 return $self;
1600 } 1678 }
1601 } 1679 }
1602 1680
1603 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1604 () 1682 ()
1605} 1683}
1606 1684
1607sub init { 1685sub init {
1608 my ($self) = @_; 1686 my ($self) = @_;
… …
1774 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1775 1853
1776 my $path = $self->{path}; 1854 my $path = $self->{path};
1777 1855
1778 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1779 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1780 1859
1781 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1782 1861
1783 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1784 1863
1785 $self->alloc; 1864 $self->alloc;
1786 1865
1787 $self->pre_load; 1866 $self->pre_load;
1788 Coro::cede; 1867 cf::cede_to_tick;
1789 1868
1790 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1791 or return; 1870 or return;
1792 1871
1793 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1799 $self->clear_unique_items; 1878 $self->clear_unique_items;
1800 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1801 } 1880 }
1802 } 1881 }
1803 1882
1804 Coro::cede; 1883 cf::cede_to_tick;
1805 # now do the right thing for maps 1884 # now do the right thing for maps
1806 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1807 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1808 unless $self->difficulty; 1887 unless $self->difficulty;
1809 Coro::cede; 1888 cf::cede_to_tick;
1810 1889
1811 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1812 $self->decay_objects; 1891 $self->decay_objects;
1813 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1814 $self->update_buttons; 1893 $self->update_buttons;
1815 Coro::cede; 1894 cf::cede_to_tick;
1816 $self->set_darkness_map; 1895 $self->set_darkness_map;
1817 Coro::cede; 1896 cf::cede_to_tick;
1818 $self->activate; 1897 $self->activate;
1819 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1820 1902
1821 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1822 } 1904 }
1823 1905
1824 $self->post_load; 1906 $self->post_load;
… …
1835 1917
1836 $self 1918 $self
1837} 1919}
1838 1920
1839# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1840sub load_diag { 1922sub load_neighbours {
1841 my ($map) = @_; 1923 my ($map) = @_;
1842 1924
1843 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1844 1926
1845 for (0 .. 3) { 1927 for (0 .. 3) {
1846 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1847 or next; 1929 or next;
1848 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1849 or next; 1931 or next;
1850 $neigh->load; 1932 $neigh->load;
1851 1933
1934 push @neigh,
1852 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1853 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1854 } 1937 }
1855 1938
1856 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1857 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1858 or next; 1942 or next;
1859 $neigh->load; 1943 $neigh->load;
1860 } 1944 }
1861} 1945}
1862 1946
… …
1867} 1951}
1868 1952
1869sub do_load_sync { 1953sub do_load_sync {
1870 my ($map) = @_; 1954 my ($map) = @_;
1871 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1872 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1873} 1960}
1874 1961
1875our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1876our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1877 1964
1878sub find_async { 1965sub find_async {
1879 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1880 1967
1881 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1882 1969
1883 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1884 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1885 } 1972 }
1886 1973
1887 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1888 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1889 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1890 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1891 my $map = find $path 1979 if (my $map = find $k) {
1892 or next;
1893 $map->load; 1980 $map->load if $v;
1981 }
1894 1982
1895 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1896 } 1984 }
1897 } 1985 }
1898 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1899 }; 1987 };
1900 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1903} 1991}
1904 1992
1905sub save { 1993sub save {
1906 my ($self) = @_; 1994 my ($self) = @_;
1907 1995
1908 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1909 1997
1910 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1911 1999
1912 return unless $self->dirty; 2000 return unless $self->dirty;
1913 2001
… …
1936 my ($self) = @_; 2024 my ($self) = @_;
1937 2025
1938 # save first because save cedes 2026 # save first because save cedes
1939 $self->save; 2027 $self->save;
1940 2028
1941 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1942 2030
1943 return if $self->players; 2031 return if $self->players;
1944 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1945 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1946 2034
… …
2125 2213
2126 } else { 2214 } else {
2127 my $pl = $self->contr; 2215 my $pl = $self->contr;
2128 2216
2129 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2130 my $diag = $pl->{npc_dialog}; 2218 my $dialog = $pl->{npc_dialog};
2131 $diag->{pl}->ext_reply ( 2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2132 $diag->{id},
2133 msgtype => "reply",
2134 msg => $diag->{pl}->expand_cfpod ($msg),
2135 add_topics => []
2136 );
2137 2220
2138 } else { 2221 } else {
2139 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
2140 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2141 } 2224 }
2142 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
2143} 2236}
2144 2237
2145=item $player_object->may ("access") 2238=item $player_object->may ("access")
2146 2239
2147Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
… …
2226 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2227 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2228 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2229 2322
2230 $map->load; 2323 $map->load;
2231 $map->load_diag; 2324 $map->load_neighbours;
2232 2325
2233 return unless $self->contr->active; 2326 return unless $self->contr->active;
2234 $self->activate_recursive; 2327 $self->activate_recursive;
2235 2328
2236 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2237 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
2238} 2331}
2239 2332
2240=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2241 2334
2242Moves the player to the given map-path and coordinates by first freezing 2335Moves the player to the given map-path and coordinates by first freezing
2243her, loading and preparing them map, calling the provided $check callback 2336her, loading and preparing them map, calling the provided $check callback
2244that has to return the map if sucecssful, and then unfreezes the player on 2337that has to return the map if sucecssful, and then unfreezes the player on
2245the new (success) or old (failed) map position. 2338the new (success) or old (failed) map position. In either case, $done will
2339be called at the end of this process.
2246 2340
2247=cut 2341=cut
2248 2342
2249our $GOTOGEN; 2343our $GOTOGEN;
2250 2344
2251sub cf::object::player::goto { 2345sub cf::object::player::goto {
2252 my ($self, $path, $x, $y, $check) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2253 2347
2254 # do generation counting so two concurrent goto's will be executed in-order 2348 # do generation counting so two concurrent goto's will be executed in-order
2255 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2256 2350
2257 $self->enter_link; 2351 $self->enter_link;
… …
2277 2371
2278 if ($gen == $self->{_goto_generation}) { 2372 if ($gen == $self->{_goto_generation}) {
2279 delete $self->{_goto_generation}; 2373 delete $self->{_goto_generation};
2280 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2281 } 2375 }
2376
2377 $done->() if $done;
2282 })->prio (1); 2378 })->prio (1);
2283} 2379}
2284 2380
2285=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
2286 2382
… …
2355 my $hp = $exit->stats->hp; 2451 my $hp = $exit->stats->hp;
2356 my $sp = $exit->stats->sp; 2452 my $sp = $exit->stats->sp;
2357 2453
2358 $self->enter_link; 2454 $self->enter_link;
2359 2455
2456 # if exit is damned, update players death & WoR home-position
2457 $self->contr->savebed ($slaying, $hp, $sp)
2458 if $exit->flag (FLAG_DAMNED);
2459
2360 (async { 2460 (async {
2361 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
2362 unless (eval { 2462 unless (eval {
2363 $self->goto ($slaying, $hp, $sp); 2463 $self->goto ($slaying, $hp, $sp);
2364 2464
… …
2391 2491
2392 utf8::encode $text; 2492 utf8::encode $text;
2393 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2394} 2494}
2395 2495
2396=item $client->send_msg ($color, $type, $msg, [extra...]) 2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2397 2497
2398Send a drawinfo or msg packet to the client, formatting the msg for the 2498Send a drawinfo or msg packet to the client, formatting the msg for the
2399client if neccessary. C<$type> should be a string identifying the type of 2499client if neccessary. C<$type> should be a string identifying the type of
2400the message, with C<log> being the default. If C<$color> is negative, suppress 2500the message, with C<log> being the default. If C<$color> is negative, suppress
2401the message unless the client supports the msg packet. 2501the message unless the client supports the msg packet.
2402 2502
2403=cut 2503=cut
2404 2504
2405sub cf::client::send_msg { 2505sub cf::client::send_msg {
2406 my ($self, $color, $type, $msg, @extra) = @_; 2506 my ($self, $channel, $msg, $color, @extra) = @_;
2407 2507
2408 $msg = $self->pl->expand_cfpod ($msg); 2508 $msg = $self->pl->expand_cfpod ($msg);
2409 2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2522 return unless @extra || length $msg;
2523
2410 if ($self->can_msg) { 2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2411 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2412 } else { 2531 } else {
2413 # replace some tags by gcfclient-compatible ones
2414 for ($msg) {
2415 1 while
2416 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2417 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2418 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2419 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2420 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2421 }
2422
2423 if ($color >= 0) { 2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2424 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2425 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2426 } else { 2550 } else {
2427 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2428 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2429 } 2553 }
2430 } 2554 }
2431 } 2555 }
2432} 2556}
2433 2557
2434=item $client->ext_event ($type, %msg) 2558=item $client->ext_msg ($type, @msg)
2435 2559
2436Sends an ext event to the client. 2560Sends an ext event to the client.
2437 2561
2438=cut 2562=cut
2439 2563
2440sub cf::client::ext_event($$%) { 2564sub cf::client::ext_msg($$@) {
2441 my ($self, $type, %msg) = @_; 2565 my ($self, $type, @msg) = @_;
2442 2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2443 $msg{msgtype} = "event_$type"; 2570 push @msg, msgtype => "event_$type";
2444 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2445} 2591}
2446 2592
2447=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2448 2594
2449Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
… …
2504 my ($ns, $buf) = @_; 2650 my ($ns, $buf) = @_;
2505 2651
2506 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2507 2653
2508 if (ref $msg) { 2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2509 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2662 if (my $cb = $EXTICMD{$type}) {
2510 if (my %reply = $cb->($ns, $msg)) { 2663 @reply = $cb->($ns, @payload);
2511 $reply{msgid} = $msg->{msgid};
2512 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2513 }
2514 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2515 } else { 2669 } else {
2516 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2517 } 2671 }
2518 2672
2519 cf::override; 2673 cf::override;
… …
2566our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2567our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2568 2722
2569$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2570 2724
2571$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2572 2730
2573# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2574 2732
2575=pod 2733=pod
2576 2734
2577The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2578 2736
2579 cf::object contr pay_amount pay_player map 2737 cf::object
2738 contr pay_amount pay_player map x y force_find force_add
2739 insert remove name archname title slaying race decrease_ob_nr
2740
2580 cf::object::player player 2741 cf::object::player
2581 cf::player peaceful 2742 player
2582 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2583 2749
2584=cut 2750=cut
2585 2751
2586for ( 2752for (
2587 ["cf::object" => qw(contr pay_amount pay_player map)], 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2755 decrease_ob_nr)],
2588 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2589 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2590 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2591) { 2759) {
2592 no strict 'refs'; 2760 no strict 'refs';
… …
2668# the server's init and main functions 2836# the server's init and main functions
2669 2837
2670sub load_facedata($) { 2838sub load_facedata($) {
2671 my ($path) = @_; 2839 my ($path) = @_;
2672 2840
2841 # HACK to clear player env face cache, we need some signal framework
2842 # for this (global event?)
2843 %ext::player_env::MUSIC_FACE_CACHE = ();
2844
2845 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2846
2673 warn "loading facedata from $path\n"; 2847 warn "loading facedata from $path\n";
2674 2848
2675 my $facedata; 2849 my $facedata;
2676 0 < aio_load $path, $facedata 2850 0 < aio_load $path, $facedata
2677 or die "$path: $!"; 2851 or die "$path: $!";
… …
2679 $facedata = Coro::Storable::thaw $facedata; 2853 $facedata = Coro::Storable::thaw $facedata;
2680 2854
2681 $facedata->{version} == 2 2855 $facedata->{version} == 2
2682 or cf::cleanup "$path: version mismatch, cannot proceed."; 2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2683 2857
2858 # patch in the exptable
2859 $facedata->{resource}{"res/exp_table"} = {
2860 type => FT_RSRC,
2861 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2862 };
2863 cf::cede_to_tick;
2864
2684 { 2865 {
2685 my $faces = $facedata->{faceinfo}; 2866 my $faces = $facedata->{faceinfo};
2686 2867
2687 while (my ($face, $info) = each %$faces) { 2868 while (my ($face, $info) = each %$faces) {
2688 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2689 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2870 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap};
2690 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2691 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2692 Coro::cede; 2874
2875 cf::cede_to_tick;
2693 } 2876 }
2694 2877
2695 while (my ($face, $info) = each %$faces) { 2878 while (my ($face, $info) = each %$faces) {
2696 next unless $info->{smooth}; 2879 next unless $info->{smooth};
2697 my $idx = cf::face::find $face 2880 my $idx = cf::face::find $face
2698 or next; 2881 or next;
2699 if (my $smooth = cf::face::find $info->{smooth}) { 2882 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth;
2700 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2701 } else { 2885 } else {
2702 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2886 warn "smooth face '$info->{smooth}' not found for face '$face'";
2703 } 2887 }
2704 Coro::cede; 2888
2889 cf::cede_to_tick;
2705 } 2890 }
2706 } 2891 }
2707 2892
2708 { 2893 {
2709 my $anims = $facedata->{animinfo}; 2894 my $anims = $facedata->{animinfo};
2710 2895
2711 while (my ($anim, $info) = each %$anims) { 2896 while (my ($anim, $info) = each %$anims) {
2712 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2897 cf::anim::set $anim, $info->{frames}, $info->{facings};
2713 Coro::cede; 2898 cf::cede_to_tick;
2714 } 2899 }
2715 2900
2716 cf::anim::invalidate_all; # d'oh 2901 cf::anim::invalidate_all; # d'oh
2717 } 2902 }
2718 2903
2904 {
2905 # TODO: for gcfclient pleasure, we should give resources
2906 # that gcfclient doesn't grok a >10000 face index.
2907 my $res = $facedata->{resource};
2908
2909 my $soundconf = delete $res->{"res/sound.conf"};
2910
2911 while (my ($name, $info) = each %$res) {
2912 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2913 my $data;
2914
2915 if ($info->{type} & 1) {
2916 # prepend meta info
2917
2918 my $meta = $enc->encode ({
2919 name => $name,
2920 %{ $info->{meta} || {} },
2921 });
2922
2923 $data = pack "(w/a*)*", $meta, $info->{data};
2924 } else {
2925 $data = $info->{data};
2926 }
2927
2928 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2929 cf::face::set_type $idx, $info->{type};
2930
2931 cf::cede_to_tick;
2932 }
2933
2934 if ($soundconf) {
2935 $soundconf = $enc->decode (delete $soundconf->{data});
2936
2937 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2938 my $sound = $soundconf->{compat}[$_]
2939 or next;
2940
2941 my $face = cf::face::find "sound/$sound->[1]";
2942 cf::sound::set $sound->[0] => $face;
2943 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2944 }
2945
2946 while (my ($k, $v) = each %{$soundconf->{event}}) {
2947 my $face = cf::face::find "sound/$v";
2948 cf::sound::set $k => $face;
2949 }
2950 }
2951 }
2952
2719 1 2953 1
2720} 2954}
2721 2955
2956register_exticmd fx_want => sub {
2957 my ($ns, $want) = @_;
2958
2959 while (my ($k, $v) = each %$want) {
2960 $ns->fx_want ($k, $v);
2961 }
2962};
2963
2722sub reload_regions { 2964sub reload_regions {
2965 # HACK to clear player env face cache, we need some signal framework
2966 # for this (global event?)
2967 %ext::player_env::MUSIC_FACE_CACHE = ();
2968
2723 load_resource_file "$MAPDIR/regions" 2969 load_resource_file "$MAPDIR/regions"
2724 or die "unable to load regions file\n"; 2970 or die "unable to load regions file\n";
2971
2972 for (cf::region::list) {
2973 $_->{match} = qr/$_->{match}/
2974 if exists $_->{match};
2975 }
2725} 2976}
2726 2977
2727sub reload_facedata { 2978sub reload_facedata {
2728 load_facedata "$DATADIR/facedata" 2979 load_facedata "$DATADIR/facedata"
2729 or die "unable to load facedata\n"; 2980 or die "unable to load facedata\n";
… …
2758 3009
2759sub init { 3010sub init {
2760 reload_resources; 3011 reload_resources;
2761} 3012}
2762 3013
2763sub cfg_load { 3014sub reload_config {
2764 open my $fh, "<:utf8", "$CONFDIR/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2765 or return; 3016 or return;
2766 3017
2767 local $/; 3018 local $/;
2768 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
… …
2788 (async { 3039 (async {
2789 Event::one_event; 3040 Event::one_event;
2790 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
2791 }; 3042 };
2792 3043
2793 cfg_load; 3044 reload_config;
2794 db_init; 3045 db_init;
2795 load_extensions; 3046 load_extensions;
2796 3047
2797 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
2798 Event::loop; 3049 Event::loop;
… …
2991 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
2992 require cf; 3243 require cf;
2993 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2994 3245
2995 warn "loading config and database again"; 3246 warn "loading config and database again";
2996 cf::cfg_load; 3247 cf::reload_config;
2997 3248
2998 warn "loading extensions"; 3249 warn "loading extensions";
2999 cf::load_extensions; 3250 cf::load_extensions;
3000 3251
3001 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";

Diff Legend

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