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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.349 by root, Fri Aug 31 04:10:43 2007 UTC

… …
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util (); 24use Coro::Util ();
25 25
26use JSON::XS 1.4 (); 26use JSON::XS ();
27use BDB (); 27use BDB ();
28use Data::Dumper; 28use Data::Dumper;
29use Digest::MD5; 29use Digest::MD5;
30use Fcntl; 30use Fcntl;
31use YAML::Syck (); 31use YAML::Syck ();
… …
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock 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
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1149 my ($type, $reply, @payload) = 1152 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1153 "ARRAY" eq ref $msg
1151 ? @$msg 1154 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1156
1157 my @reply;
1158
1154 if (my $cb = $EXTCMD{$type}) { 1159 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1160 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1160 } else { 1166 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1168 }
1163 1169
1164 cf::override; 1170 cf::override;
… …
1319 1325
1320 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1322 1328
1323 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1324 Coro::cede; 1330 cf::cede_to_tick;
1325} 1331}
1326 1332
1327sub new($) { 1333sub new($) {
1328 my ($login) = @_; 1334 my ($login) = @_;
1329 1335
… …
1505=cut 1511=cut
1506 1512
1507sub ext_reply($$@) { 1513sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1514 my ($self, $id, @msg) = @_;
1509 1515
1510 if ($self->ns->extcmd == 2) { 1516 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1517}
1518 1518
1519=item $player->ext_msg ($type, @msg) 1519=item $player->ext_msg ($type, @msg)
1520 1520
1521Sends an ext event to the client. 1521Sends an ext event to the client.
… …
1852 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1853 1853
1854 my $path = $self->{path}; 1854 my $path = $self->{path};
1855 1855
1856 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1857 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1858 1859
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1860 1861
1861 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1862 1863
1863 $self->alloc; 1864 $self->alloc;
1864 1865
1865 $self->pre_load; 1866 $self->pre_load;
1866 Coro::cede; 1867 cf::cede_to_tick;
1867 1868
1868 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1869 or return; 1870 or return;
1870 1871
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1877 $self->clear_unique_items; 1878 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1879 } 1880 }
1880 } 1881 }
1881 1882
1882 Coro::cede; 1883 cf::cede_to_tick;
1883 # now do the right thing for maps 1884 # now do the right thing for maps
1884 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 1887 unless $self->difficulty;
1887 Coro::cede; 1888 cf::cede_to_tick;
1888 1889
1889 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 1891 $self->decay_objects;
1891 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1892 $self->update_buttons; 1893 $self->update_buttons;
1893 Coro::cede; 1894 cf::cede_to_tick;
1894 $self->set_darkness_map; 1895 $self->set_darkness_map;
1895 Coro::cede; 1896 cf::cede_to_tick;
1896 $self->activate; 1897 $self->activate;
1897 } 1898 }
1898 1899
1899 $self->{last_save} = $cf::RUNTIME; 1900 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 1901 $self->last_access ($cf::RUNTIME);
… …
1916 1917
1917 $self 1918 $self
1918} 1919}
1919 1920
1920# 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
1921sub load_diag { 1922sub load_neighbours {
1922 my ($map) = @_; 1923 my ($map) = @_;
1923 1924
1924 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1925 1926
1926 for (0 .. 3) { 1927 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1928 or next; 1929 or next;
1929 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1930 or next; 1931 or next;
1931 $neigh->load; 1932 $neigh->load;
1932 1933
1934 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 1937 }
1936 1938
1937 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1939 or next; 1942 or next;
1940 $neigh->load; 1943 $neigh->load;
1941 } 1944 }
1942} 1945}
1943 1946
… …
1948} 1951}
1949 1952
1950sub do_load_sync { 1953sub do_load_sync {
1951 my ($map) = @_; 1954 my ($map) = @_;
1952 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1953 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1954} 1960}
1955 1961
1956our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1958 1964
1959sub find_async { 1965sub find_async {
1960 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1961 1967
1962 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1963 1969
1964 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1966 } 1972 }
1967 1973
1968 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1969 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 1979 if (my $map = find $k) {
1973 $map->load; 1980 $map->load if $v;
1974 } 1981 }
1975 1982
1976 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1977 } 1984 }
1978 } 1985 }
1979 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1980 }; 1987 };
1981 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1984} 1991}
1985 1992
1986sub save { 1993sub save {
1987 my ($self) = @_; 1994 my ($self) = @_;
1988 1995
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 1997
1991 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
1992 1999
1993 return unless $self->dirty; 2000 return unless $self->dirty;
1994 2001
… …
2017 my ($self) = @_; 2024 my ($self) = @_;
2018 2025
2019 # save first because save cedes 2026 # save first because save cedes
2020 $self->save; 2027 $self->save;
2021 2028
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2030
2024 return if $self->players; 2031 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2026 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2027 2034
… …
2079my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2080 2087
2081sub nuke { 2088sub nuke {
2082 my ($self) = @_; 2089 my ($self) = @_;
2083 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2084 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2085 2095
2086 $self->unlink_save;
2087
2088 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2101
2102 $self->unlink_save;
2103
2094 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2095 2106
2096 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2097} 2108}
2098 2109
2099=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2312 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2315 2326
2316 $map->load; 2327 $map->load;
2317 $map->load_diag; 2328 $map->load_neighbours;
2318 2329
2319 return unless $self->contr->active; 2330 return unless $self->contr->active;
2320 $self->activate_recursive; 2331 $self->activate_recursive;
2321 2332
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2555=cut 2566=cut
2556 2567
2557sub cf::client::ext_msg($$@) { 2568sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2569 my ($self, $type, @msg) = @_;
2559 2570
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2571 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2573 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2574 push @msg, msgtype => "event_$type";
2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2594 }
2568} 2595}
2569 2596
2570=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
… …
2632 my ($type, $reply, @payload) = 2659 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2660 "ARRAY" eq ref $msg
2634 ? @$msg 2661 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2663
2664 my @reply;
2665
2637 if (my $cb = $EXTICMD{$type}) { 2666 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2667 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2643 } else { 2673 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2675 }
2646 2676
2647 cf::override; 2677 cf::override;
… …
2708 2738
2709The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2710 2740
2711 cf::object 2741 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 2742 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race 2743 insert remove name archname title slaying race decrease_ob_nr
2714 2744
2715 cf::object::player 2745 cf::object::player
2716 player 2746 player
2717 2747
2718 cf::player 2748 cf::player
… …
2723 2753
2724=cut 2754=cut
2725 2755
2726for ( 2756for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)], 2758 insert remove inv name archname title slaying race
2759 decrease_ob_nr)],
2729 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2732) { 2763) {
2733 no strict 'refs'; 2764 no strict 'refs';
… …
2809# the server's init and main functions 2840# the server's init and main functions
2810 2841
2811sub load_facedata($) { 2842sub load_facedata($) {
2812 my ($path) = @_; 2843 my ($path) = @_;
2813 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2850
2814 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2815 2852
2816 my $facedata; 2853 my $facedata;
2817 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2855 or die "$path: $!";
2819 2856
2820 $facedata = Coro::Storable::thaw $facedata; 2857 $facedata = Coro::Storable::thaw $facedata;
2821 2858
2822 $facedata->{version} == 2 2859 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861
2862 # patch in the exptable
2863 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2866 };
2867 cf::cede_to_tick;
2824 2868
2825 { 2869 {
2826 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
2827 2871
2828 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2875 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2878
2835 cf::cede_to_tick; 2879 cf::cede_to_tick;
2836 } 2880 }
2837 2881
2838 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
… …
2863 2907
2864 { 2908 {
2865 # TODO: for gcfclient pleasure, we should give resources 2909 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2910 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2911 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2912
2870 my $soundconf = delete $res->{"res/sound.conf"}; 2913 my $soundconf = delete $res->{"res/sound.conf"};
2871 2914
2872 while (my ($name, $info) = each %$res) { 2915 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2879 2918
2880 if ($info->{type} & 1) { 2919 if ($info->{type} & 1) {
2881 # prepend meta info 2920 # prepend meta info
2882 2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2927 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else { 2928 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2929 $data = $info->{data};
2889 } 2930 }
2890 2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2891 cf::face::set_type $idx, $info->{type}; 2933 cf::face::set_type $idx, $info->{type};
2892 2934
2893 cf::cede_to_tick; 2935 cf::cede_to_tick;
2894 } 2936 }
2895 2937
… …
2922 $ns->fx_want ($k, $v); 2964 $ns->fx_want ($k, $v);
2923 } 2965 }
2924}; 2966};
2925 2967
2926sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2927 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2929 2975
2930 for (cf::region::list) { 2976 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2967 3013
2968sub init { 3014sub init {
2969 reload_resources; 3015 reload_resources;
2970} 3016}
2971 3017
2972sub cfg_load { 3018sub reload_config {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3020 or return;
2975 3021
2976 local $/; 3022 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
2997 (async { 3043 (async {
2998 Event::one_event; 3044 Event::one_event;
2999 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
3000 }; 3046 };
3001 3047
3002 cfg_load; 3048 reload_config;
3003 db_init; 3049 db_init;
3004 load_extensions; 3050 load_extensions;
3005 3051
3006 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
3007 Event::loop; 3053 Event::loop;
… …
3200 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3201 require cf; 3247 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3249
3204 warn "loading config and database again"; 3250 warn "loading config and database again";
3205 cf::cfg_load; 3251 cf::reload_config;
3206 3252
3207 warn "loading extensions"; 3253 warn "loading extensions";
3208 cf::load_extensions; 3254 cf::load_extensions;
3209 3255
3210 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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