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.293 by root, Tue Jul 3 05:14:15 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
1418 1495 s/\n\n+/\n/g; # double lines
1419 s/^\s+//; 1496 s/^\n+//; # beginning lines
1420 s/\s+$//; 1497 s/\n+$//; # ending lines
1421 1498
1422 $_ 1499 $_
1423} 1500}
1424 1501
1425sub hintmode { 1502sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1504 $_[0]{hintmode}
1428} 1505}
1429 1506
1430=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1431 1508
1432Sends an ext reply to the player. 1509Sends an ext reply to the player.
1433 1510
1434=cut 1511=cut
1435 1512
1436sub ext_reply($$%) { 1513sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1438 1515
1439 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1517}
1442 1518
1443=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1444 1520
1445Sends an ext event to the client. 1521Sends an ext event to the client.
1446 1522
1447=cut 1523=cut
1448 1524
1449sub ext_event($$%) { 1525sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1451 1527
1452 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1453} 1529}
1454 1530
1455=head3 cf::region 1531=head3 cf::region
1456 1532
1457=over 4 1533=over 4
… …
1470 my ($path) = @_; 1546 my ($path) = @_;
1471 1547
1472 my ($match, $specificity); 1548 my ($match, $specificity);
1473 1549
1474 for my $region (list) { 1550 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1478 } 1554 }
1479 } 1555 }
1480 1556
… …
1600 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1601 return $self; 1677 return $self;
1602 } 1678 }
1603 } 1679 }
1604 1680
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1682 ()
1607} 1683}
1608 1684
1609sub init { 1685sub init {
1610 my ($self) = @_; 1686 my ($self) = @_;
… …
1776 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1777 1853
1778 my $path = $self->{path}; 1854 my $path = $self->{path};
1779 1855
1780 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1781 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1782 1859
1783 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1784 1861
1785 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1786 1863
1787 $self->alloc; 1864 $self->alloc;
1788 1865
1789 $self->pre_load; 1866 $self->pre_load;
1790 Coro::cede; 1867 cf::cede_to_tick;
1791 1868
1792 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1793 or return; 1870 or return;
1794 1871
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1801 $self->clear_unique_items; 1878 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1803 } 1880 }
1804 } 1881 }
1805 1882
1806 Coro::cede; 1883 cf::cede_to_tick;
1807 # now do the right thing for maps 1884 # now do the right thing for maps
1808 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 1887 unless $self->difficulty;
1811 Coro::cede; 1888 cf::cede_to_tick;
1812 1889
1813 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 1891 $self->decay_objects;
1815 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1816 $self->update_buttons; 1893 $self->update_buttons;
1817 Coro::cede; 1894 cf::cede_to_tick;
1818 $self->set_darkness_map; 1895 $self->set_darkness_map;
1819 Coro::cede; 1896 cf::cede_to_tick;
1820 $self->activate; 1897 $self->activate;
1821 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1822 1902
1823 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 1904 }
1825 1905
1826 $self->post_load; 1906 $self->post_load;
… …
1837 1917
1838 $self 1918 $self
1839} 1919}
1840 1920
1841# 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
1842sub load_diag { 1922sub load_neighbours {
1843 my ($map) = @_; 1923 my ($map) = @_;
1844 1924
1845 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1846 1926
1847 for (0 .. 3) { 1927 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1849 or next; 1929 or next;
1850 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1851 or next; 1931 or next;
1852 $neigh->load; 1932 $neigh->load;
1853 1933
1934 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 1937 }
1857 1938
1858 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1860 or next; 1942 or next;
1861 $neigh->load; 1943 $neigh->load;
1862 } 1944 }
1863} 1945}
1864 1946
… …
1869} 1951}
1870 1952
1871sub do_load_sync { 1953sub do_load_sync {
1872 my ($map) = @_; 1954 my ($map) = @_;
1873 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1874 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1875} 1960}
1876 1961
1877our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1879 1964
1880sub find_async { 1965sub find_async {
1881 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1882 1967
1883 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1884 1969
1885 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1887 } 1972 }
1888 1973
1889 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1890 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 1979 if (my $map = find $k) {
1894 or next;
1895 $map->load; 1980 $map->load if $v;
1981 }
1896 1982
1897 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1898 } 1984 }
1899 } 1985 }
1900 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1901 }; 1987 };
1902 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1905} 1991}
1906 1992
1907sub save { 1993sub save {
1908 my ($self) = @_; 1994 my ($self) = @_;
1909 1995
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 1997
1912 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1913 1999
1914 return unless $self->dirty; 2000 return unless $self->dirty;
1915 2001
… …
1938 my ($self) = @_; 2024 my ($self) = @_;
1939 2025
1940 # save first because save cedes 2026 # save first because save cedes
1941 $self->save; 2027 $self->save;
1942 2028
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2030
1945 return if $self->players; 2031 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1947 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1948 2034
… …
2127 2213
2128 } else { 2214 } else {
2129 my $pl = $self->contr; 2215 my $pl = $self->contr;
2130 2216
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2218 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2219 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2220
2140 } else { 2221 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2143 } 2224 }
2144 } 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 (@_);
2145} 2236}
2146 2237
2147=item $player_object->may ("access") 2238=item $player_object->may ("access")
2148 2239
2149Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2231 2322
2232 $map->load; 2323 $map->load;
2233 $map->load_diag; 2324 $map->load_neighbours;
2234 2325
2235 return unless $self->contr->active; 2326 return unless $self->contr->active;
2236 $self->activate_recursive; 2327 $self->activate_recursive;
2237 2328
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2330 $self->enter_map ($map, $x, $y);
2240} 2331}
2241 2332
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2333=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2334
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2336her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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.
2248 2340
2249=cut 2341=cut
2250 2342
2251our $GOTOGEN; 2343our $GOTOGEN;
2252 2344
2253sub cf::object::player::goto { 2345sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2346 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2347
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2349 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2350
2259 $self->enter_link; 2351 $self->enter_link;
… …
2279 2371
2280 if ($gen == $self->{_goto_generation}) { 2372 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2373 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2374 $self->leave_link ($map, $x, $y);
2283 } 2375 }
2376
2377 $done->() if $done;
2284 })->prio (1); 2378 })->prio (1);
2285} 2379}
2286 2380
2287=item $player_object->enter_exit ($exit_object) 2381=item $player_object->enter_exit ($exit_object)
2288 2382
… …
2357 my $hp = $exit->stats->hp; 2451 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp; 2452 my $sp = $exit->stats->sp;
2359 2453
2360 $self->enter_link; 2454 $self->enter_link;
2361 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
2362 (async { 2460 (async {
2363 $self->deactivate_recursive; # just to be sure 2461 $self->deactivate_recursive; # just to be sure
2364 unless (eval { 2462 unless (eval {
2365 $self->goto ($slaying, $hp, $sp); 2463 $self->goto ($slaying, $hp, $sp);
2366 2464
… …
2393 2491
2394 utf8::encode $text; 2492 utf8::encode $text;
2395 $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);
2396} 2494}
2397 2495
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2497
2400Send 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
2401client 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
2402the 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
2403the message unless the client supports the msg packet. 2501the message unless the client supports the msg packet.
2404 2502
2405=cut 2503=cut
2406 2504
2407sub cf::client::send_msg { 2505sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2506 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2507
2410 $msg = $self->pl->expand_cfpod ($msg); 2508 $msg = $self->pl->expand_cfpod ($msg);
2411 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
2412 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
2413 $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]));
2414 } else { 2531 } else {
2415 # replace some tags by gcfclient-compatible ones
2416 for ($msg) {
2417 1 while
2418 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2419 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2420 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2421 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2422 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2423 }
2424
2425 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
2426 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2427 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2428 } else { 2550 } else {
2429 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2430 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2431 } 2553 }
2432 } 2554 }
2433 } 2555 }
2434} 2556}
2435 2557
2436=item $client->ext_event ($type, %msg) 2558=item $client->ext_msg ($type, @msg)
2437 2559
2438Sends an ext event to the client. 2560Sends an ext event to the client.
2439 2561
2440=cut 2562=cut
2441 2563
2442sub cf::client::ext_event($$%) { 2564sub cf::client::ext_msg($$@) {
2443 my ($self, $type, %msg) = @_; 2565 my ($self, $type, @msg) = @_;
2444 2566
2567 if ($self->extcmd == 2) {
2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2445 $msg{msgtype} = "event_$type"; 2570 push @msg, msgtype => "event_$type";
2446 $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 }
2447} 2591}
2448 2592
2449=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2450 2594
2451Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
… …
2506 my ($ns, $buf) = @_; 2650 my ($ns, $buf) = @_;
2507 2651
2508 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2509 2653
2510 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
2511 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2662 if (my $cb = $EXTICMD{$type}) {
2512 if (my %reply = $cb->($ns, $msg)) { 2663 @reply = $cb->($ns, @payload);
2513 $reply{msgid} = $msg->{msgid};
2514 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2515 }
2516 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2517 } else { 2669 } else {
2518 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";
2519 } 2671 }
2520 2672
2521 cf::override; 2673 cf::override;
… …
2568our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2569our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2570 2722
2571$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2572 2724
2573$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));
2574 2730
2575# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2576 2732
2577=pod 2733=pod
2578 2734
2579The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2580 2736
2581 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
2582 cf::object::player player 2741 cf::object::player
2583 cf::player peaceful 2742 player
2584 cf::map trigger 2743
2744 cf::player
2745 peaceful
2746
2747 cf::map
2748 trigger
2585 2749
2586=cut 2750=cut
2587 2751
2588for ( 2752for (
2589 ["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)],
2590 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2591 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2592 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2593) { 2759) {
2594 no strict 'refs'; 2760 no strict 'refs';
… …
2670# the server's init and main functions 2836# the server's init and main functions
2671 2837
2672sub load_facedata($) { 2838sub load_facedata($) {
2673 my ($path) = @_; 2839 my ($path) = @_;
2674 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
2675 warn "loading facedata from $path\n"; 2847 warn "loading facedata from $path\n";
2676 2848
2677 my $facedata; 2849 my $facedata;
2678 0 < aio_load $path, $facedata 2850 0 < aio_load $path, $facedata
2679 or die "$path: $!"; 2851 or die "$path: $!";
… …
2681 $facedata = Coro::Storable::thaw $facedata; 2853 $facedata = Coro::Storable::thaw $facedata;
2682 2854
2683 $facedata->{version} == 2 2855 $facedata->{version} == 2
2684 or cf::cleanup "$path: version mismatch, cannot proceed."; 2856 or cf::cleanup "$path: version mismatch, cannot proceed.";
2685 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
2686 { 2865 {
2687 my $faces = $facedata->{faceinfo}; 2866 my $faces = $facedata->{faceinfo};
2688 2867
2689 while (my ($face, $info) = each %$faces) { 2868 while (my ($face, $info) = each %$faces) {
2690 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2869 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2691 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2870 cf::face::set_visibility $idx, $info->{visibility};
2871 cf::face::set_magicmap $idx, $info->{magicmap};
2692 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2872 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2693 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2873 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2694 Coro::cede; 2874
2875 cf::cede_to_tick;
2695 } 2876 }
2696 2877
2697 while (my ($face, $info) = each %$faces) { 2878 while (my ($face, $info) = each %$faces) {
2698 next unless $info->{smooth}; 2879 next unless $info->{smooth};
2699 my $idx = cf::face::find $face 2880 my $idx = cf::face::find $face
2700 or next; 2881 or next;
2701 if (my $smooth = cf::face::find $info->{smooth}) { 2882 if (my $smooth = cf::face::find $info->{smooth}) {
2883 cf::face::set_smooth $idx, $smooth;
2702 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2884 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2703 } else { 2885 } else {
2704 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2886 warn "smooth face '$info->{smooth}' not found for face '$face'";
2705 } 2887 }
2706 Coro::cede; 2888
2889 cf::cede_to_tick;
2707 } 2890 }
2708 } 2891 }
2709 2892
2710 { 2893 {
2711 my $anims = $facedata->{animinfo}; 2894 my $anims = $facedata->{animinfo};
2712 2895
2713 while (my ($anim, $info) = each %$anims) { 2896 while (my ($anim, $info) = each %$anims) {
2714 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2897 cf::anim::set $anim, $info->{frames}, $info->{facings};
2715 Coro::cede; 2898 cf::cede_to_tick;
2716 } 2899 }
2717 2900
2718 cf::anim::invalidate_all; # d'oh 2901 cf::anim::invalidate_all; # d'oh
2719 } 2902 }
2720 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
2721 1 2953 1
2722} 2954}
2723 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
2724sub 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
2725 load_resource_file "$MAPDIR/regions" 2969 load_resource_file "$MAPDIR/regions"
2726 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 }
2727} 2976}
2728 2977
2729sub reload_facedata { 2978sub reload_facedata {
2730 load_facedata "$DATADIR/facedata" 2979 load_facedata "$DATADIR/facedata"
2731 or die "unable to load facedata\n"; 2980 or die "unable to load facedata\n";
… …
2760 3009
2761sub init { 3010sub init {
2762 reload_resources; 3011 reload_resources;
2763} 3012}
2764 3013
2765sub cfg_load { 3014sub reload_config {
2766 open my $fh, "<:utf8", "$CONFDIR/config" 3015 open my $fh, "<:utf8", "$CONFDIR/config"
2767 or return; 3016 or return;
2768 3017
2769 local $/; 3018 local $/;
2770 *CFG = YAML::Syck::Load <$fh>; 3019 *CFG = YAML::Syck::Load <$fh>;
… …
2790 (async { 3039 (async {
2791 Event::one_event; 3040 Event::one_event;
2792 })->prio (Coro::PRIO_MAX); 3041 })->prio (Coro::PRIO_MAX);
2793 }; 3042 };
2794 3043
2795 cfg_load; 3044 reload_config;
2796 db_init; 3045 db_init;
2797 load_extensions; 3046 load_extensions;
2798 3047
2799 $TICK_WATCHER->start; 3048 $TICK_WATCHER->start;
2800 Event::loop; 3049 Event::loop;
… …
2993 warn "reloading cf.pm"; 3242 warn "reloading cf.pm";
2994 require cf; 3243 require cf;
2995 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3244 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2996 3245
2997 warn "loading config and database again"; 3246 warn "loading config and database again";
2998 cf::cfg_load; 3247 cf::reload_config;
2999 3248
3000 warn "loading extensions"; 3249 warn "loading extensions";
3001 cf::load_extensions; 3250 cf::load_extensions;
3002 3251
3003 warn "reattaching attachments to objects/players"; 3252 warn "reattaching attachments to objects/players";

Diff Legend

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