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.326 by root, Tue Jul 31 17:33:15 2007 UTC vs.
Revision 1.355 by root, Sun Sep 2 12:45:44 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
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
474 478
475=cut 479=cut
476 480
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 481sub fork_call(&@) {
487 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
488 483
489# 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,
490# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 487
494 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 489 reset_signals;
508 local $SIG{__WARN__}; 490 &$cb
509 local $SIG{__DIE__}; 491 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 492
516 eval { 493 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 494}
529 495
530=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
531 497
532Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
612 if (1) { 578 if (1) {
613 $md5 = 579 $md5 =
614 join "\x00", 580 join "\x00",
615 $processversion, 581 $processversion,
616 map { 582 map {
617 Coro::cede; 583 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 585 } 0.. $#$src;
620 586
621 587
622 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1186 my ($type, $reply, @payload) = 1152 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1153 "ARRAY" eq ref $msg
1188 ? @$msg 1154 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1156
1157 my @reply;
1158
1191 if (my $cb = $EXTCMD{$type}) { 1159 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1160 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1197 } else { 1166 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1168 }
1200 1169
1201 cf::override; 1170 cf::override;
… …
1356 1325
1357 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1359 1328
1360 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1361 Coro::cede; 1330 cf::cede_to_tick;
1362} 1331}
1363 1332
1364sub new($) { 1333sub new($) {
1365 my ($login) = @_; 1334 my ($login) = @_;
1366 1335
… …
1370 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1371 1340
1372 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1373 1342
1374 $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 (@_);
1375} 1354}
1376 1355
1377=item $pl->quit_character 1356=item $pl->quit_character
1378 1357
1379Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1434 or return []; 1413 or return [];
1435 1414
1436 my @logins; 1415 my @logins;
1437 1416
1438 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1442 1426
1443 utf8::decode $login; 1427 utf8::decode $login;
1444 push @logins, $login; 1428 push @logins, $login;
1445 } 1429 }
1446 1430
… …
1484sub expand_cfpod { 1468sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1486 1470
1487 # escape & and < 1471 # escape & and <
1488 s/&/&amp;/g; 1472 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1490 1474
1491 # this is buggy, it needs to properly take care of nested <'s 1475 # this is buggy, it needs to properly take care of nested <'s
1492 1476
1493 1 while 1477 1 while
1494 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags 1483 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1501 }ge 1486 }ge
1502 # replace H<hint text> 1487 # replace H<hint text>
… …
1532=cut 1517=cut
1533 1518
1534sub ext_reply($$@) { 1519sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1520 my ($self, $id, @msg) = @_;
1536 1521
1537 if ($self->ns->extcmd == 2) { 1522 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1523}
1545 1524
1546=item $player->ext_msg ($type, @msg) 1525=item $player->ext_msg ($type, @msg)
1547 1526
1548Sends an ext event to the client. 1527Sends an ext event to the client.
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1880 1859
1881 my $path = $self->{path}; 1860 my $path = $self->{path};
1882 1861
1883 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1884 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1885 1865
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1867
1888 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1889 1869
1890 $self->alloc; 1870 $self->alloc;
1891 1871
1892 $self->pre_load; 1872 $self->pre_load;
1893 Coro::cede; 1873 cf::cede_to_tick;
1894 1874
1895 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1896 or return; 1876 or return;
1897 1877
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1904 $self->clear_unique_items; 1884 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1906 } 1886 }
1907 } 1887 }
1908 1888
1909 Coro::cede; 1889 cf::cede_to_tick;
1910 # now do the right thing for maps 1890 # now do the right thing for maps
1911 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1893 unless $self->difficulty;
1914 Coro::cede; 1894 cf::cede_to_tick;
1915 1895
1916 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1897 $self->decay_objects;
1918 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1919 $self->update_buttons; 1899 $self->update_buttons;
1920 Coro::cede; 1900 cf::cede_to_tick;
1921 $self->set_darkness_map; 1901 $self->set_darkness_map;
1922 Coro::cede; 1902 cf::cede_to_tick;
1923 $self->activate; 1903 $self->activate;
1924 } 1904 }
1925 1905
1926 $self->{last_save} = $cf::RUNTIME; 1906 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 1907 $self->last_access ($cf::RUNTIME);
… …
1943 1923
1944 $self 1924 $self
1945} 1925}
1946 1926
1947# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1948sub load_diag { 1928sub load_neighbours {
1949 my ($map) = @_; 1929 my ($map) = @_;
1950 1930
1951 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1952 1932
1953 for (0 .. 3) { 1933 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1955 or next; 1935 or next;
1956 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1957 or next; 1937 or next;
1958 $neigh->load; 1938 $neigh->load;
1959 1939
1940 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 1943 }
1963 1944
1964 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1966 or next; 1948 or next;
1967 $neigh->load; 1949 $neigh->load;
1968 } 1950 }
1969} 1951}
1970 1952
… …
1975} 1957}
1976 1958
1977sub do_load_sync { 1959sub do_load_sync {
1978 my ($map) = @_; 1960 my ($map) = @_;
1979 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1980 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1981} 1966}
1982 1967
1983our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1985 1970
1986sub find_async { 1971sub find_async {
1987 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1988 1973
1989 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1990 1975
1991 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1993 } 1978 }
1994 1979
1995 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1996 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1997 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 1985 if (my $map = find $k) {
2000 $map->load; 1986 $map->load if $v;
2001 } 1987 }
2002 1988
2003 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
2004 } 1990 }
2005 } 1991 }
2006 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
2007 }; 1993 };
2008 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
2011} 1997}
2012 1998
2013sub save { 1999sub save {
2014 my ($self) = @_; 2000 my ($self) = @_;
2015 2001
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2003
2018 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
2019 2005
2020 return unless $self->dirty; 2006 return unless $self->dirty;
2021 2007
… …
2044 my ($self) = @_; 2030 my ($self) = @_;
2045 2031
2046 # save first because save cedes 2032 # save first because save cedes
2047 $self->save; 2033 $self->save;
2048 2034
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2036
2051 return if $self->players; 2037 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save}; 2039 return if $self->{deny_save};
2054 2040
… …
2106my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2107 2093
2108sub nuke { 2094sub nuke {
2109 my ($self) = @_; 2095 my ($self) = @_;
2110 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2111 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2112 2101
2113 $self->unlink_save; 2102 $self->unlink_save;
2114 2103
2115 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2109
2121 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2122 2112
2123 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2124} 2114}
2125 2115
2126=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2243 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2244 } 2234 }
2245 } 2235 }
2246} 2236}
2247 2237
2238=item $object->send_msg ($channel, $msg, $color, [extra...])
2239
2240=cut
2241
2242sub cf::object::send_msg {
2243 my $pl = shift->contr
2244 or return;
2245 $pl->send_msg (@_);
2246}
2247
2248=item $player_object->may ("access") 2248=item $player_object->may ("access")
2249 2249
2250Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2251(e.g. "command_wizcast").
2252 2252
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2332 2332
2333 $map->load; 2333 $map->load;
2334 $map->load_diag; 2334 $map->load_neighbours;
2335 2335
2336 return unless $self->contr->active; 2336 return unless $self->contr->active;
2337 $self->activate_recursive; 2337 $self->activate_recursive;
2338 2338
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2512 2512
2513=cut 2513=cut
2514 2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2515sub cf::client::send_msg { 2530sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2532
2518 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2519 2534
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2521 2539
2522 if (ref $channel) { 2540 if (ref $channel) {
2523 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2527 } 2546 }
2528 2547
2529 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2530 } 2549 }
2531 2550
… …
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2570 }
2552 2571
2553 $color &= cf::NDI_COLOR_MASK; 2572 $color &= cf::NDI_COLOR_MASK;
2554 2573
2574 utf8::encode $msg;
2575
2555 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2579 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2560 } 2582 }
2561 } 2583 }
… …
2569=cut 2591=cut
2570 2592
2571sub cf::client::ext_msg($$@) { 2593sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2594 my ($self, $type, @msg) = @_;
2573 2595
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2596 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2598 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2599 push @msg, msgtype => "event_$type";
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 }
2602}
2603
2604=item $client->ext_reply ($msgid, @msg)
2605
2606Sends an ext reply to the client.
2607
2608=cut
2609
2610sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_;
2612
2613 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2619 }
2582} 2620}
2583 2621
2584=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
… …
2646 my ($type, $reply, @payload) = 2684 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2685 "ARRAY" eq ref $msg
2648 ? @$msg 2686 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2687 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 2688
2689 my @reply;
2690
2651 if (my $cb = $EXTICMD{$type}) { 2691 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 2692 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2657 } else { 2698 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 2700 }
2660 2701
2661 cf::override; 2702 cf::override;
… …
2708our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2710 2751
2711$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2712 2753
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2754$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math
2756 grepstart grepwhile mapstart mapwhile
2757 sort time
2758));
2714 2759
2715# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2716 2761
2717=pod 2762=pod
2718 2763
2719The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2720 2765
2721 cf::object 2766 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 2767 contr pay_amount pay_player map x y force_find force_add
2723 insert remove 2768 insert remove name archname title slaying race decrease_ob_nr
2724 2769
2725 cf::object::player 2770 cf::object::player
2726 player 2771 player
2727 2772
2728 cf::player 2773 cf::player
… …
2733 2778
2734=cut 2779=cut
2735 2780
2736for ( 2781for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race
2738 insert remove)], 2784 decrease_ob_nr)],
2739 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2742) { 2788) {
2743 no strict 'refs'; 2789 no strict 'refs';
… …
2819# the server's init and main functions 2865# the server's init and main functions
2820 2866
2821sub load_facedata($) { 2867sub load_facedata($) {
2822 my ($path) = @_; 2868 my ($path) = @_;
2823 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2875
2824 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2825 2877
2826 my $facedata; 2878 my $facedata;
2827 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 2880 or die "$path: $!";
2829 2881
2830 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2831 2883
2832 $facedata->{version} == 2 2884 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2886
2887 # patch in the exptable
2888 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2891 };
2892 cf::cede_to_tick;
2834 2893
2835 { 2894 {
2836 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2837 2896
2838 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2840 cf::face::set_visibility $idx, $info->{visibility}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 2900 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 2903
2845 cf::cede_to_tick; 2904 cf::cede_to_tick;
2846 } 2905 }
2847 2906
2848 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
… …
2873 2932
2874 { 2933 {
2875 # TODO: for gcfclient pleasure, we should give resources 2934 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 2935 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 2936 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879 2937
2880 my $soundconf = delete $res->{"res/sound.conf"}; 2938 my $soundconf = delete $res->{"res/sound.conf"};
2881 2939
2882 while (my ($name, $info) = each %$res) { 2940 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2889 2943
2890 if ($info->{type} & 1) { 2944 if ($info->{type} & 1) {
2891 # prepend meta info 2945 # prepend meta info
2892 2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 2952 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk;
2897 } else { 2953 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2954 $data = $info->{data};
2899 } 2955 }
2900 2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2901 cf::face::set_type $idx, $info->{type}; 2958 cf::face::set_type $idx, $info->{type};
2902 2959
2903 cf::cede_to_tick; 2960 cf::cede_to_tick;
2904 } 2961 }
2905 2962
… …
2932 $ns->fx_want ($k, $v); 2989 $ns->fx_want ($k, $v);
2933 } 2990 }
2934}; 2991};
2935 2992
2936sub reload_regions { 2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2937 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2938 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2939 3000
2940 for (cf::region::list) { 3001 for (cf::region::list) {
2941 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/
… …
2977 3038
2978sub init { 3039sub init {
2979 reload_resources; 3040 reload_resources;
2980} 3041}
2981 3042
2982sub cfg_load { 3043sub reload_config {
2983 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2984 or return; 3045 or return;
2985 3046
2986 local $/; 3047 local $/;
2987 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
3007 (async { 3068 (async {
3008 Event::one_event; 3069 Event::one_event;
3009 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
3010 }; 3071 };
3011 3072
3012 cfg_load; 3073 reload_config;
3013 db_init; 3074 db_init;
3014 load_extensions; 3075 load_extensions;
3015 3076
3016 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
3017 Event::loop; 3078 Event::loop;
… …
3210 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3211 require cf; 3272 require cf;
3212 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3213 3274
3214 warn "loading config and database again"; 3275 warn "loading config and database again";
3215 cf::cfg_load; 3276 cf::reload_config;
3216 3277
3217 warn "loading extensions"; 3278 warn "loading extensions";
3218 cf::load_extensions; 3279 cf::load_extensions;
3219 3280
3220 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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