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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 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
… …
315 }; 323 };
316 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
317 $guard 325 $guard
318} 326}
319 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
320=item cf::async { BLOCK } 384=item cf::async { BLOCK }
321 385
322Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
323C<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
324thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
412=cut 476=cut
413 477
414sub fork_call(&@) { 478sub fork_call(&@) {
415 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
416 480
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 484
422 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 486 reset_signals;
436 local $SIG{__WARN__}; 487 &$cb
437 local $SIG{__DIE__}; 488 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 489
443 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 491}
461 492
462=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
463 494
464Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
860 "; 891 ";
861 die if $@; 892 die if $@;
862} 893}
863 894
864our $override; 895our $override;
865our @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?
866 897
867sub override { 898sub override {
868 $override = 1; 899 $override = 1;
869 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
870} 901}
871 902
872sub do_invoke { 903sub do_invoke {
873 my $event = shift; 904 my $event = shift;
874 my $callbacks = shift; 905 my $callbacks = shift;
875 906
876 @invoke_results = (); 907 @INVOKE_RESULTS = ();
877 908
878 local $override; 909 local $override;
879 910
880 for (@$callbacks) { 911 for (@$callbacks) {
881 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
898 929
899Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
900 931
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 935
905=back 936=back
906 937
907=cut 938=cut
908 939
909############################################################################# 940#############################################################################
910# 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}
911 953
912sub reattach { 954sub reattach {
913 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 956 my ($obj) = @_;
915 957
… …
1102 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1103 1145
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1147
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1112 } else { 1163 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1165 }
1115 1166
1116 cf::override; 1167 cf::override;
… …
1285 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1286 1337
1287 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1288 1339
1289 $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 (@_);
1290} 1351}
1291 1352
1292=item $pl->quit_character 1353=item $pl->quit_character
1293 1354
1294Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1438sub hintmode { 1499sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1501 $_[0]{hintmode}
1441} 1502}
1442 1503
1443=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1444 1505
1445Sends an ext reply to the player. 1506Sends an ext reply to the player.
1446 1507
1447=cut 1508=cut
1448 1509
1449sub ext_reply($$%) { 1510sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1451 1512
1452 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1514}
1455 1515
1456=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1457 1517
1458Sends an ext event to the client. 1518Sends an ext event to the client.
1459 1519
1460=cut 1520=cut
1461 1521
1462sub ext_event($$%) { 1522sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1464 1524
1465 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1466} 1526}
1467 1527
1468=head3 cf::region 1528=head3 cf::region
1469 1529
1470=over 4 1530=over 4
… …
1483 my ($path) = @_; 1543 my ($path) = @_;
1484 1544
1485 my ($match, $specificity); 1545 my ($match, $specificity);
1486 1546
1487 for my $region (list) { 1547 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1491 } 1551 }
1492 } 1552 }
1493 1553
… …
1613 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1614 return $self; 1674 return $self;
1615 } 1675 }
1616 } 1676 }
1617 1677
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1679 ()
1620} 1680}
1621 1681
1622sub init { 1682sub init {
1623 my ($self) = @_; 1683 my ($self) = @_;
… …
1789 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1790 1850
1791 my $path = $self->{path}; 1851 my $path = $self->{path};
1792 1852
1793 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1794 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1795 1856
1796 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1797 1858
1798 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1799 1860
… …
1831 $self->set_darkness_map; 1892 $self->set_darkness_map;
1832 Coro::cede; 1893 Coro::cede;
1833 $self->activate; 1894 $self->activate;
1834 } 1895 }
1835 1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1899
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1901 }
1838 1902
1839 $self->post_load; 1903 $self->post_load;
1840} 1904}
… …
1850 1914
1851 $self 1915 $self
1852} 1916}
1853 1917
1854# 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
1855sub load_diag { 1919sub load_neighbours {
1856 my ($map) = @_; 1920 my ($map) = @_;
1857 1921
1858 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1859 1923
1860 for (0 .. 3) { 1924 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1862 or next; 1926 or next;
1863 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1864 or next; 1928 or next;
1865 $neigh->load; 1929 $neigh->load;
1866 1930
1931 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1934 }
1870 1935
1871 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1873 or next; 1939 or next;
1874 $neigh->load; 1940 $neigh->load;
1875 } 1941 }
1876} 1942}
1877 1943
… …
1882} 1948}
1883 1949
1884sub do_load_sync { 1950sub do_load_sync {
1885 my ($map) = @_; 1951 my ($map) = @_;
1886 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1887 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1888} 1957}
1889 1958
1890our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1892 1961
1893sub find_async { 1962sub find_async {
1894 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1895 1964
1896 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1897 1966
1898 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1900 } 1969 }
1901 1970
1902 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1903 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 1976 if (my $map = find $k) {
1907 or next;
1908 $map->load; 1977 $map->load if $v;
1978 }
1909 1979
1910 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1911 } 1981 }
1912 } 1982 }
1913 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1914 }; 1984 };
1915 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1918} 1988}
1919 1989
1920sub save { 1990sub save {
1921 my ($self) = @_; 1991 my ($self) = @_;
1922 1992
1923 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1924 1994
1925 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1926 1996
1927 return unless $self->dirty; 1997 return unless $self->dirty;
1928 1998
… …
1951 my ($self) = @_; 2021 my ($self) = @_;
1952 2022
1953 # save first because save cedes 2023 # save first because save cedes
1954 $self->save; 2024 $self->save;
1955 2025
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2027
1958 return if $self->players; 2028 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1961 2031
… …
2140 2210
2141 } else { 2211 } else {
2142 my $pl = $self->contr; 2212 my $pl = $self->contr;
2143 2213
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2217
2153 } else { 2218 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2156 } 2221 }
2157 } 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 (@_);
2158} 2233}
2159 2234
2160=item $player_object->may ("access") 2235=item $player_object->may ("access")
2161 2236
2162Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2244 2319
2245 $map->load; 2320 $map->load;
2246 $map->load_diag; 2321 $map->load_neighbours;
2247 2322
2248 return unless $self->contr->active; 2323 return unless $self->contr->active;
2249 $self->activate_recursive; 2324 $self->activate_recursive;
2250 2325
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
2253} 2328}
2254 2329
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2331
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2333her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2337
2262=cut 2338=cut
2263 2339
2264our $GOTOGEN; 2340our $GOTOGEN;
2265 2341
2266sub cf::object::player::goto { 2342sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2344
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2347
2272 $self->enter_link; 2348 $self->enter_link;
… …
2292 2368
2293 if ($gen == $self->{_goto_generation}) { 2369 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2370 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2296 } 2372 }
2373
2374 $done->() if $done;
2297 })->prio (1); 2375 })->prio (1);
2298} 2376}
2299 2377
2300=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
2301 2379
… …
2410 2488
2411 utf8::encode $text; 2489 utf8::encode $text;
2412 $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);
2413} 2491}
2414 2492
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2494
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2498the message unless the client supports the msg packet.
2421 2499
2422=cut 2500=cut
2423 2501
2424sub cf::client::send_msg { 2502sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2503 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2504
2427 $msg = $self->pl->expand_cfpod ($msg); 2505 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2519 return unless @extra || length $msg;
2430 2520
2431 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
2432 $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]));
2433 } else { 2528 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 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
2445 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2547 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2450 } 2550 }
2451 } 2551 }
2452 } 2552 }
2453} 2553}
2454 2554
2455=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2456 2556
2457Sends an ext event to the client. 2557Sends an ext event to the client.
2458 2558
2459=cut 2559=cut
2460 2560
2461sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2463 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2465 $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 }
2466} 2588}
2467 2589
2468=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2469 2591
2470Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2647 my ($ns, $buf) = @_;
2526 2648
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2650
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2659 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2660 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2536 } else { 2666 } else {
2537 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";
2538 } 2668 }
2539 2669
2540 cf::override; 2670 cf::override;
… …
2587our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2589 2719
2590$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2591 2721
2592$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));
2593 2727
2594# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2595 2729
2596=pod 2730=pod
2597 2731
2598The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2599 2733
2600 cf::object 2734 cf::object
2601 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
2602 insert remove 2736 insert remove name archname title slaying race decrease_ob_nr
2603 2737
2604 cf::object::player 2738 cf::object::player
2605 player 2739 player
2606 2740
2607 cf::player 2741 cf::player
… …
2612 2746
2613=cut 2747=cut
2614 2748
2615for ( 2749for (
2616 ["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
2617 insert remove)], 2752 decrease_ob_nr)],
2618 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2621) { 2756) {
2622 no strict 'refs'; 2757 no strict 'refs';
… …
2698# the server's init and main functions 2833# the server's init and main functions
2699 2834
2700sub load_facedata($) { 2835sub load_facedata($) {
2701 my ($path) = @_; 2836 my ($path) = @_;
2702 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2703 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2704 2841
2705 my $facedata; 2842 my $facedata;
2706 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2844 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2710 2847
2711 $facedata->{version} == 2 2848 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2714 { 2858 {
2715 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2716 2860
2717 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2867
2868 cf::cede_to_tick;
2723 } 2869 }
2724 2870
2725 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2728 or next; 2874 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2878 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2880 }
2734 Coro::cede; 2881
2882 cf::cede_to_tick;
2735 } 2883 }
2736 } 2884 }
2737 2885
2738 { 2886 {
2739 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2740 2888
2741 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2891 cf::cede_to_tick;
2744 } 2892 }
2745 2893
2746 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2747 } 2895 }
2748 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2749 1 2946 1
2750} 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};
2751 2956
2752sub reload_regions { 2957sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2755} 2965}
2756 2966
2757sub reload_facedata { 2967sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
… …
2788 2998
2789sub init { 2999sub init {
2790 reload_resources; 3000 reload_resources;
2791} 3001}
2792 3002
2793sub cfg_load { 3003sub reload_config {
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2795 or return; 3005 or return;
2796 3006
2797 local $/; 3007 local $/;
2798 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2818 (async { 3028 (async {
2819 Event::one_event; 3029 Event::one_event;
2820 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2821 }; 3031 };
2822 3032
2823 cfg_load; 3033 reload_config;
2824 db_init; 3034 db_init;
2825 load_extensions; 3035 load_extensions;
2826 3036
2827 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2828 Event::loop; 3038 Event::loop;
… …
3021 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3022 require cf; 3232 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3024 3234
3025 warn "loading config and database again"; 3235 warn "loading config and database again";
3026 cf::cfg_load; 3236 cf::reload_config;
3027 3237
3028 warn "loading extensions"; 3238 warn "loading extensions";
3029 cf::load_extensions; 3239 cf::load_extensions;
3030 3240
3031 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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