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.462 by root, Tue Dec 23 06:58:23 2008 UTC vs.
Revision 1.485 by root, Mon Oct 12 14:12:54 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
… …
53use JSON::XS 2.01 (); 54use JSON::XS 2.01 ();
54use BDB (); 55use BDB ();
55use Data::Dumper; 56use Data::Dumper;
56use Digest::MD5; 57use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 111our %RESOURCE;
106 112
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 115our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
111 117
112our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 121our $DB_ENV;
116 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
117our %CFG; 125our %CFG;
118 126
119our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 128our $RUNTIME;
121our $NOW; 129our $NOW;
… …
132our $JITTER; # average jitter 140our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
134 142
135our @POST_INIT; 143our @POST_INIT;
136 144
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
138 147
139binmode STDOUT; 148binmode STDOUT;
140binmode STDERR; 149binmode STDERR;
141 150
142# read virtual server time, if available 151# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
147} 156}
148 157
158eval "sub TICK() { $TICK } 1" or die;
159
149mkdir $_ 160mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 162
152our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
153 164
154sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 177
156############################################################################# 178#############################################################################
157 179
158=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
159 181
… …
210 232
211This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 235that call.
214 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
215=back 243=back
216 244
217=cut 245=cut
218 246
219BEGIN { 247$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 248 my $msg = join "", @_;
222 249
223 $msg .= "\n" 250 $msg .= "\n"
224 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
225 252
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 254
228 LOG llevError, $msg; 255 LOG llevError, $msg;
229 }; 256};
230}
231 257
232$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
234 262
235 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 265 return;#d#
238 }#d# 266 }#d#
239 267
240 # kill coroutine otherwise 268 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 269 Coro::terminate
243}; 270};
244
245$SIG{__DIE__} = sub { }; #d#?
246 271
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
1147 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1148 1173
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1175 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1179 aio_fsync $fh;
1180 }
1153 aio_close $fh; 1181 aio_close $fh;
1154 1182
1155 if (@$objs) { 1183 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1190 aio_fsync $fh;
1191 }
1161 aio_close $fh; 1192 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1194 }
1164 } else { 1195 } else {
1165 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
… …
1316 1347
1317# "readahead" all extensions 1348# "readahead" all extensions
1318sub cache_extensions { 1349sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1350 my $grp = IO::AIO::aio_group;
1320 1351
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1353 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1355 }
1325 }; 1356 };
1326 1357
… …
2209 2240
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2242
2212 return if $self->players; 2243 return if $self->players;
2213 2244
2214 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2215 2246
2216 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2217 2248
2218 # need to save uniques path 2249 # need to save uniques path
2219 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2384 2415
2385our $SAY_CHANNEL = { 2416our $SAY_CHANNEL = {
2386 id => "say", 2417 id => "say",
2387 title => "Map", 2418 title => "Map",
2388 reply => "say ", 2419 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2421};
2391 2422
2392our $CHAT_CHANNEL = { 2423our $CHAT_CHANNEL = {
2393 id => "chat", 2424 id => "chat",
2394 title => "Chat", 2425 title => "Chat",
… …
2520 2551
2521 $map->load; 2552 $map->load;
2522 $map->load_neighbours; 2553 $map->load_neighbours;
2523 2554
2524 return unless $self->contr->active; 2555 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2556
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2530} 2562}
2531 2563
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2565
2534Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
… …
2769 id => "infobox", 2801 id => "infobox",
2770 title => "Body Parts", 2802 title => "Body Parts",
2771 reply => undef, 2803 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2804 tooltip => "Shows which body parts you posess and are available",
2773 }, 2805 },
2806 "c/statistics" => {
2807 id => "infobox",
2808 title => "Statistics",
2809 reply => undef,
2810 tooltip => "Shows your primary statistics",
2811 },
2774 "c/skills" => { 2812 "c/skills" => {
2775 id => "infobox", 2813 id => "infobox",
2776 title => "Skills", 2814 title => "Skills",
2777 reply => undef, 2815 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2816 tooltip => "Shows your experience per skill and item power",
2817 },
2818 "c/shopitems" => {
2819 id => "infobox",
2820 title => "Shop Items",
2821 reply => undef,
2822 tooltip => "Shows the items currently for sale in this shop",
2823 },
2824 "c/resistances" => {
2825 id => "infobox",
2826 title => "Resistances",
2827 reply => undef,
2828 tooltip => "Shows your resistances",
2829 },
2830 "c/pets" => {
2831 id => "infobox",
2832 title => "Pets",
2833 reply => undef,
2834 tooltip => "Shows information abotu your pets/a specific pet",
2835 },
2836 "c/perceiveself" => {
2837 id => "infobox",
2838 title => "Perceive Self",
2839 reply => undef,
2840 tooltip => "You gained detailed knowledge about yourself",
2779 }, 2841 },
2780 "c/uptime" => { 2842 "c/uptime" => {
2781 id => "infobox", 2843 id => "infobox",
2782 title => "Uptime", 2844 title => "Uptime",
2783 reply => undef, 2845 reply => undef,
… …
2793 id => "party", 2855 id => "party",
2794 title => "Party", 2856 title => "Party",
2795 reply => "gsay ", 2857 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party", 2858 tooltip => "Messages and chat related to your party",
2797 }, 2859 },
2860 "c/death" => {
2861 id => "death",
2862 title => "Death",
2863 reply => undef,
2864 tooltip => "Reason for and more info about your most recent death",
2865 },
2798 "c/say" => $SAY_CHANNEL, 2866 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL, 2867 "c/chat" => $CHAT_CHANNEL,
2800); 2868);
2801 2869
2802sub cf::client::send_msg { 2870sub cf::client::send_msg {
… …
2809 2877
2810 # check predefined channels, for the benefit of C 2878 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2879 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2880 $channel = $CHANNEL{$channel};
2813 2881
2814 $self->ext_msg (channel_info => $channel) 2882 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2883 $channel = $channel->{id};
2818 2884
2819 } elsif (ref $channel) { 2885 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2886 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2887 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2888 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2889 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2890 }
2826 2891
2827 $channel = $channel->{id}; 2892 $channel = $channel->{id};
2828 } 2893 }
2829 2894
2830 return unless @extra || length $msg; 2895 return unless @extra || length $msg;
2831 2896
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2897 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2899 if $color & cf::NDI_DEF;
2836 2900
2837 my $pkt = "msg " 2901 my $pkt = "msg "
2838 . $self->{json_coder}->encode ( 2902 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 ); 2904 );
2841 2905
2842 # try lzf for large packets 2906 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt 2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf}; 2908 if 1024 <= length $pkt and $self->{can_lzf};
2845 2909
2846 # split very large packets 2910 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) { 2911 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag"; 2913 $pkt = "frag";
2850 } 2914 }
2851 2915
2852 $self->send_packet ($pkt); 2916 $self->send_packet ($pkt);
2853 } else {
2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878} 2917}
2879 2918
2880=item $client->ext_msg ($type, @msg) 2919=item $client->ext_msg ($type, @msg)
2881 2920
2882Sends an ext event to the client. 2921Sends an ext event to the client.
… …
3057The following functions and methods are available within a safe environment: 3096The following functions and methods are available within a safe environment:
3058 3097
3059 cf::object 3098 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy 3099 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split 3100 insert remove name archname title slaying race decrease split
3101 value
3062 3102
3063 cf::object::player 3103 cf::object::player
3064 player 3104 player
3065 3105
3066 cf::player 3106 cf::player
… …
3072=cut 3112=cut
3073 3113
3074for ( 3114for (
3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3115 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race 3116 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)], 3117 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3118 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful)], 3119 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3120 ["cf::map" => qw(trigger)],
3081) { 3121) {
3082 no strict 'refs'; 3122 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3123 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3124 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3101 my ($code, %vars) = @_; 3141 my ($code, %vars) = @_;
3102 3142
3103 my $qcode = $code; 3143 my $qcode = $code;
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3145 $qcode =~ s/\n/\\n/g;
3146
3147 %vars = (_dummy => 0) unless %vars;
3106 3148
3107 local $_; 3149 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars; 3150 local @safe::cf::_safe_eval_args = values %vars;
3109 3151
3110 my $eval = 3152 my $eval =
… …
3341 3383
3342 warn "finished reloading resource files\n"; 3384 warn "finished reloading resource files\n";
3343} 3385}
3344 3386
3345sub reload_config { 3387sub reload_config {
3388 warn "reloading config file...\n";
3389
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3390 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3391 or return;
3348 3392
3349 local $/; 3393 local $/;
3350 *CFG = YAML::Load <$fh>; 3394 *CFG = YAML::XS::Load scalar <$fh>;
3351 3395
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3396 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3353 3397
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3398 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3399 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3403 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3404 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3405 };
3362 warn $@ if $@; 3406 warn $@ if $@;
3363 } 3407 }
3408
3409 warn "finished reloading resource files\n";
3364} 3410}
3365 3411
3366sub pidfile() { 3412sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3413 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3414 or die "$PIDFILE: $!";
… …
3378 my $pid = <$fh>; 3424 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0; 3425 kill 9, $pid if $pid > 0;
3380 3426
3381 seek $fh, 0, 0; 3427 seek $fh, 0, 0;
3382 print $fh $$; 3428 print $fh $$;
3429}
3430
3431sub main_loop {
3432 warn "EV::loop starting\n";
3433 if (1) {
3434 EV::loop;
3435 }
3436 warn "EV::loop returned\n";
3437 goto &main_loop unless $REALLY_UNLOOP;
3383} 3438}
3384 3439
3385sub main { 3440sub main {
3386 cf::init_globals; # initialise logging 3441 cf::init_globals; # initialise logging
3387 3442
… …
3427 load_extensions; 3482 load_extensions;
3428 3483
3429 utime time, time, $RUNTIMEFILE; 3484 utime time, time, $RUNTIMEFILE;
3430 3485
3431 # no (long-running) fork's whatsoever before this point(!) 3486 # no (long-running) fork's whatsoever before this point(!)
3487 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3488 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3489
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3490 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3491 };
3436 3492
3437 EV::loop; 3493 main_loop;
3438} 3494}
3439 3495
3440############################################################################# 3496#############################################################################
3441# initialisation and cleanup 3497# initialisation and cleanup
3442 3498
… …
3698 clear_package "safe::$_" 3754 clear_package "safe::$_"
3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3755 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3700 3756
3701 warn "unloading cf.pm \"a bit\""; 3757 warn "unloading cf.pm \"a bit\"";
3702 delete $INC{"cf.pm"}; 3758 delete $INC{"cf.pm"};
3703 delete $INC{"cf/pod.pm"}; 3759 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3704 3760
3705 # don't, removes xs symbols, too, 3761 # don't, removes xs symbols, too,
3706 # and global variables created in xs 3762 # and global variables created in xs
3707 #clear_package __PACKAGE__; 3763 #clear_package __PACKAGE__;
3708 3764
3709 warn "unload completed, starting to reload now"; 3765 warn "unload completed, starting to reload now";
3710 3766
3711 warn "reloading cf.pm"; 3767 warn "reloading cf.pm";
3712 require cf; 3768 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3769 cf::_connect_to_perl_1;
3714 3770
3715 warn "loading config and database again"; 3771 warn "loading config and database again";
3716 cf::reload_config; 3772 cf::reload_config;
3717 3773
3718 warn "loading extensions"; 3774 warn "loading extensions";
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 3981 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 3982 }
3927} 3983}
3928 3984
3929# load additional modules 3985# load additional modules
3930use cf::pod; 3986require "cf/$_.pm" for @EXTRA_MODULES;
3987cf::_connect_to_perl_2;
3931 3988
3932END { cf::emergency_save } 3989END { cf::emergency_save }
3933 3990
39341 39911
3935 3992

Diff Legend

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