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.314 by root, Mon Jul 23 16:53:15 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
… …
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
325} 329}
326 330
327=item cf::get_slot $time[, $priority] 331=item cf::get_slot $time[, $priority[, $name]]
328 332
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 333Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 334This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 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.
332 339
333Useful for short background jobs. 340Useful for short background jobs.
334 341
335=cut 342=cut
336 343
… …
363 Coro::schedule; 370 Coro::schedule;
364 } 371 }
365 } 372 }
366}; 373};
367 374
368sub get_slot($;$) { 375sub get_slot($;$$) {
369 my ($time, $pri) = @_; 376 my ($time, $pri, $name) = @_;
370 377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 383 $SLOT_QUEUE->ready;
374 $sig->wait; 384 $sig->wait;
375} 385}
376 386
… …
466Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
468 478
469=cut 479=cut
470 480
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 481sub fork_call(&@) {
481 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
482 483
483# 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,
484# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
486 or die "pipe: $!";
487 487
488 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 489 reset_signals;
502 local $SIG{__WARN__}; 490 &$cb
503 local $SIG{__DIE__}; 491 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 492
510 eval { 493 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 494}
523 495
524=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
525 497
526Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
606 if (1) { 578 if (1) {
607 $md5 = 579 $md5 =
608 join "\x00", 580 join "\x00",
609 $processversion, 581 $processversion,
610 map { 582 map {
611 Coro::cede; 583 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 585 } 0.. $#$src;
614 586
615 587
616 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1175 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1176 1148
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1150
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1185 } else { 1166 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1168 }
1188 1169
1189 cf::override; 1170 cf::override;
… …
1344 1325
1345 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1347 1328
1348 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1349 Coro::cede; 1330 cf::cede_to_tick;
1350} 1331}
1351 1332
1352sub new($) { 1333sub new($) {
1353 my ($login) = @_; 1334 my ($login) = @_;
1354 1335
… …
1358 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1359 1340
1360 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1361 1342
1362 $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 (@_);
1363} 1354}
1364 1355
1365=item $pl->quit_character 1356=item $pl->quit_character
1366 1357
1367Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1472sub expand_cfpod { 1463sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1474 1465
1475 # escape & and < 1466 # escape & and <
1476 s/&/&amp;/g; 1467 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1478 1469
1479 # 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
1480 1471
1481 1 while 1472 1 while
1482 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1478 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1489 }ge 1481 }ge
1490 # replace H<hint text> 1482 # replace H<hint text>
… …
1511sub hintmode { 1503sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1505 $_[0]{hintmode}
1514} 1506}
1515 1507
1516=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1517 1509
1518Sends an ext reply to the player. 1510Sends an ext reply to the player.
1519 1511
1520=cut 1512=cut
1521 1513
1522sub ext_reply($$%) { 1514sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1524 1516
1525 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1518}
1528 1519
1529=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1530 1521
1531Sends an ext event to the client. 1522Sends an ext event to the client.
1532 1523
1533=cut 1524=cut
1534 1525
1535sub ext_event($$%) { 1526sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1537 1528
1538 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1539} 1530}
1540 1531
1541=head3 cf::region 1532=head3 cf::region
1542 1533
1543=over 4 1534=over 4
… …
1862 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1863 1854
1864 my $path = $self->{path}; 1855 my $path = $self->{path};
1865 1856
1866 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1867 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1868 1860
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1870 1862
1871 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1872 1864
1873 $self->alloc; 1865 $self->alloc;
1874 1866
1875 $self->pre_load; 1867 $self->pre_load;
1876 Coro::cede; 1868 cf::cede_to_tick;
1877 1869
1878 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1879 or return; 1871 or return;
1880 1872
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1887 $self->clear_unique_items; 1879 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1889 } 1881 }
1890 } 1882 }
1891 1883
1892 Coro::cede; 1884 cf::cede_to_tick;
1893 # now do the right thing for maps 1885 # now do the right thing for maps
1894 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1888 unless $self->difficulty;
1897 Coro::cede; 1889 cf::cede_to_tick;
1898 1890
1899 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1892 $self->decay_objects;
1901 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1902 $self->update_buttons; 1894 $self->update_buttons;
1903 Coro::cede; 1895 cf::cede_to_tick;
1904 $self->set_darkness_map; 1896 $self->set_darkness_map;
1905 Coro::cede; 1897 cf::cede_to_tick;
1906 $self->activate; 1898 $self->activate;
1907 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1908 1903
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1905 }
1911 1906
1912 $self->post_load; 1907 $self->post_load;
… …
1923 1918
1924 $self 1919 $self
1925} 1920}
1926 1921
1927# 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
1928sub load_diag { 1923sub load_neighbours {
1929 my ($map) = @_; 1924 my ($map) = @_;
1930 1925
1931 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1932 1927
1933 for (0 .. 3) { 1928 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1935 or next; 1930 or next;
1936 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1937 or next; 1932 or next;
1938 $neigh->load; 1933 $neigh->load;
1939 1934
1935 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1938 }
1943 1939
1944 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1946 or next; 1943 or next;
1947 $neigh->load; 1944 $neigh->load;
1948 } 1945 }
1949} 1946}
1950 1947
… …
1955} 1952}
1956 1953
1957sub do_load_sync { 1954sub do_load_sync {
1958 my ($map) = @_; 1955 my ($map) = @_;
1959 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1960 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1961} 1961}
1962 1962
1963our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1965 1965
1966sub find_async { 1966sub find_async {
1967 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1968 1968
1969 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1970 1970
1971 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 1973 }
1974 1974
1975 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1976 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 1980 if (my $map = find $k) {
1980 $map->load; 1981 $map->load if $v;
1981 } 1982 }
1982 1983
1983 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1984 } 1985 }
1985 } 1986 }
1986 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1987 }; 1988 };
1988 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1991} 1992}
1992 1993
1993sub save { 1994sub save {
1994 my ($self) = @_; 1995 my ($self) = @_;
1995 1996
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 1998
1998 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1999 2000
2000 return unless $self->dirty; 2001 return unless $self->dirty;
2001 2002
… …
2024 my ($self) = @_; 2025 my ($self) = @_;
2025 2026
2026 # save first because save cedes 2027 # save first because save cedes
2027 $self->save; 2028 $self->save;
2028 2029
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2031
2031 return if $self->players; 2032 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2034 2035
… …
2086my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2087 2088
2088sub nuke { 2089sub nuke {
2089 my ($self) = @_; 2090 my ($self) = @_;
2090 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2091 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2092 2096
2093 $self->unlink_save; 2097 $self->unlink_save;
2094 2098
2095 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2104
2101 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2102 2107
2103 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2104} 2109}
2105 2110
2106=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2213 2218
2214 } else { 2219 } else {
2215 my $pl = $self->contr; 2220 my $pl = $self->contr;
2216 2221
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2225
2226 } else { 2226 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 } 2229 }
2230 } 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 (@_);
2231} 2241}
2232 2242
2233=item $player_object->may ("access") 2243=item $player_object->may ("access")
2234 2244
2235Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2317 2327
2318 $map->load; 2328 $map->load;
2319 $map->load_diag; 2329 $map->load_neighbours;
2320 2330
2321 return unless $self->contr->active; 2331 return unless $self->contr->active;
2322 $self->activate_recursive; 2332 $self->activate_recursive;
2323 2333
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2495the 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
2496the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2497 2507
2498=cut 2508=cut
2499 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
2500sub cf::client::send_msg { 2525sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2527
2503 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2504 2529
2505 $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};
2506 2534
2507 if (ref $channel) { 2535 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2539 $self->ext_msg (channel_info => $channel);
2512 } 2540 }
2513 2541
2514 $channel = $channel->{id}; 2542 $channel = $channel->{id};
2515 } 2543 }
2516 2544
2517 return unless @extra || length $msg; 2545 return unless @extra || length $msg;
2518 2546
2519 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
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2521 } else { 2554 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 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
2533 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2573 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2538 } 2576 }
2539 } 2577 }
2540 } 2578 }
2541} 2579}
2542 2580
2543=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2544 2582
2545Sends an ext event to the client. 2583Sends an ext event to the client.
2546 2584
2547=cut 2585=cut
2548 2586
2549sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2551 2589
2552 return unless $self->extcmd; 2590 if ($self->extcmd == 2) {
2553 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2555 $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 }
2556} 2614}
2557 2615
2558=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2559 2617
2560Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2673 my ($ns, $buf) = @_;
2616 2674
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2676
2619 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
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2685 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2686 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2626 } else { 2692 } else {
2627 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";
2628 } 2694 }
2629 2695
2630 cf::override; 2696 cf::override;
… …
2677our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2679 2745
2680$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2681 2747
2682$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));
2683 2753
2684# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2685 2755
2686=pod 2756=pod
2687 2757
2688The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2689 2759
2690 cf::object 2760 cf::object
2691 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
2692 insert remove 2762 insert remove name archname title slaying race decrease_ob_nr
2693 2763
2694 cf::object::player 2764 cf::object::player
2695 player 2765 player
2696 2766
2697 cf::player 2767 cf::player
… …
2702 2772
2703=cut 2773=cut
2704 2774
2705for ( 2775for (
2706 ["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
2707 insert remove)], 2778 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2711) { 2782) {
2712 no strict 'refs'; 2783 no strict 'refs';
… …
2788# the server's init and main functions 2859# the server's init and main functions
2789 2860
2790sub load_facedata($) { 2861sub load_facedata($) {
2791 my ($path) = @_; 2862 my ($path) = @_;
2792 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
2793 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2794 2871
2795 my $facedata; 2872 my $facedata;
2796 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2874 or die "$path: $!";
2798 2875
2799 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2800 2877
2801 $facedata->{version} == 2 2878 $facedata->{version} == 2
2802 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;
2803 2887
2804 { 2888 {
2805 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2806 2890
2807 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2897
2814 cf::cede_to_tick; 2898 cf::cede_to_tick;
2815 } 2899 }
2816 2900
2817 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
… …
2842 2926
2843 { 2927 {
2844 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2848 2933
2849 while (my ($name, $info) = each %$res) { 2934 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2857 2937
2858 if ($name =~ /\.jpg$/) { 2938 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2939 # prepend meta info
2860 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};
2861 } else { 2947 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 2948 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 2949 }
2868 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2869 cf::cede_to_tick; 2954 cf::cede_to_tick;
2870 } 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 }
2871 } 2974 }
2872 2975
2873 1 2976 1
2874} 2977}
2875 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
2876sub 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
2877 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2879 2994
2880 for (cf::region::list) { 2995 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2917 3032
2918sub init { 3033sub init {
2919 reload_resources; 3034 reload_resources;
2920} 3035}
2921 3036
2922sub cfg_load { 3037sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3039 or return;
2925 3040
2926 local $/; 3041 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2947 (async { 3062 (async {
2948 Event::one_event; 3063 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2950 }; 3065 };
2951 3066
2952 cfg_load; 3067 reload_config;
2953 db_init; 3068 db_init;
2954 load_extensions; 3069 load_extensions;
2955 3070
2956 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2957 Event::loop; 3072 Event::loop;
… …
3150 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3151 require cf; 3266 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3268
3154 warn "loading config and database again"; 3269 warn "loading config and database again";
3155 cf::cfg_load; 3270 cf::reload_config;
3156 3271
3157 warn "loading extensions"; 3272 warn "loading extensions";
3158 cf::load_extensions; 3273 cf::load_extensions;
3159 3274
3160 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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