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.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.351 by root, Sun Sep 2 00:57:38 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
… …
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
… …
2000my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2001 2087
2002sub nuke { 2088sub nuke {
2003 my ($self) = @_; 2089 my ($self) = @_;
2004 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2005 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2006 2095
2007 $self->unlink_save; 2096 $self->unlink_save;
2008 2097
2009 bless $self, "cf::map"; 2098 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2099 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2100 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2101 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2102 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2103
2015 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2016 2106
2017 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2018} 2108}
2019 2109
2020=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2127 2217
2128 } else { 2218 } else {
2129 my $pl = $self->contr; 2219 my $pl = $self->contr;
2130 2220
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2223 $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 2224
2140 } else { 2225 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2143 } 2228 }
2144 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2145} 2240}
2146 2241
2147=item $player_object->may ("access") 2242=item $player_object->may ("access")
2148 2243
2149Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2231 2326
2232 $map->load; 2327 $map->load;
2233 $map->load_diag; 2328 $map->load_neighbours;
2234 2329
2235 return unless $self->contr->active; 2330 return unless $self->contr->active;
2236 $self->activate_recursive; 2331 $self->activate_recursive;
2237 2332
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2334 $self->enter_map ($map, $x, $y);
2240} 2335}
2241 2336
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2337=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2338
2244Moves the player to the given map-path and coordinates by first freezing 2339Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2340her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2341that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2342the new (success) or old (failed) map position. In either case, $done will
2343be called at the end of this process.
2248 2344
2249=cut 2345=cut
2250 2346
2251our $GOTOGEN; 2347our $GOTOGEN;
2252 2348
2253sub cf::object::player::goto { 2349sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2350 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2351
2256 # do generation counting so two concurrent goto's will be executed in-order 2352 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2353 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2354
2259 $self->enter_link; 2355 $self->enter_link;
… …
2279 2375
2280 if ($gen == $self->{_goto_generation}) { 2376 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2377 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2378 $self->leave_link ($map, $x, $y);
2283 } 2379 }
2380
2381 $done->() if $done;
2284 })->prio (1); 2382 })->prio (1);
2285} 2383}
2286 2384
2287=item $player_object->enter_exit ($exit_object) 2385=item $player_object->enter_exit ($exit_object)
2288 2386
… …
2397 2495
2398 utf8::encode $text; 2496 utf8::encode $text;
2399 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2497 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2400} 2498}
2401 2499
2402=item $client->send_msg ($color, $type, $msg, [extra...]) 2500=item $client->send_msg ($channel, $msg, $color, [extra...])
2403 2501
2404Send a drawinfo or msg packet to the client, formatting the msg for the 2502Send a drawinfo or msg packet to the client, formatting the msg for the
2405client if neccessary. C<$type> should be a string identifying the type of 2503client if neccessary. C<$type> should be a string identifying the type of
2406the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2407the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2408 2506
2409=cut 2507=cut
2410 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2411sub cf::client::send_msg { 2518sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2413 2520
2414 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2415 2522
2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2527
2528 if (ref $channel) {
2529 # send meta info to client, if not yet sent
2530 unless (exists $self->{channel}{$channel->{id}}) {
2531 $self->{channel}{$channel->{id}} = $channel;
2532 $self->ext_msg (channel_info => $channel);
2533 }
2534
2535 $channel = $channel->{id};
2536 }
2537
2416 return unless @extra || length $msg; 2538 return unless @extra || length $msg;
2417 2539
2418 if ($self->can_msg) { 2540 if ($self->can_msg) {
2541 # default colour, mask it out
2542 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2543 if $color & cf::NDI_DEF;
2544
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2545 $self->send_packet ("msg " . $self->{json_coder}->encode (
2546 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2420 } else { 2547 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 if ($color >= 0) { 2548 if ($color >= 0) {
2549 # replace some tags by gcfclient-compatible ones
2550 for ($msg) {
2551 1 while
2552 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2553 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2554 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2555 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2556 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2557 }
2558
2559 $color &= cf::NDI_COLOR_MASK;
2560
2561 utf8::encode $msg;
2562
2432 if (0 && $msg =~ /\[/) { 2563 if (0 && $msg =~ /\[/) {
2564 # COMMAND/INFO
2433 $self->send_packet ("drawextinfo $color 4 0 $msg") 2565 $self->send_packet ("drawextinfo $color 10 8 $msg")
2434 } else { 2566 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2567 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg") 2568 $self->send_packet ("drawinfo $color $msg")
2437 } 2569 }
2438 } 2570 }
2439 } 2571 }
2440} 2572}
2441 2573
2442=item $client->ext_event ($type, %msg) 2574=item $client->ext_msg ($type, @msg)
2443 2575
2444Sends an ext event to the client. 2576Sends an ext event to the client.
2445 2577
2446=cut 2578=cut
2447 2579
2448sub cf::client::ext_event($$%) { 2580sub cf::client::ext_msg($$@) {
2449 my ($self, $type, %msg) = @_; 2581 my ($self, $type, @msg) = @_;
2450 2582
2583 if ($self->extcmd == 2) {
2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2585 } elsif ($self->extcmd == 1) { # TODO: remove
2451 $msg{msgtype} = "event_$type"; 2586 push @msg, msgtype => "event_$type";
2452 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2606 }
2453} 2607}
2454 2608
2455=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
2456 2610
2457Queues a query to the client, calling the given callback with 2611Queues a query to the client, calling the given callback with
… …
2512 my ($ns, $buf) = @_; 2666 my ($ns, $buf) = @_;
2513 2667
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2668 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515 2669
2516 if (ref $msg) { 2670 if (ref $msg) {
2671 my ($type, $reply, @payload) =
2672 "ARRAY" eq ref $msg
2673 ? @$msg
2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2675
2676 my @reply;
2677
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2678 if (my $cb = $EXTICMD{$type}) {
2518 if (my %reply = $cb->($ns, $msg)) { 2679 @reply = $cb->($ns, @payload);
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2523 } else { 2685 } else {
2524 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525 } 2687 }
2526 2688
2527 cf::override; 2689 cf::override;
… …
2574our $safe = new Safe "safe"; 2736our $safe = new Safe "safe";
2575our $safe_hole = new Safe::Hole; 2737our $safe_hole = new Safe::Hole;
2576 2738
2577$SIG{FPE} = 'IGNORE'; 2739$SIG{FPE} = 'IGNORE';
2578 2740
2579$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2741$safe->permit_only (Opcode::opset qw(
2742 :base_core :base_mem :base_orig :base_math
2743 grepstart grepwhile mapstart mapwhile
2744 sort time
2745));
2580 2746
2581# here we export the classes and methods available to script code 2747# here we export the classes and methods available to script code
2582 2748
2583=pod 2749=pod
2584 2750
2585The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2586 2752
2587 cf::object 2753 cf::object
2588 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2589 insert remove 2755 insert remove name archname title slaying race decrease_ob_nr
2590 2756
2591 cf::object::player 2757 cf::object::player
2592 player 2758 player
2593 2759
2594 cf::player 2760 cf::player
… …
2599 2765
2600=cut 2766=cut
2601 2767
2602for ( 2768for (
2603 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race
2604 insert remove)], 2771 decrease_ob_nr)],
2605 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2606 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2607 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2608) { 2775) {
2609 no strict 'refs'; 2776 no strict 'refs';
… …
2685# the server's init and main functions 2852# the server's init and main functions
2686 2853
2687sub load_facedata($) { 2854sub load_facedata($) {
2688 my ($path) = @_; 2855 my ($path) = @_;
2689 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2690 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2691 2864
2692 my $facedata; 2865 my $facedata;
2693 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2694 or die "$path: $!"; 2867 or die "$path: $!";
… …
2696 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2697 2870
2698 $facedata->{version} == 2 2871 $facedata->{version} == 2
2699 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2700 2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2880
2701 { 2881 {
2702 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2703 2883
2704 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2705 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2706 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2887 cf::face::set_magicmap $idx, $info->{magicmap};
2707 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2708 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2709 Coro::cede; 2890
2891 cf::cede_to_tick;
2710 } 2892 }
2711 2893
2712 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
2713 next unless $info->{smooth}; 2895 next unless $info->{smooth};
2714 my $idx = cf::face::find $face 2896 my $idx = cf::face::find $face
2715 or next; 2897 or next;
2716 if (my $smooth = cf::face::find $info->{smooth}) { 2898 if (my $smooth = cf::face::find $info->{smooth}) {
2899 cf::face::set_smooth $idx, $smooth;
2717 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2900 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2718 } else { 2901 } else {
2719 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2902 warn "smooth face '$info->{smooth}' not found for face '$face'";
2720 } 2903 }
2721 Coro::cede; 2904
2905 cf::cede_to_tick;
2722 } 2906 }
2723 } 2907 }
2724 2908
2725 { 2909 {
2726 my $anims = $facedata->{animinfo}; 2910 my $anims = $facedata->{animinfo};
2727 2911
2728 while (my ($anim, $info) = each %$anims) { 2912 while (my ($anim, $info) = each %$anims) {
2729 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2913 cf::anim::set $anim, $info->{frames}, $info->{facings};
2730 Coro::cede; 2914 cf::cede_to_tick;
2731 } 2915 }
2732 2916
2733 cf::anim::invalidate_all; # d'oh 2917 cf::anim::invalidate_all; # d'oh
2734 } 2918 }
2735 2919
2920 {
2921 # TODO: for gcfclient pleasure, we should give resources
2922 # that gcfclient doesn't grok a >10000 face index.
2923 my $res = $facedata->{resource};
2924
2925 my $soundconf = delete $res->{"res/sound.conf"};
2926
2927 while (my ($name, $info) = each %$res) {
2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2930
2931 if ($info->{type} & 1) {
2932 # prepend meta info
2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2939 $data = pack "(w/a*)*", $meta, $info->{data};
2940 } else {
2941 $data = $info->{data};
2942 }
2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2945 cf::face::set_type $idx, $info->{type};
2946
2947 cf::cede_to_tick;
2948 }
2949
2950 if ($soundconf) {
2951 $soundconf = $enc->decode (delete $soundconf->{data});
2952
2953 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2954 my $sound = $soundconf->{compat}[$_]
2955 or next;
2956
2957 my $face = cf::face::find "sound/$sound->[1]";
2958 cf::sound::set $sound->[0] => $face;
2959 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2960 }
2961
2962 while (my ($k, $v) = each %{$soundconf->{event}}) {
2963 my $face = cf::face::find "sound/$v";
2964 cf::sound::set $k => $face;
2965 }
2966 }
2967 }
2968
2736 1 2969 1
2737} 2970}
2738 2971
2972register_exticmd fx_want => sub {
2973 my ($ns, $want) = @_;
2974
2975 while (my ($k, $v) = each %$want) {
2976 $ns->fx_want ($k, $v);
2977 }
2978};
2979
2739sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2740 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2741 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2987
2988 for (cf::region::list) {
2989 $_->{match} = qr/$_->{match}/
2990 if exists $_->{match};
2991 }
2742} 2992}
2743 2993
2744sub reload_facedata { 2994sub reload_facedata {
2745 load_facedata "$DATADIR/facedata" 2995 load_facedata "$DATADIR/facedata"
2746 or die "unable to load facedata\n"; 2996 or die "unable to load facedata\n";
… …
2775 3025
2776sub init { 3026sub init {
2777 reload_resources; 3027 reload_resources;
2778} 3028}
2779 3029
2780sub cfg_load { 3030sub reload_config {
2781 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2782 or return; 3032 or return;
2783 3033
2784 local $/; 3034 local $/;
2785 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
2805 (async { 3055 (async {
2806 Event::one_event; 3056 Event::one_event;
2807 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
2808 }; 3058 };
2809 3059
2810 cfg_load; 3060 reload_config;
2811 db_init; 3061 db_init;
2812 load_extensions; 3062 load_extensions;
2813 3063
2814 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
2815 Event::loop; 3065 Event::loop;
… …
3008 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3009 require cf; 3259 require cf;
3010 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3011 3261
3012 warn "loading config and database again"; 3262 warn "loading config and database again";
3013 cf::cfg_load; 3263 cf::reload_config;
3014 3264
3015 warn "loading extensions"; 3265 warn "loading extensions";
3016 cf::load_extensions; 3266 cf::load_extensions;
3017 3267
3018 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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