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.305 by root, Thu Jul 12 08:40:14 2007 UTC vs.
Revision 1.346 by root, Tue Aug 28 19:38:40 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
166=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
167 168
168These 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
169returns 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
170per 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.
171 178
172=back 179=back
173 180
174=cut 181=cut
175 182
… …
316 }; 323 };
317 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
318 $guard 325 $guard
319} 326}
320 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
321=item cf::async { BLOCK } 384=item cf::async { BLOCK }
322 385
323Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
324C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
325thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
410Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
412 475
413=cut 476=cut
414 477
415sub _store_scalar {
416 open my $fh, ">", \my $buf
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422}
423
424sub fork_call(&@) { 478sub fork_call(&@) {
425 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
426 480
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
430 or die "pipe: $!";
431 484
432 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
433 close $fh2;
434
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
436 warn "pst<$res>" unless $res =~ /^pst/;
437 $res = Coro::Storable::thaw $res;
438
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals; 486 reset_signals;
446 local $SIG{__WARN__}; 487 &$cb
447 local $SIG{__DIE__}; 488 }, @args;
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453 489
454 eval { 490 wantarray ? @res : $res[-1]
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 }
466} 491}
467 492
468=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
469 494
470Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
550 if (1) { 575 if (1) {
551 $md5 = 576 $md5 =
552 join "\x00", 577 join "\x00",
553 $processversion, 578 $processversion,
554 map { 579 map {
555 Coro::cede; 580 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 582 } 0.. $#$src;
558 583
559 584
560 my $dbmd5 = db_get cache => "$id/md5"; 585 my $dbmd5 = db_get cache => "$id/md5";
… …
866 "; 891 ";
867 die if $@; 892 die if $@;
868} 893}
869 894
870our $override; 895our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 897
873sub override { 898sub override {
874 $override = 1; 899 $override = 1;
875 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
876} 901}
877 902
878sub do_invoke { 903sub do_invoke {
879 my $event = shift; 904 my $event = shift;
880 my $callbacks = shift; 905 my $callbacks = shift;
881 906
882 @invoke_results = (); 907 @INVOKE_RESULTS = ();
883 908
884 local $override; 909 local $override;
885 910
886 for (@$callbacks) { 911 for (@$callbacks) {
887 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
904 929
905Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
906 931
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 935
911=back 936=back
912 937
913=cut 938=cut
914 939
915############################################################################# 940#############################################################################
916# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
917 953
918sub reattach { 954sub reattach {
919 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 956 my ($obj) = @_;
921 957
… …
1108 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1109 1145
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1147
1112 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1118 } else { 1163 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1165 }
1121 1166
1122 cf::override; 1167 cf::override;
… …
1277 1322
1278 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1280 1325
1281 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1282 Coro::cede; 1327 cf::cede_to_tick;
1283} 1328}
1284 1329
1285sub new($) { 1330sub new($) {
1286 my ($login) = @_; 1331 my ($login) = @_;
1287 1332
… …
1291 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1292 1337
1293 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1294 1339
1295 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1296} 1351}
1297 1352
1298=item $pl->quit_character 1353=item $pl->quit_character
1299 1354
1300Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1444sub hintmode { 1499sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1501 $_[0]{hintmode}
1447} 1502}
1448 1503
1449=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1450 1505
1451Sends an ext reply to the player. 1506Sends an ext reply to the player.
1452 1507
1453=cut 1508=cut
1454 1509
1455sub ext_reply($$%) { 1510sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1457 1512
1458 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1514}
1461 1515
1462=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1463 1517
1464Sends an ext event to the client. 1518Sends an ext event to the client.
1465 1519
1466=cut 1520=cut
1467 1521
1468sub ext_event($$%) { 1522sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1470 1524
1471 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1472} 1526}
1473 1527
1474=head3 cf::region 1528=head3 cf::region
1475 1529
1476=over 4 1530=over 4
… …
1619 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1620 return $self; 1674 return $self;
1621 } 1675 }
1622 } 1676 }
1623 1677
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1679 ()
1626} 1680}
1627 1681
1628sub init { 1682sub init {
1629 my ($self) = @_; 1683 my ($self) = @_;
… …
1795 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1796 1850
1797 my $path = $self->{path}; 1851 my $path = $self->{path};
1798 1852
1799 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1800 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1801 1856
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1803 1858
1804 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1805 1860
1806 $self->alloc; 1861 $self->alloc;
1807 1862
1808 $self->pre_load; 1863 $self->pre_load;
1809 Coro::cede; 1864 cf::cede_to_tick;
1810 1865
1811 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1812 or return; 1867 or return;
1813 1868
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1820 $self->clear_unique_items; 1875 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1822 } 1877 }
1823 } 1878 }
1824 1879
1825 Coro::cede; 1880 cf::cede_to_tick;
1826 # now do the right thing for maps 1881 # now do the right thing for maps
1827 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 1884 unless $self->difficulty;
1830 Coro::cede; 1885 cf::cede_to_tick;
1831 1886
1832 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 1888 $self->decay_objects;
1834 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1835 $self->update_buttons; 1890 $self->update_buttons;
1836 Coro::cede; 1891 cf::cede_to_tick;
1837 $self->set_darkness_map; 1892 $self->set_darkness_map;
1838 Coro::cede; 1893 cf::cede_to_tick;
1839 $self->activate; 1894 $self->activate;
1840 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1841 1899
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1901 }
1844 1902
1845 $self->post_load; 1903 $self->post_load;
… …
1856 1914
1857 $self 1915 $self
1858} 1916}
1859 1917
1860# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1861sub load_diag { 1919sub load_neighbours {
1862 my ($map) = @_; 1920 my ($map) = @_;
1863 1921
1864 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1865 1923
1866 for (0 .. 3) { 1924 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1868 or next; 1926 or next;
1869 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1870 or next; 1928 or next;
1871 $neigh->load; 1929 $neigh->load;
1872 1930
1931 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 1934 }
1876 1935
1877 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1879 or next; 1939 or next;
1880 $neigh->load; 1940 $neigh->load;
1881 } 1941 }
1882} 1942}
1883 1943
… …
1888} 1948}
1889 1949
1890sub do_load_sync { 1950sub do_load_sync {
1891 my ($map) = @_; 1951 my ($map) = @_;
1892 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1893 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1894} 1957}
1895 1958
1896our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1898 1961
1899sub find_async { 1962sub find_async {
1900 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1901 1964
1902 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1903 1966
1904 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1906 } 1969 }
1907 1970
1908 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1909 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 1976 if (my $map = find $k) {
1913 or next;
1914 $map->load; 1977 $map->load if $v;
1978 }
1915 1979
1916 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1917 } 1981 }
1918 } 1982 }
1919 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1920 }; 1984 };
1921 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1924} 1988}
1925 1989
1926sub save { 1990sub save {
1927 my ($self) = @_; 1991 my ($self) = @_;
1928 1992
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 1994
1931 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1932 1996
1933 return unless $self->dirty; 1997 return unless $self->dirty;
1934 1998
… …
1957 my ($self) = @_; 2021 my ($self) = @_;
1958 2022
1959 # save first because save cedes 2023 # save first because save cedes
1960 $self->save; 2024 $self->save;
1961 2025
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2027
1964 return if $self->players; 2028 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1967 2031
… …
2146 2210
2147 } else { 2211 } else {
2148 my $pl = $self->contr; 2212 my $pl = $self->contr;
2149 2213
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2217
2159 } else { 2218 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2162 } 2221 }
2163 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
2164} 2233}
2165 2234
2166=item $player_object->may ("access") 2235=item $player_object->may ("access")
2167 2236
2168Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2247 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2250 2319
2251 $map->load; 2320 $map->load;
2252 $map->load_diag; 2321 $map->load_neighbours;
2253 2322
2254 return unless $self->contr->active; 2323 return unless $self->contr->active;
2255 $self->activate_recursive; 2324 $self->activate_recursive;
2256 2325
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
2259} 2328}
2260 2329
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2331
2263Moves the player to the given map-path and coordinates by first freezing 2332Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2333her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2334that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2335the new (success) or old (failed) map position. In either case, $done will
2336be called at the end of this process.
2267 2337
2268=cut 2338=cut
2269 2339
2270our $GOTOGEN; 2340our $GOTOGEN;
2271 2341
2272sub cf::object::player::goto { 2342sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2344
2275 # do generation counting so two concurrent goto's will be executed in-order 2345 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2347
2278 $self->enter_link; 2348 $self->enter_link;
… …
2298 2368
2299 if ($gen == $self->{_goto_generation}) { 2369 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2370 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2302 } 2372 }
2373
2374 $done->() if $done;
2303 })->prio (1); 2375 })->prio (1);
2304} 2376}
2305 2377
2306=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
2307 2379
… …
2416 2488
2417 utf8::encode $text; 2489 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2491}
2420 2492
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2494
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2495Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2496client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2497the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2498the message unless the client supports the msg packet.
2427 2499
2428=cut 2500=cut
2429 2501
2430sub cf::client::send_msg { 2502sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2503 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2504
2433 $msg = $self->pl->expand_cfpod ($msg); 2505 $msg = $self->pl->expand_cfpod ($msg);
2434 2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2435 return unless @extra || length $msg; 2519 return unless @extra || length $msg;
2436 2520
2437 if ($self->can_msg) { 2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2528 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2451 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2547 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2456 } 2550 }
2457 } 2551 }
2458 } 2552 }
2459} 2553}
2460 2554
2461=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2462 2556
2463Sends an ext event to the client. 2557Sends an ext event to the client.
2464 2558
2465=cut 2559=cut
2466 2560
2467sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2469 2563
2470 return unless $self->extcmd; 2564 if ($self->extcmd == 2) {
2471 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2472 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2473 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2474} 2588}
2475 2589
2476=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2477 2591
2478Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
… …
2533 my ($ns, $buf) = @_; 2647 my ($ns, $buf) = @_;
2534 2648
2535 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2536 2650
2537 if (ref $msg) { 2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2538 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2659 if (my $cb = $EXTICMD{$type}) {
2539 if (my %reply = $cb->($ns, $msg)) { 2660 @reply = $cb->($ns, @payload);
2540 $reply{msgid} = $msg->{msgid};
2541 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2542 }
2543 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2544 } else { 2666 } else {
2545 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2546 } 2668 }
2547 2669
2548 cf::override; 2670 cf::override;
… …
2595our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2596our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2597 2719
2598$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2599 2721
2600$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2601 2727
2602# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2603 2729
2604=pod 2730=pod
2605 2731
2606The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2607 2733
2608 cf::object 2734 cf::object
2609 contr pay_amount pay_player map x y force_find force_add 2735 contr pay_amount pay_player map x y force_find force_add
2610 insert remove 2736 insert remove name archname title slaying race decrease_ob_nr
2611 2737
2612 cf::object::player 2738 cf::object::player
2613 player 2739 player
2614 2740
2615 cf::player 2741 cf::player
… …
2620 2746
2621=cut 2747=cut
2622 2748
2623for ( 2749for (
2624 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2625 insert remove)], 2752 decrease_ob_nr)],
2626 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2627 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2628 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2629) { 2756) {
2630 no strict 'refs'; 2757 no strict 'refs';
… …
2706# the server's init and main functions 2833# the server's init and main functions
2707 2834
2708sub load_facedata($) { 2835sub load_facedata($) {
2709 my ($path) = @_; 2836 my ($path) = @_;
2710 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2711 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2712 2841
2713 my $facedata; 2842 my $facedata;
2714 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2715 or die "$path: $!"; 2844 or die "$path: $!";
2716 2845
2717 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2718 2847
2719 $facedata->{version} == 2 2848 $facedata->{version} == 2
2720 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2721 2857
2722 { 2858 {
2723 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2724 2860
2725 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2726 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2727 cf::face::set_visibility $idx, $info->{visibility}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2728 cf::face::set_magicmap $idx, $info->{magicmap}; 2864 cf::face::set_magicmap $idx, $info->{magicmap};
2729 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2730 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2731 2867
2732 cf::cede_to_tick; 2868 cf::cede_to_tick;
2733 } 2869 }
2734 2870
2735 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
… …
2760 2896
2761 { 2897 {
2762 # TODO: for gcfclient pleasure, we should give resources 2898 # TODO: for gcfclient pleasure, we should give resources
2763 # that gcfclient doesn't grok a >10000 face index. 2899 # that gcfclient doesn't grok a >10000 face index.
2764 my $res = $facedata->{resource}; 2900 my $res = $facedata->{resource};
2765 my $enc = JSON::XS->new->utf8->canonical; 2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2766 2903
2767 while (my ($name, $info) = each %$res) { 2904 while (my ($name, $info) = each %$res) {
2768 my $meta = $enc->encode ({
2769 name => $name,
2770 type => $info->{type},
2771 copyright => $info->{copyright}, #TODO#
2772 });
2773 my $data = pack "(w/a*)*", $meta, $info->{data};
2774 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2775
2776 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2777 cf::face::set_type $idx, 1; 2922 cf::face::set_type $idx, $info->{type};
2778 cf::face::set_data $idx, 0, $data, $chk;
2779 2923
2780 cf::cede_to_tick; 2924 cf::cede_to_tick;
2781 } 2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2782 } 2944 }
2783 2945
2784 1 2946 1
2785} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2786 2956
2787sub reload_regions { 2957sub reload_regions {
2788 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2789 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2790 2960
… …
2828 2998
2829sub init { 2999sub init {
2830 reload_resources; 3000 reload_resources;
2831} 3001}
2832 3002
2833sub cfg_load { 3003sub reload_config {
2834 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2835 or return; 3005 or return;
2836 3006
2837 local $/; 3007 local $/;
2838 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2858 (async { 3028 (async {
2859 Event::one_event; 3029 Event::one_event;
2860 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2861 }; 3031 };
2862 3032
2863 cfg_load; 3033 reload_config;
2864 db_init; 3034 db_init;
2865 load_extensions; 3035 load_extensions;
2866 3036
2867 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2868 Event::loop; 3038 Event::loop;
… …
3061 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3062 require cf; 3232 require cf;
3063 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3064 3234
3065 warn "loading config and database again"; 3235 warn "loading config and database again";
3066 cf::cfg_load; 3236 cf::reload_config;
3067 3237
3068 warn "loading extensions"; 3238 warn "loading extensions";
3069 cf::load_extensions; 3239 cf::load_extensions;
3070 3240
3071 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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