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.316 by root, Mon Jul 23 21:02:50 2007 UTC vs.
Revision 1.347 by root, Thu Aug 30 05:16:09 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 (liekly 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
… …
1532=cut 1511=cut
1533 1512
1534sub ext_reply($$@) { 1513sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1514 my ($self, $id, @msg) = @_;
1536 1515
1537 if ($self->ns->extcmd == 2) { 1516 $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} 1517}
1545 1518
1546=item $player->ext_msg ($type, @msg) 1519=item $player->ext_msg ($type, @msg)
1547 1520
1548Sends an ext event to the client. 1521Sends an ext event to the client.
… …
1879 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1880 1853
1881 my $path = $self->{path}; 1854 my $path = $self->{path};
1882 1855
1883 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1884 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1885 1859
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1887 1861
1888 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1889 1863
1890 $self->alloc; 1864 $self->alloc;
1891 1865
1892 $self->pre_load; 1866 $self->pre_load;
1893 Coro::cede; 1867 cf::cede_to_tick;
1894 1868
1895 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1896 or return; 1870 or return;
1897 1871
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1904 $self->clear_unique_items; 1878 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1906 } 1880 }
1907 } 1881 }
1908 1882
1909 Coro::cede; 1883 cf::cede_to_tick;
1910 # now do the right thing for maps 1884 # now do the right thing for maps
1911 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 1887 unless $self->difficulty;
1914 Coro::cede; 1888 cf::cede_to_tick;
1915 1889
1916 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 1891 $self->decay_objects;
1918 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1919 $self->update_buttons; 1893 $self->update_buttons;
1920 Coro::cede; 1894 cf::cede_to_tick;
1921 $self->set_darkness_map; 1895 $self->set_darkness_map;
1922 Coro::cede; 1896 cf::cede_to_tick;
1923 $self->activate; 1897 $self->activate;
1924 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1925 1902
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1904 }
1928 1905
1929 $self->post_load; 1906 $self->post_load;
… …
1940 1917
1941 $self 1918 $self
1942} 1919}
1943 1920
1944# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1922sub load_neighbours {
1946 my ($map) = @_; 1923 my ($map) = @_;
1947 1924
1948 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1949 1926
1950 for (0 .. 3) { 1927 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1952 or next; 1929 or next;
1953 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1954 or next; 1931 or next;
1955 $neigh->load; 1932 $neigh->load;
1956 1933
1934 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1937 }
1960 1938
1961 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1963 or next; 1942 or next;
1964 $neigh->load; 1943 $neigh->load;
1965 } 1944 }
1966} 1945}
1967 1946
… …
1972} 1951}
1973 1952
1974sub do_load_sync { 1953sub do_load_sync {
1975 my ($map) = @_; 1954 my ($map) = @_;
1976 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1977 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1978} 1960}
1979 1961
1980our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1982 1964
1983sub find_async { 1965sub find_async {
1984 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1985 1967
1986 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1987 1969
1988 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1990 } 1972 }
1991 1973
1992 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1993 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1994 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 1979 if (my $map = find $k) {
1997 $map->load; 1980 $map->load if $v;
1998 } 1981 }
1999 1982
2000 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
2001 } 1984 }
2002 } 1985 }
2003 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
2004 }; 1987 };
2005 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
2008} 1991}
2009 1992
2010sub save { 1993sub save {
2011 my ($self) = @_; 1994 my ($self) = @_;
2012 1995
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 1997
2015 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
2016 1999
2017 return unless $self->dirty; 2000 return unless $self->dirty;
2018 2001
… …
2041 my ($self) = @_; 2024 my ($self) = @_;
2042 2025
2043 # save first because save cedes 2026 # save first because save cedes
2044 $self->save; 2027 $self->save;
2045 2028
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2030
2048 return if $self->players; 2031 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2051 2034
… …
2240 $self->message ($msg, $flags); 2223 $self->message ($msg, $flags);
2241 } 2224 }
2242 } 2225 }
2243} 2226}
2244 2227
2228=item $object->send_msg ($channel, $msg, $color, [extra...])
2229
2230=cut
2231
2232sub cf::object::send_msg {
2233 my $pl = shift->contr
2234 or return;
2235 $pl->send_msg (@_);
2236}
2237
2245=item $player_object->may ("access") 2238=item $player_object->may ("access")
2246 2239
2247Returns wether the given player is authorized to access resource "access" 2240Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2241(e.g. "command_wizcast").
2249 2242
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2319 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2320 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2321 if $x <=0 && $y <= 0;
2329 2322
2330 $map->load; 2323 $map->load;
2331 $map->load_diag; 2324 $map->load_neighbours;
2332 2325
2333 return unless $self->contr->active; 2326 return unless $self->contr->active;
2334 $self->activate_recursive; 2327 $self->activate_recursive;
2335 2328
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2329 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2512sub cf::client::send_msg { 2505sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2506 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2507
2515 $msg = $self->pl->expand_cfpod ($msg); 2508 $msg = $self->pl->expand_cfpod ($msg);
2516 2509
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2510 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2511
2519 if (ref $channel) { 2512 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2513 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2514 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2515 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2516 $self->ext_msg (channel_info => $channel);
2524 } 2517 }
2525 2518
2526 $channel = $channel->{id}; 2519 $channel = $channel->{id};
2527 } 2520 }
2528 2521
2529 return unless @extra || length $msg; 2522 return unless @extra || length $msg;
2530 2523
2531 if ($self->can_msg) { 2524 if ($self->can_msg) {
2525 # default colour, mask it out
2526 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 if $color & cf::NDI_DEF;
2528
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2529 $self->send_packet ("msg " . $self->{json_coder}->encode (
2530 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2531 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2532 if ($color >= 0) {
2533 # replace some tags by gcfclient-compatible ones
2534 for ($msg) {
2535 1 while
2536 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2537 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2538 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2539 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2540 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2541 }
2542
2543 $color &= cf::NDI_COLOR_MASK;
2544
2545 utf8::encode $msg;
2546
2545 if (0 && $msg =~ /\[/) { 2547 if (0 && $msg =~ /\[/) {
2548 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2549 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2550 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2551 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2552 $self->send_packet ("drawinfo $color $msg")
2550 } 2553 }
2551 } 2554 }
… …
2559=cut 2562=cut
2560 2563
2561sub cf::client::ext_msg($$@) { 2564sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2565 my ($self, $type, @msg) = @_;
2563 2566
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2567 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2569 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2570 push @msg, msgtype => "event_$type";
2571 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2572 }
2573}
2574
2575=item $client->ext_reply ($msgid, @msg)
2576
2577Sends an ext reply to the client.
2578
2579=cut
2580
2581sub cf::client::ext_reply($$@) {
2582 my ($self, $id, @msg) = @_;
2583
2584 if ($self->extcmd == 2) {
2585 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2586 } elsif ($self->extcmd == 1) {
2587 #TODO: version 1, remove
2588 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2589 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2590 }
2572} 2591}
2573 2592
2574=item $success = $client->query ($flags, "text", \&cb) 2593=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2655 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2656 "ARRAY" eq ref $msg
2638 ? @$msg 2657 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2658 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2659
2660 my @reply;
2661
2641 if (my $cb = $EXTICMD{$type}) { 2662 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2663 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2664 }
2665
2666 $ns->ext_reply ($reply, @reply)
2667 if $reply;
2668
2647 } else { 2669 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2670 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2671 }
2650 2672
2651 cf::override; 2673 cf::override;
… …
2698our $safe = new Safe "safe"; 2720our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2721our $safe_hole = new Safe::Hole;
2700 2722
2701$SIG{FPE} = 'IGNORE'; 2723$SIG{FPE} = 'IGNORE';
2702 2724
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2725$safe->permit_only (Opcode::opset qw(
2726 :base_core :base_mem :base_orig :base_math
2727 grepstart grepwhile mapstart mapwhile
2728 sort time
2729));
2704 2730
2705# here we export the classes and methods available to script code 2731# here we export the classes and methods available to script code
2706 2732
2707=pod 2733=pod
2708 2734
2709The following functions and methods are available within a safe environment: 2735The following functions and methods are available within a safe environment:
2710 2736
2711 cf::object 2737 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2738 contr pay_amount pay_player map x y force_find force_add
2713 insert remove 2739 insert remove name archname title slaying race decrease_ob_nr
2714 2740
2715 cf::object::player 2741 cf::object::player
2716 player 2742 player
2717 2743
2718 cf::player 2744 cf::player
… …
2723 2749
2724=cut 2750=cut
2725 2751
2726for ( 2752for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2753 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2754 insert remove inv name archname title slaying race
2728 insert remove)], 2755 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2756 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2757 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2758 ["cf::map" => qw(trigger)],
2732) { 2759) {
2733 no strict 'refs'; 2760 no strict 'refs';
… …
2809# the server's init and main functions 2836# the server's init and main functions
2810 2837
2811sub load_facedata($) { 2838sub load_facedata($) {
2812 my ($path) = @_; 2839 my ($path) = @_;
2813 2840
2841 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2842
2814 warn "loading facedata from $path\n"; 2843 warn "loading facedata from $path\n";
2815 2844
2816 my $facedata; 2845 my $facedata;
2817 0 < aio_load $path, $facedata 2846 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2847 or die "$path: $!";
2819 2848
2820 $facedata = Coro::Storable::thaw $facedata; 2849 $facedata = Coro::Storable::thaw $facedata;
2821 2850
2822 $facedata->{version} == 2 2851 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2852 or cf::cleanup "$path: version mismatch, cannot proceed.";
2853
2854 # patch in the exptable
2855 $facedata->{resource}{"res/exp_table"} = {
2856 type => FT_RSRC,
2857 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2858 };
2859 cf::cede_to_tick;
2824 2860
2825 { 2861 {
2826 my $faces = $facedata->{faceinfo}; 2862 my $faces = $facedata->{faceinfo};
2827 2863
2828 while (my ($face, $info) = each %$faces) { 2864 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2865 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2866 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2867 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2868 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2869 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2870
2835 cf::cede_to_tick; 2871 cf::cede_to_tick;
2836 } 2872 }
2837 2873
2838 while (my ($face, $info) = each %$faces) { 2874 while (my ($face, $info) = each %$faces) {
… …
2863 2899
2864 { 2900 {
2865 # TODO: for gcfclient pleasure, we should give resources 2901 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2902 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2903 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 2904
2905 my $soundconf = delete $res->{"res/sound.conf"};
2869 2906
2870 while (my ($name, $info) = each %$res) { 2907 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2908 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2909 my $data;
2878 2910
2879 if ($name =~ /\.jpg$/) { 2911 if ($info->{type} & 1) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2912 # prepend meta info
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2913
2914 my $meta = $enc->encode ({
2915 name => $name,
2916 %{ $info->{meta} || {} },
2917 });
2918
2919 $data = pack "(w/a*)*", $meta, $info->{data};
2882 } else { 2920 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2921 $data = $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 2922 }
2889 2923
2924 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2925 cf::face::set_type $idx, $info->{type};
2926
2890 cf::cede_to_tick; 2927 cf::cede_to_tick;
2891 } 2928 }
2929
2930 if ($soundconf) {
2931 $soundconf = $enc->decode (delete $soundconf->{data});
2932
2933 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2934 my $sound = $soundconf->{compat}[$_]
2935 or next;
2936
2937 my $face = cf::face::find "sound/$sound->[1]";
2938 cf::sound::set $sound->[0] => $face;
2939 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2940 }
2941
2942 while (my ($k, $v) = each %{$soundconf->{event}}) {
2943 my $face = cf::face::find "sound/$v";
2944 cf::sound::set $k => $face;
2945 }
2946 }
2892 } 2947 }
2893 2948
2894 1 2949 1
2895} 2950}
2951
2952register_exticmd fx_want => sub {
2953 my ($ns, $want) = @_;
2954
2955 while (my ($k, $v) = each %$want) {
2956 $ns->fx_want ($k, $v);
2957 }
2958};
2896 2959
2897sub reload_regions { 2960sub reload_regions {
2898 load_resource_file "$MAPDIR/regions" 2961 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 2962 or die "unable to load regions file\n";
2900 2963
… …
2938 3001
2939sub init { 3002sub init {
2940 reload_resources; 3003 reload_resources;
2941} 3004}
2942 3005
2943sub cfg_load { 3006sub reload_config {
2944 open my $fh, "<:utf8", "$CONFDIR/config" 3007 open my $fh, "<:utf8", "$CONFDIR/config"
2945 or return; 3008 or return;
2946 3009
2947 local $/; 3010 local $/;
2948 *CFG = YAML::Syck::Load <$fh>; 3011 *CFG = YAML::Syck::Load <$fh>;
… …
2968 (async { 3031 (async {
2969 Event::one_event; 3032 Event::one_event;
2970 })->prio (Coro::PRIO_MAX); 3033 })->prio (Coro::PRIO_MAX);
2971 }; 3034 };
2972 3035
2973 cfg_load; 3036 reload_config;
2974 db_init; 3037 db_init;
2975 load_extensions; 3038 load_extensions;
2976 3039
2977 $TICK_WATCHER->start; 3040 $TICK_WATCHER->start;
2978 Event::loop; 3041 Event::loop;
… …
3171 warn "reloading cf.pm"; 3234 warn "reloading cf.pm";
3172 require cf; 3235 require cf;
3173 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3236 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3174 3237
3175 warn "loading config and database again"; 3238 warn "loading config and database again";
3176 cf::cfg_load; 3239 cf::reload_config;
3177 3240
3178 warn "loading extensions"; 3241 warn "loading extensions";
3179 cf::load_extensions; 3242 cf::load_extensions;
3180 3243
3181 warn "reattaching attachments to objects/players"; 3244 warn "reattaching attachments to objects/players";

Diff Legend

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