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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 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 ();
… …
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
320 my $guard = Coro::guard { 324 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
325} 385}
326 386
327=item cf::async { BLOCK } 387=item cf::async { BLOCK }
328 388
329Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
418 478
419=cut 479=cut
420 480
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(&@) { 481sub fork_call(&@) {
431 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
432 483
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
436 or die "pipe: $!";
437 487
438 if (my $pid = fork) { 488 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; 489 reset_signals;
452 local $SIG{__WARN__}; 490 &$cb
453 local $SIG{__DIE__}; 491 }, @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 492
460 eval { 493 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} 494}
473 495
474=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
475 497
476Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
556 if (1) { 578 if (1) {
557 $md5 = 579 $md5 =
558 join "\x00", 580 join "\x00",
559 $processversion, 581 $processversion,
560 map { 582 map {
561 Coro::cede; 583 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 585 } 0.. $#$src;
564 586
565 587
566 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
918 940
919=cut 941=cut
920 942
921############################################################################# 943#############################################################################
922# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
923 956
924sub reattach { 957sub reattach {
925 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 959 my ($obj) = @_;
927 960
… …
1114 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1115 1148
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1150
1118 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1124 } else { 1166 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1168 }
1127 1169
1128 cf::override; 1170 cf::override;
… …
1283 1325
1284 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1286 1328
1287 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1288 Coro::cede; 1330 cf::cede_to_tick;
1289} 1331}
1290 1332
1291sub new($) { 1333sub new($) {
1292 my ($login) = @_; 1334 my ($login) = @_;
1293 1335
… …
1297 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1298 1340
1299 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1300 1342
1301 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1302} 1354}
1303 1355
1304=item $pl->quit_character 1356=item $pl->quit_character
1305 1357
1306Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1450sub hintmode { 1502sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1504 $_[0]{hintmode}
1453} 1505}
1454 1506
1455=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1456 1508
1457Sends an ext reply to the player. 1509Sends an ext reply to the player.
1458 1510
1459=cut 1511=cut
1460 1512
1461sub ext_reply($$%) { 1513sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1463 1515
1464 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1517}
1467 1518
1468=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1469 1520
1470Sends an ext event to the client. 1521Sends an ext event to the client.
1471 1522
1472=cut 1523=cut
1473 1524
1474sub ext_event($$%) { 1525sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1476 1527
1477 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1478} 1529}
1479 1530
1480=head3 cf::region 1531=head3 cf::region
1481 1532
1482=over 4 1533=over 4
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1802 1853
1803 my $path = $self->{path}; 1854 my $path = $self->{path};
1804 1855
1805 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1806 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1807 1859
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1809 1861
1810 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1811 1863
1812 $self->alloc; 1864 $self->alloc;
1813 1865
1814 $self->pre_load; 1866 $self->pre_load;
1815 Coro::cede; 1867 cf::cede_to_tick;
1816 1868
1817 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1818 or return; 1870 or return;
1819 1871
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1826 $self->clear_unique_items; 1878 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1828 } 1880 }
1829 } 1881 }
1830 1882
1831 Coro::cede; 1883 cf::cede_to_tick;
1832 # now do the right thing for maps 1884 # now do the right thing for maps
1833 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1887 unless $self->difficulty;
1836 Coro::cede; 1888 cf::cede_to_tick;
1837 1889
1838 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1891 $self->decay_objects;
1840 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1841 $self->update_buttons; 1893 $self->update_buttons;
1842 Coro::cede; 1894 cf::cede_to_tick;
1843 $self->set_darkness_map; 1895 $self->set_darkness_map;
1844 Coro::cede; 1896 cf::cede_to_tick;
1845 $self->activate; 1897 $self->activate;
1846 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1847 1902
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1904 }
1850 1905
1851 $self->post_load; 1906 $self->post_load;
… …
1862 1917
1863 $self 1918 $self
1864} 1919}
1865 1920
1866# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1867sub load_diag { 1922sub load_neighbours {
1868 my ($map) = @_; 1923 my ($map) = @_;
1869 1924
1870 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1871 1926
1872 for (0 .. 3) { 1927 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1874 or next; 1929 or next;
1875 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1876 or next; 1931 or next;
1877 $neigh->load; 1932 $neigh->load;
1878 1933
1934 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1937 }
1882 1938
1883 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1885 or next; 1942 or next;
1886 $neigh->load; 1943 $neigh->load;
1887 } 1944 }
1888} 1945}
1889 1946
… …
1894} 1951}
1895 1952
1896sub do_load_sync { 1953sub do_load_sync {
1897 my ($map) = @_; 1954 my ($map) = @_;
1898 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1899 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1900} 1960}
1901 1961
1902our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1904 1964
1905sub find_async { 1965sub find_async {
1906 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1907 1967
1908 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1909 1969
1910 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 1972 }
1913 1973
1914 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1915 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 1979 if (my $map = find $k) {
1919 $map->load; 1980 $map->load if $v;
1920 } 1981 }
1921 1982
1922 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1923 } 1984 }
1924 } 1985 }
1925 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1926 }; 1987 };
1927 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1930} 1991}
1931 1992
1932sub save { 1993sub save {
1933 my ($self) = @_; 1994 my ($self) = @_;
1934 1995
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 1997
1937 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1938 1999
1939 return unless $self->dirty; 2000 return unless $self->dirty;
1940 2001
… …
1963 my ($self) = @_; 2024 my ($self) = @_;
1964 2025
1965 # save first because save cedes 2026 # save first because save cedes
1966 $self->save; 2027 $self->save;
1967 2028
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2030
1970 return if $self->players; 2031 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1973 2034
… …
2152 2213
2153 } else { 2214 } else {
2154 my $pl = $self->contr; 2215 my $pl = $self->contr;
2155 2216
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2218 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2219 $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 2220
2165 } else { 2221 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2222 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2168 } 2224 }
2169 } 2225 }
2226}
2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
2170} 2236}
2171 2237
2172=item $player_object->may ("access") 2238=item $player_object->may ("access")
2173 2239
2174Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2256 2322
2257 $map->load; 2323 $map->load;
2258 $map->load_diag; 2324 $map->load_neighbours;
2259 2325
2260 return unless $self->contr->active; 2326 return unless $self->contr->active;
2261 $self->activate_recursive; 2327 $self->activate_recursive;
2262 2328
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2425 2491
2426 utf8::encode $text; 2492 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2493 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2494}
2429 2495
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2496=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2497
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2498Send a drawinfo or msg packet to the client, formatting the msg for the
2433client if neccessary. C<$type> should be a string identifying the type of 2499client if neccessary. C<$type> should be a string identifying the type of
2434the message, with C<log> being the default. If C<$color> is negative, suppress 2500the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2501the message unless the client supports the msg packet.
2436 2502
2437=cut 2503=cut
2438 2504
2439sub cf::client::send_msg { 2505sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2506 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2507
2442 $msg = $self->pl->expand_cfpod ($msg); 2508 $msg = $self->pl->expand_cfpod ($msg);
2443 2509
2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2511
2512 if (ref $channel) {
2513 # send meta info to client, if not yet sent
2514 unless (exists $self->{channel}{$channel->{id}}) {
2515 $self->{channel}{$channel->{id}} = $channel;
2516 $self->ext_msg (channel_info => $channel);
2517 }
2518
2519 $channel = $channel->{id};
2520 }
2521
2444 return unless @extra || length $msg; 2522 return unless @extra || length $msg;
2445 2523
2446 if ($self->can_msg) { 2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448 } else { 2531 } else {
2449 # replace some tags by gcfclient-compatible ones
2450 for ($msg) {
2451 1 while
2452 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2453 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2454 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2455 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2456 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2457 }
2458
2459 if ($color >= 0) { 2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2460 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2550 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2465 } 2553 }
2466 } 2554 }
2467 } 2555 }
2468} 2556}
2469 2557
2470=item $client->ext_event ($type, %msg) 2558=item $client->ext_msg ($type, @msg)
2471 2559
2472Sends an ext event to the client. 2560Sends an ext event to the client.
2473 2561
2474=cut 2562=cut
2475 2563
2476sub cf::client::ext_event($$%) { 2564sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2565 my ($self, $type, @msg) = @_;
2478 2566
2479 return unless $self->extcmd; 2567 if ($self->extcmd == 2) {
2480 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2569 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2570 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2590 }
2483} 2591}
2484 2592
2485=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
2486 2594
2487Queues a query to the client, calling the given callback with 2595Queues a query to the client, calling the given callback with
… …
2542 my ($ns, $buf) = @_; 2650 my ($ns, $buf) = @_;
2543 2651
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2652 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2653
2546 if (ref $msg) { 2654 if (ref $msg) {
2655 my ($type, $reply, @payload) =
2656 "ARRAY" eq ref $msg
2657 ? @$msg
2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2659
2660 my @reply;
2661
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2662 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 2663 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2553 } else { 2669 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 } 2671 }
2556 2672
2557 cf::override; 2673 cf::override;
… …
2604our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2606 2722
2607$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2608 2724
2609$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2610 2730
2611# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2612 2732
2613=pod 2733=pod
2614 2734
2615The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2616 2736
2617 cf::object 2737 cf::object
2618 contr pay_amount pay_player map x y force_find force_add 2738 contr pay_amount pay_player map x y force_find force_add
2619 insert remove 2739 insert remove name archname title slaying race decrease_ob_nr
2620 2740
2621 cf::object::player 2741 cf::object::player
2622 player 2742 player
2623 2743
2624 cf::player 2744 cf::player
… …
2629 2749
2630=cut 2750=cut
2631 2751
2632for ( 2752for (
2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2634 insert remove)], 2755 decrease_ob_nr)],
2635 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2638) { 2759) {
2639 no strict 'refs'; 2760 no strict 'refs';
… …
2715# the server's init and main functions 2836# the server's init and main functions
2716 2837
2717sub load_facedata($) { 2838sub load_facedata($) {
2718 my ($path) = @_; 2839 my ($path) = @_;
2719 2840
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2842
2720 warn "loading facedata from $path\n"; 2843 warn "loading facedata from $path\n";
2721 2844
2722 my $facedata; 2845 my $facedata;
2723 0 < aio_load $path, $facedata 2846 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 2847 or die "$path: $!";
2725 2848
2726 $facedata = Coro::Storable::thaw $facedata; 2849 $facedata = Coro::Storable::thaw $facedata;
2727 2850
2728 $facedata->{version} == 2 2851 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 2852 or cf::cleanup "$path: version mismatch, cannot proceed.";
2853
2854 # patch in the exptable
2855 $facedata->{resource}{"res/exp_table"} = {
2856 type => FT_RSRC,
2857 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2858 };
2859 cf::cede_to_tick;
2730 2860
2731 { 2861 {
2732 my $faces = $facedata->{faceinfo}; 2862 my $faces = $facedata->{faceinfo};
2733 2863
2734 while (my ($face, $info) = each %$faces) { 2864 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2865 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2736 cf::face::set_visibility $idx, $info->{visibility}; 2866 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 2867 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2868 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2869 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 2870
2741 cf::cede_to_tick; 2871 cf::cede_to_tick;
2742 } 2872 }
2743 2873
2744 while (my ($face, $info) = each %$faces) { 2874 while (my ($face, $info) = each %$faces) {
… …
2769 2899
2770 { 2900 {
2771 # TODO: for gcfclient pleasure, we should give resources 2901 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 2902 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 2903 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical; 2904
2905 my $soundconf = delete $res->{"res/sound.conf"};
2775 2906
2776 while (my ($name, $info) = each %$res) { 2907 while (my ($name, $info) = each %$res) {
2777 my $meta = $enc->encode ({
2778 name => $name,
2779 type => $info->{type},
2780 copyright => $info->{copyright}, #TODO#
2781 });
2782
2783 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2908 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909 my $data;
2784 2910
2785 if ($name =~ /\.jpg$/) { 2911 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2912 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2913
2914 my $meta = $enc->encode ({
2915 name => $name,
2916 %{ $info->{meta} || {} },
2917 });
2918
2919 $data = pack "(w/a*)*", $meta, $info->{data};
2788 } else { 2920 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 2921 $data = $info->{data};
2790 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2791
2792 cf::face::set_type $idx, 1;
2793 cf::face::set_data $idx, 0, $data, $chk;
2794 } 2922 }
2795 2923
2924 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925 cf::face::set_type $idx, $info->{type};
2926
2796 cf::cede_to_tick; 2927 cf::cede_to_tick;
2797 } 2928 }
2929
2930 if ($soundconf) {
2931 $soundconf = $enc->decode (delete $soundconf->{data});
2932
2933 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934 my $sound = $soundconf->{compat}[$_]
2935 or next;
2936
2937 my $face = cf::face::find "sound/$sound->[1]";
2938 cf::sound::set $sound->[0] => $face;
2939 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940 }
2941
2942 while (my ($k, $v) = each %{$soundconf->{event}}) {
2943 my $face = cf::face::find "sound/$v";
2944 cf::sound::set $k => $face;
2945 }
2946 }
2798 } 2947 }
2799 2948
2800 1 2949 1
2801} 2950}
2951
2952register_exticmd fx_want => sub {
2953 my ($ns, $want) = @_;
2954
2955 while (my ($k, $v) = each %$want) {
2956 $ns->fx_want ($k, $v);
2957 }
2958};
2802 2959
2803sub reload_regions { 2960sub reload_regions {
2804 load_resource_file "$MAPDIR/regions" 2961 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 2962 or die "unable to load regions file\n";
2806 2963
… …
2844 3001
2845sub init { 3002sub init {
2846 reload_resources; 3003 reload_resources;
2847} 3004}
2848 3005
2849sub cfg_load { 3006sub reload_config {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3007 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3008 or return;
2852 3009
2853 local $/; 3010 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3011 *CFG = YAML::Syck::Load <$fh>;
… …
2874 (async { 3031 (async {
2875 Event::one_event; 3032 Event::one_event;
2876 })->prio (Coro::PRIO_MAX); 3033 })->prio (Coro::PRIO_MAX);
2877 }; 3034 };
2878 3035
2879 cfg_load; 3036 reload_config;
2880 db_init; 3037 db_init;
2881 load_extensions; 3038 load_extensions;
2882 3039
2883 $TICK_WATCHER->start; 3040 $TICK_WATCHER->start;
2884 Event::loop; 3041 Event::loop;
… …
3077 warn "reloading cf.pm"; 3234 warn "reloading cf.pm";
3078 require cf; 3235 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3237
3081 warn "loading config and database again"; 3238 warn "loading config and database again";
3082 cf::cfg_load; 3239 cf::reload_config;
3083 3240
3084 warn "loading extensions"; 3241 warn "loading extensions";
3085 cf::load_extensions; 3242 cf::load_extensions;
3086 3243
3087 warn "reattaching attachments to objects/players"; 3244 warn "reattaching attachments to objects/players";

Diff Legend

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