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.311 by root, Fri Jul 20 16:11:10 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 ();
… …
322 }; 323 };
323 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
324 $guard 325 $guard
325} 326}
326 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
327=item cf::async { BLOCK } 384=item cf::async { BLOCK }
328 385
329Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
330C<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
331thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
418 475
419=cut 476=cut
420 477
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 478sub fork_call(&@) {
431 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
432 480
433# 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,
434# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
436 or die "pipe: $!";
437 484
438 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 486 reset_signals;
452 local $SIG{__WARN__}; 487 &$cb
453 local $SIG{__DIE__}; 488 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 489
460 eval { 490 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 491}
473 492
474=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
475 494
476Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
556 if (1) { 575 if (1) {
557 $md5 = 576 $md5 =
558 join "\x00", 577 join "\x00",
559 $processversion, 578 $processversion,
560 map { 579 map {
561 Coro::cede; 580 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 582 } 0.. $#$src;
564 583
565 584
566 my $dbmd5 = db_get cache => "$id/md5"; 585 my $dbmd5 = db_get cache => "$id/md5";
… …
918 937
919=cut 938=cut
920 939
921############################################################################# 940#############################################################################
922# 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}
923 953
924sub reattach { 954sub reattach {
925 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 956 my ($obj) = @_;
927 957
… …
1114 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1115 1145
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1147
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1124 } else { 1163 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1165 }
1127 1166
1128 cf::override; 1167 cf::override;
… …
1283 1322
1284 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1286 1325
1287 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1288 Coro::cede; 1327 cf::cede_to_tick;
1289} 1328}
1290 1329
1291sub new($) { 1330sub new($) {
1292 my ($login) = @_; 1331 my ($login) = @_;
1293 1332
… …
1297 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1298 1337
1299 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1300 1339
1301 $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 (@_);
1302} 1351}
1303 1352
1304=item $pl->quit_character 1353=item $pl->quit_character
1305 1354
1306Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1450sub hintmode { 1499sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1501 $_[0]{hintmode}
1453} 1502}
1454 1503
1455=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1456 1505
1457Sends an ext reply to the player. 1506Sends an ext reply to the player.
1458 1507
1459=cut 1508=cut
1460 1509
1461sub ext_reply($$%) { 1510sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1463 1512
1464 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1514}
1467 1515
1468=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1469 1517
1470Sends an ext event to the client. 1518Sends an ext event to the client.
1471 1519
1472=cut 1520=cut
1473 1521
1474sub ext_event($$%) { 1522sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1476 1524
1477 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1478} 1526}
1479 1527
1480=head3 cf::region 1528=head3 cf::region
1481 1529
1482=over 4 1530=over 4
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1802 1850
1803 my $path = $self->{path}; 1851 my $path = $self->{path};
1804 1852
1805 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1806 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1807 1856
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1809 1858
1810 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1811 1860
1812 $self->alloc; 1861 $self->alloc;
1813 1862
1814 $self->pre_load; 1863 $self->pre_load;
1815 Coro::cede; 1864 cf::cede_to_tick;
1816 1865
1817 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1818 or return; 1867 or return;
1819 1868
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1826 $self->clear_unique_items; 1875 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1828 } 1877 }
1829 } 1878 }
1830 1879
1831 Coro::cede; 1880 cf::cede_to_tick;
1832 # now do the right thing for maps 1881 # now do the right thing for maps
1833 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1884 unless $self->difficulty;
1836 Coro::cede; 1885 cf::cede_to_tick;
1837 1886
1838 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1888 $self->decay_objects;
1840 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1841 $self->update_buttons; 1890 $self->update_buttons;
1842 Coro::cede; 1891 cf::cede_to_tick;
1843 $self->set_darkness_map; 1892 $self->set_darkness_map;
1844 Coro::cede; 1893 cf::cede_to_tick;
1845 $self->activate; 1894 $self->activate;
1846 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1847 1899
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1901 }
1850 1902
1851 $self->post_load; 1903 $self->post_load;
… …
1862 1914
1863 $self 1915 $self
1864} 1916}
1865 1917
1866# 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
1867sub load_diag { 1919sub load_neighbours {
1868 my ($map) = @_; 1920 my ($map) = @_;
1869 1921
1870 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1871 1923
1872 for (0 .. 3) { 1924 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1874 or next; 1926 or next;
1875 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1876 or next; 1928 or next;
1877 $neigh->load; 1929 $neigh->load;
1878 1930
1931 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1934 }
1882 1935
1883 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1885 or next; 1939 or next;
1886 $neigh->load; 1940 $neigh->load;
1887 } 1941 }
1888} 1942}
1889 1943
… …
1894} 1948}
1895 1949
1896sub do_load_sync { 1950sub do_load_sync {
1897 my ($map) = @_; 1951 my ($map) = @_;
1898 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1899 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1900} 1957}
1901 1958
1902our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1904 1961
1905sub find_async { 1962sub find_async {
1906 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1907 1964
1908 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1909 1966
1910 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 1969 }
1913 1970
1914 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1915 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 1976 if (my $map = find $k) {
1919 $map->load; 1977 $map->load if $v;
1920 } 1978 }
1921 1979
1922 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1923 } 1981 }
1924 } 1982 }
1925 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1926 }; 1984 };
1927 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1930} 1988}
1931 1989
1932sub save { 1990sub save {
1933 my ($self) = @_; 1991 my ($self) = @_;
1934 1992
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 1994
1937 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1938 1996
1939 return unless $self->dirty; 1997 return unless $self->dirty;
1940 1998
… …
1963 my ($self) = @_; 2021 my ($self) = @_;
1964 2022
1965 # save first because save cedes 2023 # save first because save cedes
1966 $self->save; 2024 $self->save;
1967 2025
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2027
1970 return if $self->players; 2028 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1973 2031
… …
2152 2210
2153 } else { 2211 } else {
2154 my $pl = $self->contr; 2212 my $pl = $self->contr;
2155 2213
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2217
2165 } else { 2218 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2168 } 2221 }
2169 } 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 (@_);
2170} 2233}
2171 2234
2172=item $player_object->may ("access") 2235=item $player_object->may ("access")
2173 2236
2174Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2256 2319
2257 $map->load; 2320 $map->load;
2258 $map->load_diag; 2321 $map->load_neighbours;
2259 2322
2260 return unless $self->contr->active; 2323 return unless $self->contr->active;
2261 $self->activate_recursive; 2324 $self->activate_recursive;
2262 2325
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2439sub cf::client::send_msg { 2502sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2503 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2504
2442 $msg = $self->pl->expand_cfpod ($msg); 2505 $msg = $self->pl->expand_cfpod ($msg);
2443 2506
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case... 2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2447 2508
2448 if (ref $channel) { 2509 if (ref $channel) {
2449 # send meta info to client, if not yet sent 2510 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2511 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2512 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2513 $self->ext_msg (channel_info => $channel);
2453 } 2514 }
2454 2515
2455 $channel = $channel->{id}; 2516 $channel = $channel->{id};
2456 } 2517 }
2457 2518
2519 return unless @extra || length $msg;
2520
2458 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
2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2460 } else { 2528 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 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
2472 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2547 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2477 } 2550 }
2478 } 2551 }
2479 } 2552 }
2480} 2553}
2481 2554
2482=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2483 2556
2484Sends an ext event to the client. 2557Sends an ext event to the client.
2485 2558
2486=cut 2559=cut
2487 2560
2488sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2490 2563
2491 return unless $self->extcmd; 2564 if ($self->extcmd == 2) {
2492 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2494 $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 }
2495} 2588}
2496 2589
2497=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2498 2591
2499Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2647 my ($ns, $buf) = @_;
2555 2648
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2650
2558 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2659 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2660 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2565 } else { 2666 } else {
2566 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";
2567 } 2668 }
2568 2669
2569 cf::override; 2670 cf::override;
… …
2616our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2618 2719
2619$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2620 2721
2621$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));
2622 2727
2623# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2624 2729
2625=pod 2730=pod
2626 2731
2627The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2628 2733
2629 cf::object 2734 cf::object
2630 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
2631 insert remove 2736 insert remove name archname title slaying race decrease_ob_nr
2632 2737
2633 cf::object::player 2738 cf::object::player
2634 player 2739 player
2635 2740
2636 cf::player 2741 cf::player
… …
2641 2746
2642=cut 2747=cut
2643 2748
2644for ( 2749for (
2645 ["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
2646 insert remove)], 2752 decrease_ob_nr)],
2647 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2650) { 2756) {
2651 no strict 'refs'; 2757 no strict 'refs';
… …
2727# the server's init and main functions 2833# the server's init and main functions
2728 2834
2729sub load_facedata($) { 2835sub load_facedata($) {
2730 my ($path) = @_; 2836 my ($path) = @_;
2731 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2732 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2733 2841
2734 my $facedata; 2842 my $facedata;
2735 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 2844 or die "$path: $!";
2737 2845
2738 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2739 2847
2740 $facedata->{version} == 2 2848 $facedata->{version} == 2
2741 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;
2742 2857
2743 { 2858 {
2744 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2745 2860
2746 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 2864 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 2867
2753 cf::cede_to_tick; 2868 cf::cede_to_tick;
2754 } 2869 }
2755 2870
2756 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
… …
2781 2896
2782 { 2897 {
2783 # TODO: for gcfclient pleasure, we should give resources 2898 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 2899 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 2900 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2787 2903
2788 while (my ($name, $info) = each %$res) { 2904 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2796 2907
2797 if ($name =~ /\.jpg$/) { 2908 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2909 # prepend meta info
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2800 } else { 2917 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 2918 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 2919 }
2807 2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2808 cf::cede_to_tick; 2924 cf::cede_to_tick;
2809 } 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 }
2810 } 2944 }
2811 2945
2812 1 2946 1
2813} 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};
2814 2956
2815sub reload_regions { 2957sub reload_regions {
2816 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2818 2960
… …
2856 2998
2857sub init { 2999sub init {
2858 reload_resources; 3000 reload_resources;
2859} 3001}
2860 3002
2861sub cfg_load { 3003sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3005 or return;
2864 3006
2865 local $/; 3007 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2886 (async { 3028 (async {
2887 Event::one_event; 3029 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2889 }; 3031 };
2890 3032
2891 cfg_load; 3033 reload_config;
2892 db_init; 3034 db_init;
2893 load_extensions; 3035 load_extensions;
2894 3036
2895 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2896 Event::loop; 3038 Event::loop;
… …
3089 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3090 require cf; 3232 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3234
3093 warn "loading config and database again"; 3235 warn "loading config and database again";
3094 cf::cfg_load; 3236 cf::reload_config;
3095 3237
3096 warn "loading extensions"; 3238 warn "loading extensions";
3097 cf::load_extensions; 3239 cf::load_extensions;
3098 3240
3099 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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