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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 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
… …
1422sub expand_cfpod { 1463sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1424 1465
1425 # escape & and < 1466 # escape & and <
1426 s/&/&amp;/g; 1467 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1428 1469
1429 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1430 1471
1431 1 while 1472 1 while
1432 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1478 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1439 }ge 1481 }ge
1440 # replace H<hint text> 1482 # replace H<hint text>
… …
1461sub hintmode { 1503sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1505 $_[0]{hintmode}
1464} 1506}
1465 1507
1466=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1467 1509
1468Sends an ext reply to the player. 1510Sends an ext reply to the player.
1469 1511
1470=cut 1512=cut
1471 1513
1472sub ext_reply($$%) { 1514sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1474 1516
1475 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1518}
1478 1519
1479=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1480 1521
1481Sends an ext event to the client. 1522Sends an ext event to the client.
1482 1523
1483=cut 1524=cut
1484 1525
1485sub ext_event($$%) { 1526sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1487 1528
1488 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1489} 1530}
1490 1531
1491=head3 cf::region 1532=head3 cf::region
1492 1533
1493=over 4 1534=over 4
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1813 1854
1814 my $path = $self->{path}; 1855 my $path = $self->{path};
1815 1856
1816 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1817 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1818 1860
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1820 1862
1821 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1822 1864
1823 $self->alloc; 1865 $self->alloc;
1824 1866
1825 $self->pre_load; 1867 $self->pre_load;
1826 Coro::cede; 1868 cf::cede_to_tick;
1827 1869
1828 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1829 or return; 1871 or return;
1830 1872
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1837 $self->clear_unique_items; 1879 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1839 } 1881 }
1840 } 1882 }
1841 1883
1842 Coro::cede; 1884 cf::cede_to_tick;
1843 # now do the right thing for maps 1885 # now do the right thing for maps
1844 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1888 unless $self->difficulty;
1847 Coro::cede; 1889 cf::cede_to_tick;
1848 1890
1849 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1892 $self->decay_objects;
1851 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1852 $self->update_buttons; 1894 $self->update_buttons;
1853 Coro::cede; 1895 cf::cede_to_tick;
1854 $self->set_darkness_map; 1896 $self->set_darkness_map;
1855 Coro::cede; 1897 cf::cede_to_tick;
1856 $self->activate; 1898 $self->activate;
1857 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1858 1903
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1905 }
1861 1906
1862 $self->post_load; 1907 $self->post_load;
… …
1873 1918
1874 $self 1919 $self
1875} 1920}
1876 1921
1877# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1923sub load_neighbours {
1879 my ($map) = @_; 1924 my ($map) = @_;
1880 1925
1881 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1882 1927
1883 for (0 .. 3) { 1928 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1885 or next; 1930 or next;
1886 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1887 or next; 1932 or next;
1888 $neigh->load; 1933 $neigh->load;
1889 1934
1935 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1938 }
1893 1939
1894 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1896 or next; 1943 or next;
1897 $neigh->load; 1944 $neigh->load;
1898 } 1945 }
1899} 1946}
1900 1947
… …
1905} 1952}
1906 1953
1907sub do_load_sync { 1954sub do_load_sync {
1908 my ($map) = @_; 1955 my ($map) = @_;
1909 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1910 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1911} 1961}
1912 1962
1913our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1915 1965
1916sub find_async { 1966sub find_async {
1917 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1918 1968
1919 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1920 1970
1921 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 1973 }
1924 1974
1925 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1926 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 1980 if (my $map = find $k) {
1930 $map->load; 1981 $map->load if $v;
1931 } 1982 }
1932 1983
1933 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1934 } 1985 }
1935 } 1986 }
1936 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1937 }; 1988 };
1938 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1941} 1992}
1942 1993
1943sub save { 1994sub save {
1944 my ($self) = @_; 1995 my ($self) = @_;
1945 1996
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 1998
1948 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1949 2000
1950 return unless $self->dirty; 2001 return unless $self->dirty;
1951 2002
… …
1974 my ($self) = @_; 2025 my ($self) = @_;
1975 2026
1976 # save first because save cedes 2027 # save first because save cedes
1977 $self->save; 2028 $self->save;
1978 2029
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2031
1981 return if $self->players; 2032 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1984 2035
… …
2036my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2037 2088
2038sub nuke { 2089sub nuke {
2039 my ($self) = @_; 2090 my ($self) = @_;
2040 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2041 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2042 2096
2043 $self->unlink_save; 2097 $self->unlink_save;
2044 2098
2045 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2104
2051 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2052 2107
2053 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2054} 2109}
2055 2110
2056=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2163 2218
2164 } else { 2219 } else {
2165 my $pl = $self->contr; 2220 my $pl = $self->contr;
2166 2221
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2224 $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 2225
2176 } else { 2226 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2179 } 2229 }
2180 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2181} 2241}
2182 2242
2183=item $player_object->may ("access") 2243=item $player_object->may ("access")
2184 2244
2185Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2267 2327
2268 $map->load; 2328 $map->load;
2269 $map->load_diag; 2329 $map->load_neighbours;
2270 2330
2271 return unless $self->contr->active; 2331 return unless $self->contr->active;
2272 $self->activate_recursive; 2332 $self->activate_recursive;
2273 2333
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 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 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2447 2507
2448=cut 2508=cut
2449 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2450sub cf::client::send_msg { 2525sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2527
2453 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2454 2529
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2456 2534
2457 if (ref $channel) { 2535 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2462 } 2541 }
2463 2542
2464 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2465 } 2544 }
2466 2545
2467 return unless @extra || length $msg; 2546 return unless @extra || length $msg;
2468 2547
2469 if ($self->can_msg) { 2548 if ($self->can_msg) {
2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2555 } 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) { 2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2483 if (0 && $msg =~ /\[/) { 2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2574 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2576 $self->send_packet ("drawinfo $color $msg")
2488 } 2577 }
2489 } 2578 }
2490 } 2579 }
2491} 2580}
2492 2581
2493=item $client->ext_event ($type, %msg) 2582=item $client->ext_msg ($type, @msg)
2494 2583
2495Sends an ext event to the client. 2584Sends an ext event to the client.
2496 2585
2497=cut 2586=cut
2498 2587
2499sub cf::client::ext_event($$%) { 2588sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2589 my ($self, $type, @msg) = @_;
2501 2590
2502 return unless $self->extcmd; 2591 if ($self->extcmd == 2) {
2503 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2594 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2506} 2615}
2507 2616
2508=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
2509 2618
2510Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2674 my ($ns, $buf) = @_;
2566 2675
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2677
2569 if (ref $msg) { 2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2686 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2687 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2576 } else { 2693 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2695 }
2579 2696
2580 cf::override; 2697 cf::override;
… …
2627our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
2629 2746
2630$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
2631 2748
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
2633 2754
2634# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
2635 2756
2636=pod 2757=pod
2637 2758
2638The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2639 2760
2640 cf::object 2761 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2762 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2763 insert remove name archname title slaying race decrease_ob_nr
2643 2764
2644 cf::object::player 2765 cf::object::player
2645 player 2766 player
2646 2767
2647 cf::player 2768 cf::player
… …
2652 2773
2653=cut 2774=cut
2654 2775
2655for ( 2776for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2657 insert remove)], 2779 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2661) { 2783) {
2662 no strict 'refs'; 2784 no strict 'refs';
… …
2738# the server's init and main functions 2860# the server's init and main functions
2739 2861
2740sub load_facedata($) { 2862sub load_facedata($) {
2741 my ($path) = @_; 2863 my ($path) = @_;
2742 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2743 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2744 2872
2745 my $facedata; 2873 my $facedata;
2746 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2875 or die "$path: $!";
2748 2876
2749 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2750 2878
2751 $facedata->{version} == 2 2879 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2753 2888
2754 { 2889 {
2755 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2756 2891
2757 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2895 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2898
2764 cf::cede_to_tick; 2899 cf::cede_to_tick;
2765 } 2900 }
2766 2901
2767 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
… …
2792 2927
2793 { 2928 {
2794 # TODO: for gcfclient pleasure, we should give resources 2929 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2930 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2931 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2798 2934
2799 while (my ($name, $info) = each %$res) { 2935 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; 2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2807 2938
2808 if ($name =~ /\.jpg$/) { 2939 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2940 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 2948 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 2949 $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 } 2950 }
2818 2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2819 cf::cede_to_tick; 2955 cf::cede_to_tick;
2820 } 2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2821 } 2975 }
2822 2976
2823 1 2977 1
2824} 2978}
2825 2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2826sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2827 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2829 2995
2830 for (cf::region::list) { 2996 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
2867 3033
2868sub init { 3034sub init {
2869 reload_resources; 3035 reload_resources;
2870} 3036}
2871 3037
2872sub cfg_load { 3038sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3040 or return;
2875 3041
2876 local $/; 3042 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3063 (async {
2898 Event::one_event; 3064 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
2900 }; 3066 };
2901 3067
2902 cfg_load; 3068 reload_config;
2903 db_init; 3069 db_init;
2904 load_extensions; 3070 load_extensions;
2905 3071
2906 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
2907 Event::loop; 3073 Event::loop;
… …
3100 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3101 require cf; 3267 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3269
3104 warn "loading config and database again"; 3270 warn "loading config and database again";
3105 cf::cfg_load; 3271 cf::reload_config;
3106 3272
3107 warn "loading extensions"; 3273 warn "loading extensions";
3108 cf::load_extensions; 3274 cf::load_extensions;
3109 3275
3110 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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