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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
… …
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
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
… …
1494sub expand_cfpod { 1463sub expand_cfpod {
1495 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1496 1465
1497 # escape & and < 1466 # escape & and <
1498 s/&/&amp;/g; 1467 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1500 1469
1501 # 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
1502 1471
1503 1 while 1472 1 while
1504 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1508 # replace G<male|female> tags 1478 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1511 }ge 1481 }ge
1512 # replace H<hint text> 1482 # replace H<hint text>
… …
1542=cut 1512=cut
1543 1513
1544sub ext_reply($$@) { 1514sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1515 my ($self, $id, @msg) = @_;
1546 1516
1547 if ($self->ns->extcmd == 2) { 1517 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1518}
1555 1519
1556=item $player->ext_msg ($type, @msg) 1520=item $player->ext_msg ($type, @msg)
1557 1521
1558Sends an ext event to the client. 1522Sends an ext event to the client.
… …
1889 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1890 1854
1891 my $path = $self->{path}; 1855 my $path = $self->{path};
1892 1856
1893 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1894 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1895 1860
1896 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1897 1862
1898 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1899 1864
1900 $self->alloc; 1865 $self->alloc;
1901 1866
1902 $self->pre_load; 1867 $self->pre_load;
1903 Coro::cede; 1868 cf::cede_to_tick;
1904 1869
1905 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1906 or return; 1871 or return;
1907 1872
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1914 $self->clear_unique_items; 1879 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1916 } 1881 }
1917 } 1882 }
1918 1883
1919 Coro::cede; 1884 cf::cede_to_tick;
1920 # now do the right thing for maps 1885 # now do the right thing for maps
1921 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 1888 unless $self->difficulty;
1924 Coro::cede; 1889 cf::cede_to_tick;
1925 1890
1926 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 1892 $self->decay_objects;
1928 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1929 $self->update_buttons; 1894 $self->update_buttons;
1930 Coro::cede; 1895 cf::cede_to_tick;
1931 $self->set_darkness_map; 1896 $self->set_darkness_map;
1932 Coro::cede; 1897 cf::cede_to_tick;
1933 $self->activate; 1898 $self->activate;
1934 } 1899 }
1935 1900
1936 $self->{last_save} = $cf::RUNTIME; 1901 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 1902 $self->last_access ($cf::RUNTIME);
… …
1953 1918
1954 $self 1919 $self
1955} 1920}
1956 1921
1957# 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
1958sub load_diag { 1923sub load_neighbours {
1959 my ($map) = @_; 1924 my ($map) = @_;
1960 1925
1961 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1962 1927
1963 for (0 .. 3) { 1928 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1965 or next; 1930 or next;
1966 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1967 or next; 1932 or next;
1968 $neigh->load; 1933 $neigh->load;
1969 1934
1935 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 1938 }
1973 1939
1974 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1976 or next; 1943 or next;
1977 $neigh->load; 1944 $neigh->load;
1978 } 1945 }
1979} 1946}
1980 1947
… …
1985} 1952}
1986 1953
1987sub do_load_sync { 1954sub do_load_sync {
1988 my ($map) = @_; 1955 my ($map) = @_;
1989 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1990 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1991} 1961}
1992 1962
1993our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1995 1965
1996sub find_async { 1966sub find_async {
1997 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1998 1968
1999 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
2000 1970
2001 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
2003 } 1973 }
2004 1974
2005 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
2006 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
2007 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 1980 if (my $map = find $k) {
2010 $map->load; 1981 $map->load if $v;
2011 } 1982 }
2012 1983
2013 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
2014 } 1985 }
2015 } 1986 }
2016 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
2017 }; 1988 };
2018 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
2021} 1992}
2022 1993
2023sub save { 1994sub save {
2024 my ($self) = @_; 1995 my ($self) = @_;
2025 1996
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 1998
2028 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
2029 2000
2030 return unless $self->dirty; 2001 return unless $self->dirty;
2031 2002
… …
2054 my ($self) = @_; 2025 my ($self) = @_;
2055 2026
2056 # save first because save cedes 2027 # save first because save cedes
2057 $self->save; 2028 $self->save;
2058 2029
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2031
2061 return if $self->players; 2032 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2063 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2064 2035
… …
2116my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2117 2088
2118sub nuke { 2089sub nuke {
2119 my ($self) = @_; 2090 my ($self) = @_;
2120 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2121 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2122 2096
2123 $self->unlink_save; 2097 $self->unlink_save;
2124 2098
2125 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2104
2131 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2132 2107
2133 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2134} 2109}
2135 2110
2136=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2349 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2352 2327
2353 $map->load; 2328 $map->load;
2354 $map->load_diag; 2329 $map->load_neighbours;
2355 2330
2356 return unless $self->contr->active; 2331 return unless $self->contr->active;
2357 $self->activate_recursive; 2332 $self->activate_recursive;
2358 2333
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2530the 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
2531the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2532 2507
2533=cut 2508=cut
2534 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
2535sub cf::client::send_msg { 2525sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2527
2538 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2539 2529
2540 $color &= cf::NDI_CLIENT_MASK; # 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};
2541 2534
2542 if (ref $channel) { 2535 if (ref $channel) {
2543 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2547 } 2541 }
2548 2542
2549 $channel = $channel->{id}; 2543 $channel = $channel->{id};
2550 } 2544 }
2551 2545
… …
2592=cut 2586=cut
2593 2587
2594sub cf::client::ext_msg($$@) { 2588sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2589 my ($self, $type, @msg) = @_;
2596 2590
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2591 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2593 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2594 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2614 }
2605} 2615}
2606 2616
2607=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
… …
2669 my ($type, $reply, @payload) = 2679 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2680 "ARRAY" eq ref $msg
2671 ? @$msg 2681 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2683
2684 my @reply;
2685
2674 if (my $cb = $EXTICMD{$type}) { 2686 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2687 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2680 } else { 2693 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 2695 }
2683 2696
2684 cf::override; 2697 cf::override;
… …
2745 2758
2746The following functions and methods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
2747 2760
2748 cf::object 2761 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 2762 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race 2763 insert remove name archname title slaying race decrease_ob_nr
2751 2764
2752 cf::object::player 2765 cf::object::player
2753 player 2766 player
2754 2767
2755 cf::player 2768 cf::player
… …
2760 2773
2761=cut 2774=cut
2762 2775
2763for ( 2776for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2766 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2769) { 2783) {
2770 no strict 'refs'; 2784 no strict 'refs';
… …
2846# the server's init and main functions 2860# the server's init and main functions
2847 2861
2848sub load_facedata($) { 2862sub load_facedata($) {
2849 my ($path) = @_; 2863 my ($path) = @_;
2850 2864
2865 # HACK to clear player env face cache, we need some signal framework
2866 # for this (global event?)
2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2868
2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2870
2851 warn "loading facedata from $path\n"; 2871 warn "loading facedata from $path\n";
2852 2872
2853 my $facedata; 2873 my $facedata;
2854 0 < aio_load $path, $facedata 2874 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 2875 or die "$path: $!";
2856 2876
2857 $facedata = Coro::Storable::thaw $facedata; 2877 $facedata = Coro::Storable::thaw $facedata;
2858 2878
2859 $facedata->{version} == 2 2879 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2881
2882 # patch in the exptable
2883 $facedata->{resource}{"res/exp_table"} = {
2884 type => FT_RSRC,
2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2886 };
2887 cf::cede_to_tick;
2861 2888
2862 { 2889 {
2863 my $faces = $facedata->{faceinfo}; 2890 my $faces = $facedata->{faceinfo};
2864 2891
2865 while (my ($face, $info) = each %$faces) { 2892 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2867 cf::face::set_visibility $idx, $info->{visibility}; 2894 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 2895 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 2898
2872 cf::cede_to_tick; 2899 cf::cede_to_tick;
2873 } 2900 }
2874 2901
2875 while (my ($face, $info) = each %$faces) { 2902 while (my ($face, $info) = each %$faces) {
… …
2900 2927
2901 { 2928 {
2902 # TODO: for gcfclient pleasure, we should give resources 2929 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 2930 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 2931 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906 2932
2907 my $soundconf = delete $res->{"res/sound.conf"}; 2933 my $soundconf = delete $res->{"res/sound.conf"};
2908 2934
2909 while (my ($name, $info) = each %$res) { 2935 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2916 2938
2917 if ($info->{type} & 1) { 2939 if ($info->{type} & 1) {
2918 # prepend meta info 2940 # prepend meta info
2919 2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 2947 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else { 2948 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2949 $data = $info->{data};
2926 } 2950 }
2927 2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2928 cf::face::set_type $idx, $info->{type}; 2953 cf::face::set_type $idx, $info->{type};
2929 2954
2930 cf::cede_to_tick; 2955 cf::cede_to_tick;
2931 } 2956 }
2932 2957
… …
2959 $ns->fx_want ($k, $v); 2984 $ns->fx_want ($k, $v);
2960 } 2985 }
2961}; 2986};
2962 2987
2963sub reload_regions { 2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2964 load_resource_file "$MAPDIR/regions" 2993 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 2994 or die "unable to load regions file\n";
2966 2995
2967 for (cf::region::list) { 2996 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 2997 $_->{match} = qr/$_->{match}/
… …
3004 3033
3005sub init { 3034sub init {
3006 reload_resources; 3035 reload_resources;
3007} 3036}
3008 3037
3009sub cfg_load { 3038sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3040 or return;
3012 3041
3013 local $/; 3042 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
… …
3034 (async { 3063 (async {
3035 Event::one_event; 3064 Event::one_event;
3036 })->prio (Coro::PRIO_MAX); 3065 })->prio (Coro::PRIO_MAX);
3037 }; 3066 };
3038 3067
3039 cfg_load; 3068 reload_config;
3040 db_init; 3069 db_init;
3041 load_extensions; 3070 load_extensions;
3042 3071
3043 $TICK_WATCHER->start; 3072 $TICK_WATCHER->start;
3044 Event::loop; 3073 Event::loop;
… …
3237 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
3238 require cf; 3267 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3269
3241 warn "loading config and database again"; 3270 warn "loading config and database again";
3242 cf::cfg_load; 3271 cf::reload_config;
3243 3272
3244 warn "loading extensions"; 3273 warn "loading extensions";
3245 cf::load_extensions; 3274 cf::load_extensions;
3246 3275
3247 warn "reattaching attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";

Diff Legend

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