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.352 by root, Sun Sep 2 04:57:14 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
… …
1411sub expand_cfpod { 1463sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1413 1465
1414 # escape & and < 1466 # escape & and <
1415 s/&/&amp;/g; 1467 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1417 1469
1418 # 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
1419 1471
1420 1 while 1472 1 while
1421 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1478 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1428 }ge 1481 }ge
1429 # replace H<hint text> 1482 # replace H<hint text>
… …
1450sub hintmode { 1503sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1505 $_[0]{hintmode}
1453} 1506}
1454 1507
1455=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1456 1509
1457Sends an ext reply to the player. 1510Sends an ext reply to the player.
1458 1511
1459=cut 1512=cut
1460 1513
1461sub ext_reply($$%) { 1514sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1463 1516
1464 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1518}
1467 1519
1468=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1469 1521
1470Sends an ext event to the client. 1522Sends an ext event to the client.
1471 1523
1472=cut 1524=cut
1473 1525
1474sub ext_event($$%) { 1526sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1476 1528
1477 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1478} 1530}
1479 1531
1480=head3 cf::region 1532=head3 cf::region
1481 1533
1482=over 4 1534=over 4
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1802 1854
1803 my $path = $self->{path}; 1855 my $path = $self->{path};
1804 1856
1805 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1806 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1807 1860
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1809 1862
1810 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1811 1864
1812 $self->alloc; 1865 $self->alloc;
1813 1866
1814 $self->pre_load; 1867 $self->pre_load;
1815 Coro::cede; 1868 cf::cede_to_tick;
1816 1869
1817 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1818 or return; 1871 or return;
1819 1872
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1826 $self->clear_unique_items; 1879 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1828 } 1881 }
1829 } 1882 }
1830 1883
1831 Coro::cede; 1884 cf::cede_to_tick;
1832 # now do the right thing for maps 1885 # now do the right thing for maps
1833 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1888 unless $self->difficulty;
1836 Coro::cede; 1889 cf::cede_to_tick;
1837 1890
1838 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1892 $self->decay_objects;
1840 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1841 $self->update_buttons; 1894 $self->update_buttons;
1842 Coro::cede; 1895 cf::cede_to_tick;
1843 $self->set_darkness_map; 1896 $self->set_darkness_map;
1844 Coro::cede; 1897 cf::cede_to_tick;
1845 $self->activate; 1898 $self->activate;
1846 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1847 1903
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1905 }
1850 1906
1851 $self->post_load; 1907 $self->post_load;
… …
1862 1918
1863 $self 1919 $self
1864} 1920}
1865 1921
1866# 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
1867sub load_diag { 1923sub load_neighbours {
1868 my ($map) = @_; 1924 my ($map) = @_;
1869 1925
1870 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1871 1927
1872 for (0 .. 3) { 1928 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1874 or next; 1930 or next;
1875 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1876 or next; 1932 or next;
1877 $neigh->load; 1933 $neigh->load;
1878 1934
1935 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1938 }
1882 1939
1883 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1885 or next; 1943 or next;
1886 $neigh->load; 1944 $neigh->load;
1887 } 1945 }
1888} 1946}
1889 1947
… …
1894} 1952}
1895 1953
1896sub do_load_sync { 1954sub do_load_sync {
1897 my ($map) = @_; 1955 my ($map) = @_;
1898 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1899 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1900} 1961}
1901 1962
1902our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1904 1965
1905sub find_async { 1966sub find_async {
1906 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1907 1968
1908 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1909 1970
1910 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 1973 }
1913 1974
1914 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1915 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 1980 if (my $map = find $k) {
1919 $map->load; 1981 $map->load if $v;
1920 } 1982 }
1921 1983
1922 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1923 } 1985 }
1924 } 1986 }
1925 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1926 }; 1988 };
1927 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1930} 1992}
1931 1993
1932sub save { 1994sub save {
1933 my ($self) = @_; 1995 my ($self) = @_;
1934 1996
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 1998
1937 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1938 2000
1939 return unless $self->dirty; 2001 return unless $self->dirty;
1940 2002
… …
1963 my ($self) = @_; 2025 my ($self) = @_;
1964 2026
1965 # save first because save cedes 2027 # save first because save cedes
1966 $self->save; 2028 $self->save;
1967 2029
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2031
1970 return if $self->players; 2032 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1973 2035
… …
2025my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2026 2088
2027sub nuke { 2089sub nuke {
2028 my ($self) = @_; 2090 my ($self) = @_;
2029 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2030 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2031 2096
2032 $self->unlink_save; 2097 $self->unlink_save;
2033 2098
2034 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2104
2040 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2041 2107
2042 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2043} 2109}
2044 2110
2045=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2152 2218
2153 } else { 2219 } else {
2154 my $pl = $self->contr; 2220 my $pl = $self->contr;
2155 2221
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2224 $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 2225
2165 } else { 2226 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2168 } 2229 }
2169 } 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 (@_);
2170} 2241}
2171 2242
2172=item $player_object->may ("access") 2243=item $player_object->may ("access")
2173 2244
2174Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2256 2327
2257 $map->load; 2328 $map->load;
2258 $map->load_diag; 2329 $map->load_neighbours;
2259 2330
2260 return unless $self->contr->active; 2331 return unless $self->contr->active;
2261 $self->activate_recursive; 2332 $self->activate_recursive;
2262 2333
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2425 2496
2426 utf8::encode $text; 2497 utf8::encode $text;
2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2428} 2499}
2429 2500
2430=item $client->send_msg ($color, $type, $msg, [extra...]) 2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2431 2502
2432Send a drawinfo or msg packet to the client, formatting the msg for the 2503Send 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 2504client 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 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2435the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2436 2507
2437=cut 2508=cut
2438 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
2439sub cf::client::send_msg { 2525sub cf::client::send_msg {
2440 my ($self, $color, $type, $msg, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2527
2442 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2443 2529
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};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel);
2540 }
2541
2542 $channel = $channel->{id};
2543 }
2544
2444 return unless @extra || length $msg; 2545 return unless @extra || length $msg;
2445 2546
2446 if ($self->can_msg) { 2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2447 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2448 } else { 2554 } 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) { 2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2460 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2461 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2462 } else { 2573 } else {
2463 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2464 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2465 } 2576 }
2466 } 2577 }
2467 } 2578 }
2468} 2579}
2469 2580
2470=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2471 2582
2472Sends an ext event to the client. 2583Sends an ext event to the client.
2473 2584
2474=cut 2585=cut
2475 2586
2476sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2477 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2478 2589
2479 return unless $self->extcmd; 2590 if ($self->extcmd == 2) {
2480 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2481 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2482 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2483} 2614}
2484 2615
2485=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2486 2617
2487Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
… …
2542 my ($ns, $buf) = @_; 2673 my ($ns, $buf) = @_;
2543 2674
2544 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2545 2676
2546 if (ref $msg) { 2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2547 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2685 if (my $cb = $EXTICMD{$type}) {
2548 if (my %reply = $cb->($ns, $msg)) { 2686 @reply = $cb->($ns, @payload);
2549 $reply{msgid} = $msg->{msgid};
2550 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2551 }
2552 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2553 } else { 2692 } else {
2554 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2555 } 2694 }
2556 2695
2557 cf::override; 2696 cf::override;
… …
2604our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2605our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2606 2745
2607$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2608 2747
2609$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2610 2753
2611# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2612 2755
2613=pod 2756=pod
2614 2757
2615The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2616 2759
2617 cf::object 2760 cf::object
2618 contr pay_amount pay_player map x y force_find force_add 2761 contr pay_amount pay_player map x y force_find force_add
2619 insert remove 2762 insert remove name archname title slaying race decrease_ob_nr
2620 2763
2621 cf::object::player 2764 cf::object::player
2622 player 2765 player
2623 2766
2624 cf::player 2767 cf::player
… …
2629 2772
2630=cut 2773=cut
2631 2774
2632for ( 2775for (
2633 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2634 insert remove)], 2778 decrease_ob_nr)],
2635 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2636 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2637 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2638) { 2782) {
2639 no strict 'refs'; 2783 no strict 'refs';
… …
2715# the server's init and main functions 2859# the server's init and main functions
2716 2860
2717sub load_facedata($) { 2861sub load_facedata($) {
2718 my ($path) = @_; 2862 my ($path) = @_;
2719 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2720 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2721 2871
2722 my $facedata; 2872 my $facedata;
2723 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2724 or die "$path: $!"; 2874 or die "$path: $!";
2725 2875
2726 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2727 2877
2728 $facedata->{version} == 2 2878 $facedata->{version} == 2
2729 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2730 2887
2731 { 2888 {
2732 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2733 2890
2734 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2735 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2736 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2737 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2738 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2739 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2740 2897
2741 cf::cede_to_tick; 2898 cf::cede_to_tick;
2742 } 2899 }
2743 2900
2744 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
… …
2769 2926
2770 { 2927 {
2771 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2772 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2773 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2774 my $enc = JSON::XS->new->utf8->canonical; 2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2775 2933
2776 while (my ($name, $info) = each %$res) { 2934 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; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2784 2937
2785 if ($name =~ /\.jpg$/) { 2938 if ($info->{type} & 1) {
2786 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2939 # prepend meta info
2787 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2788 } else { 2947 } else {
2789 my $data = pack "(w/a*)*", $meta, $info->{data}; 2948 $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 } 2949 }
2795 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2796 cf::cede_to_tick; 2954 cf::cede_to_tick;
2797 } 2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2798 } 2974 }
2799 2975
2800 1 2976 1
2801} 2977}
2802 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2803sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2804 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2805 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2806 2994
2807 for (cf::region::list) { 2995 for (cf::region::list) {
2808 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2844 3032
2845sub init { 3033sub init {
2846 reload_resources; 3034 reload_resources;
2847} 3035}
2848 3036
2849sub cfg_load { 3037sub reload_config {
2850 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2851 or return; 3039 or return;
2852 3040
2853 local $/; 3041 local $/;
2854 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2874 (async { 3062 (async {
2875 Event::one_event; 3063 Event::one_event;
2876 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2877 }; 3065 };
2878 3066
2879 cfg_load; 3067 reload_config;
2880 db_init; 3068 db_init;
2881 load_extensions; 3069 load_extensions;
2882 3070
2883 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2884 Event::loop; 3072 Event::loop;
… …
3077 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3078 require cf; 3266 require cf;
3079 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3080 3268
3081 warn "loading config and database again"; 3269 warn "loading config and database again";
3082 cf::cfg_load; 3270 cf::reload_config;
3083 3271
3084 warn "loading extensions"; 3272 warn "loading extensions";
3085 cf::load_extensions; 3273 cf::load_extensions;
3086 3274
3087 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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