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.312 by root, Sat Jul 21 18:01:26 2007 UTC vs.
Revision 1.350 by root, Sat Sep 1 08:03:45 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";
… …
1125 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1126 1148
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1150
1129 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
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1135 } else { 1166 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1168 }
1138 1169
1139 cf::override; 1170 cf::override;
… …
1294 1325
1295 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1297 1328
1298 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1299 Coro::cede; 1330 cf::cede_to_tick;
1300} 1331}
1301 1332
1302sub new($) { 1333sub new($) {
1303 my ($login) = @_; 1334 my ($login) = @_;
1304 1335
… …
1308 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1309 1340
1310 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1311 1342
1312 $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 (@_);
1313} 1354}
1314 1355
1315=item $pl->quit_character 1356=item $pl->quit_character
1316 1357
1317Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1461sub hintmode { 1502sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1504 $_[0]{hintmode}
1464} 1505}
1465 1506
1466=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1467 1508
1468Sends an ext reply to the player. 1509Sends an ext reply to the player.
1469 1510
1470=cut 1511=cut
1471 1512
1472sub ext_reply($$%) { 1513sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1474 1515
1475 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1517}
1478 1518
1479=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1480 1520
1481Sends an ext event to the client. 1521Sends an ext event to the client.
1482 1522
1483=cut 1523=cut
1484 1524
1485sub ext_event($$%) { 1525sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1487 1527
1488 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1489} 1529}
1490 1530
1491=head3 cf::region 1531=head3 cf::region
1492 1532
1493=over 4 1533=over 4
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1813 1853
1814 my $path = $self->{path}; 1854 my $path = $self->{path};
1815 1855
1816 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1817 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1818 1859
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1820 1861
1821 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1822 1863
1823 $self->alloc; 1864 $self->alloc;
1824 1865
1825 $self->pre_load; 1866 $self->pre_load;
1826 Coro::cede; 1867 cf::cede_to_tick;
1827 1868
1828 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1829 or return; 1870 or return;
1830 1871
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1837 $self->clear_unique_items; 1878 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1839 } 1880 }
1840 } 1881 }
1841 1882
1842 Coro::cede; 1883 cf::cede_to_tick;
1843 # now do the right thing for maps 1884 # now do the right thing for maps
1844 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1887 unless $self->difficulty;
1847 Coro::cede; 1888 cf::cede_to_tick;
1848 1889
1849 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1891 $self->decay_objects;
1851 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1852 $self->update_buttons; 1893 $self->update_buttons;
1853 Coro::cede; 1894 cf::cede_to_tick;
1854 $self->set_darkness_map; 1895 $self->set_darkness_map;
1855 Coro::cede; 1896 cf::cede_to_tick;
1856 $self->activate; 1897 $self->activate;
1857 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1858 1902
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1904 }
1861 1905
1862 $self->post_load; 1906 $self->post_load;
… …
1873 1917
1874 $self 1918 $self
1875} 1919}
1876 1920
1877# 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
1878sub load_diag { 1922sub load_neighbours {
1879 my ($map) = @_; 1923 my ($map) = @_;
1880 1924
1881 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1882 1926
1883 for (0 .. 3) { 1927 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1885 or next; 1929 or next;
1886 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1887 or next; 1931 or next;
1888 $neigh->load; 1932 $neigh->load;
1889 1933
1934 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1937 }
1893 1938
1894 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1896 or next; 1942 or next;
1897 $neigh->load; 1943 $neigh->load;
1898 } 1944 }
1899} 1945}
1900 1946
… …
1905} 1951}
1906 1952
1907sub do_load_sync { 1953sub do_load_sync {
1908 my ($map) = @_; 1954 my ($map) = @_;
1909 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1910 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1911} 1960}
1912 1961
1913our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1915 1964
1916sub find_async { 1965sub find_async {
1917 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1918 1967
1919 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1920 1969
1921 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 1972 }
1924 1973
1925 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1926 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 1979 if (my $map = find $k) {
1930 $map->load; 1980 $map->load if $v;
1931 } 1981 }
1932 1982
1933 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1934 } 1984 }
1935 } 1985 }
1936 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1937 }; 1987 };
1938 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1941} 1991}
1942 1992
1943sub save { 1993sub save {
1944 my ($self) = @_; 1994 my ($self) = @_;
1945 1995
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 1997
1948 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1949 1999
1950 return unless $self->dirty; 2000 return unless $self->dirty;
1951 2001
… …
1974 my ($self) = @_; 2024 my ($self) = @_;
1975 2025
1976 # save first because save cedes 2026 # save first because save cedes
1977 $self->save; 2027 $self->save;
1978 2028
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2030
1981 return if $self->players; 2031 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2033 return if $self->{deny_save};
1984 2034
… …
2036my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2037 2087
2038sub nuke { 2088sub nuke {
2039 my ($self) = @_; 2089 my ($self) = @_;
2040 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2041 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2042 2095
2043 $self->unlink_save;
2044
2045 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2101
2102 $self->unlink_save;
2103
2051 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2052 2106
2053 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2054} 2108}
2055 2109
2056=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2163 2217
2164 } else { 2218 } else {
2165 my $pl = $self->contr; 2219 my $pl = $self->contr;
2166 2220
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2223 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2224
2176 } else { 2225 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2179 } 2228 }
2180 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2181} 2240}
2182 2241
2183=item $player_object->may ("access") 2242=item $player_object->may ("access")
2184 2243
2185Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2267 2326
2268 $map->load; 2327 $map->load;
2269 $map->load_diag; 2328 $map->load_neighbours;
2270 2329
2271 return unless $self->contr->active; 2330 return unless $self->contr->active;
2272 $self->activate_recursive; 2331 $self->activate_recursive;
2273 2332
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2504the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2505the message unless the client supports the msg packet.
2447 2506
2448=cut 2507=cut
2449 2508
2509our %CHANNEL = (
2510 "c/identify" => {
2511 id => "identify",
2512 title => "Identify",
2513 reply => undef,
2514 tooltip => "Items recently identified",
2515 },
2516);
2517
2450sub cf::client::send_msg { 2518sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2519 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2520
2453 $msg = $self->pl->expand_cfpod ($msg); 2521 $msg = $self->pl->expand_cfpod ($msg);
2454 2522
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case... 2523 $color &= cf::NDI_CLIENT_MASK; # just in case...
2524
2525 # check predefined channels, for the benefit of C
2526 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2458 2527
2459 if (ref $channel) { 2528 if (ref $channel) {
2460 # send meta info to client, if not yet sent 2529 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) { 2530 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel; 2531 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel); 2532 $self->ext_msg (channel_info => $channel);
2464 } 2533 }
2465 2534
2466 $channel = $channel->{id}; 2535 $channel = $channel->{id};
2467 } 2536 }
2468 2537
2538 return unless @extra || length $msg;
2539
2469 if ($self->can_msg) { 2540 if ($self->can_msg) {
2541 # default colour, mask it out
2542 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2543 if $color & cf::NDI_DEF;
2544
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2545 $self->send_packet ("msg " . $self->{json_coder}->encode (
2546 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2547 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2548 if ($color >= 0) {
2549 # replace some tags by gcfclient-compatible ones
2550 for ($msg) {
2551 1 while
2552 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2553 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2554 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2555 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2556 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2557 }
2558
2559 $color &= cf::NDI_COLOR_MASK;
2560
2561 utf8::encode $msg;
2562
2483 if (0 && $msg =~ /\[/) { 2563 if (0 && $msg =~ /\[/) {
2564 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2565 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2566 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2567 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2568 $self->send_packet ("drawinfo $color $msg")
2488 } 2569 }
2489 } 2570 }
2490 } 2571 }
2491} 2572}
2492 2573
2493=item $client->ext_event ($type, %msg) 2574=item $client->ext_msg ($type, @msg)
2494 2575
2495Sends an ext event to the client. 2576Sends an ext event to the client.
2496 2577
2497=cut 2578=cut
2498 2579
2499sub cf::client::ext_event($$%) { 2580sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2581 my ($self, $type, @msg) = @_;
2501 2582
2502 return unless $self->extcmd; 2583 if ($self->extcmd == 2) {
2503 2584 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2585 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2586 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2589}
2590
2591=item $client->ext_reply ($msgid, @msg)
2592
2593Sends an ext reply to the client.
2594
2595=cut
2596
2597sub cf::client::ext_reply($$@) {
2598 my ($self, $id, @msg) = @_;
2599
2600 if ($self->extcmd == 2) {
2601 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2602 } elsif ($self->extcmd == 1) {
2603 #TODO: version 1, remove
2604 unshift @msg, msgtype => "reply", msgid => $id;
2605 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2606 }
2506} 2607}
2507 2608
2508=item $success = $client->query ($flags, "text", \&cb) 2609=item $success = $client->query ($flags, "text", \&cb)
2509 2610
2510Queues a query to the client, calling the given callback with 2611Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2666 my ($ns, $buf) = @_;
2566 2667
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2668 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2669
2569 if (ref $msg) { 2670 if (ref $msg) {
2671 my ($type, $reply, @payload) =
2672 "ARRAY" eq ref $msg
2673 ? @$msg
2674 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2675
2676 my @reply;
2677
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2678 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2679 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2680 }
2681
2682 $ns->ext_reply ($reply, @reply)
2683 if $reply;
2684
2576 } else { 2685 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2686 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2687 }
2579 2688
2580 cf::override; 2689 cf::override;
… …
2627our $safe = new Safe "safe"; 2736our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2737our $safe_hole = new Safe::Hole;
2629 2738
2630$SIG{FPE} = 'IGNORE'; 2739$SIG{FPE} = 'IGNORE';
2631 2740
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2741$safe->permit_only (Opcode::opset qw(
2742 :base_core :base_mem :base_orig :base_math
2743 grepstart grepwhile mapstart mapwhile
2744 sort time
2745));
2633 2746
2634# here we export the classes and methods available to script code 2747# here we export the classes and methods available to script code
2635 2748
2636=pod 2749=pod
2637 2750
2638The following functions and methods are available within a safe environment: 2751The following functions and methods are available within a safe environment:
2639 2752
2640 cf::object 2753 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2754 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2755 insert remove name archname title slaying race decrease_ob_nr
2643 2756
2644 cf::object::player 2757 cf::object::player
2645 player 2758 player
2646 2759
2647 cf::player 2760 cf::player
… …
2652 2765
2653=cut 2766=cut
2654 2767
2655for ( 2768for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2769 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2770 insert remove inv name archname title slaying race
2657 insert remove)], 2771 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2772 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2773 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2774 ["cf::map" => qw(trigger)],
2661) { 2775) {
2662 no strict 'refs'; 2776 no strict 'refs';
… …
2738# the server's init and main functions 2852# the server's init and main functions
2739 2853
2740sub load_facedata($) { 2854sub load_facedata($) {
2741 my ($path) = @_; 2855 my ($path) = @_;
2742 2856
2857 # HACK to clear player env face cache, we need some signal framework
2858 # for this (global event?)
2859 %ext::player_env::MUSIC_FACE_CACHE = ();
2860
2861 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2862
2743 warn "loading facedata from $path\n"; 2863 warn "loading facedata from $path\n";
2744 2864
2745 my $facedata; 2865 my $facedata;
2746 0 < aio_load $path, $facedata 2866 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2867 or die "$path: $!";
2748 2868
2749 $facedata = Coro::Storable::thaw $facedata; 2869 $facedata = Coro::Storable::thaw $facedata;
2750 2870
2751 $facedata->{version} == 2 2871 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2872 or cf::cleanup "$path: version mismatch, cannot proceed.";
2873
2874 # patch in the exptable
2875 $facedata->{resource}{"res/exp_table"} = {
2876 type => FT_RSRC,
2877 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2878 };
2879 cf::cede_to_tick;
2753 2880
2754 { 2881 {
2755 my $faces = $facedata->{faceinfo}; 2882 my $faces = $facedata->{faceinfo};
2756 2883
2757 while (my ($face, $info) = each %$faces) { 2884 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2885 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2886 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2887 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2888 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2889 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2890
2764 cf::cede_to_tick; 2891 cf::cede_to_tick;
2765 } 2892 }
2766 2893
2767 while (my ($face, $info) = each %$faces) { 2894 while (my ($face, $info) = each %$faces) {
… …
2792 2919
2793 { 2920 {
2794 # TODO: for gcfclient pleasure, we should give resources 2921 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2922 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2923 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2924
2925 my $soundconf = delete $res->{"res/sound.conf"};
2798 2926
2799 while (my ($name, $info) = each %$res) { 2927 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2928 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2929 my $data;
2807 2930
2808 if ($name =~ /\.jpg$/) { 2931 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2932 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2933
2934 my $meta = $enc->encode ({
2935 name => $name,
2936 %{ $info->{meta} || {} },
2937 });
2938
2939 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 2940 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 2941 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 2942 }
2818 2943
2944 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2945 cf::face::set_type $idx, $info->{type};
2946
2819 cf::cede_to_tick; 2947 cf::cede_to_tick;
2820 } 2948 }
2949
2950 if ($soundconf) {
2951 $soundconf = $enc->decode (delete $soundconf->{data});
2952
2953 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2954 my $sound = $soundconf->{compat}[$_]
2955 or next;
2956
2957 my $face = cf::face::find "sound/$sound->[1]";
2958 cf::sound::set $sound->[0] => $face;
2959 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2960 }
2961
2962 while (my ($k, $v) = each %{$soundconf->{event}}) {
2963 my $face = cf::face::find "sound/$v";
2964 cf::sound::set $k => $face;
2965 }
2966 }
2821 } 2967 }
2822 2968
2823 1 2969 1
2824} 2970}
2825 2971
2972register_exticmd fx_want => sub {
2973 my ($ns, $want) = @_;
2974
2975 while (my ($k, $v) = each %$want) {
2976 $ns->fx_want ($k, $v);
2977 }
2978};
2979
2826sub reload_regions { 2980sub reload_regions {
2981 # HACK to clear player env face cache, we need some signal framework
2982 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = ();
2984
2827 load_resource_file "$MAPDIR/regions" 2985 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 2986 or die "unable to load regions file\n";
2829 2987
2830 for (cf::region::list) { 2988 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 2989 $_->{match} = qr/$_->{match}/
… …
2867 3025
2868sub init { 3026sub init {
2869 reload_resources; 3027 reload_resources;
2870} 3028}
2871 3029
2872sub cfg_load { 3030sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3031 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3032 or return;
2875 3033
2876 local $/; 3034 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3035 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3055 (async {
2898 Event::one_event; 3056 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3057 })->prio (Coro::PRIO_MAX);
2900 }; 3058 };
2901 3059
2902 cfg_load; 3060 reload_config;
2903 db_init; 3061 db_init;
2904 load_extensions; 3062 load_extensions;
2905 3063
2906 $TICK_WATCHER->start; 3064 $TICK_WATCHER->start;
2907 Event::loop; 3065 Event::loop;
… …
3100 warn "reloading cf.pm"; 3258 warn "reloading cf.pm";
3101 require cf; 3259 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3260 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3261
3104 warn "loading config and database again"; 3262 warn "loading config and database again";
3105 cf::cfg_load; 3263 cf::reload_config;
3106 3264
3107 warn "loading extensions"; 3265 warn "loading extensions";
3108 cf::load_extensions; 3266 cf::load_extensions;
3109 3267
3110 warn "reattaching attachments to objects/players"; 3268 warn "reattaching attachments to objects/players";

Diff Legend

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