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.459 by root, Sat Dec 13 21:46:12 2008 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 2009 UTC

… …
21 21
22package cf; 22package cf;
23 23
24use 5.10.0; 24use 5.10.0;
25use utf8; 25use utf8;
26use strict "vars", "subs"; 26use strict qw(vars subs);
27 27
28use Symbol; 28use Symbol;
29use List::Util; 29use List::Util;
30use Socket; 30use Socket;
31use EV; 31use EV;
… …
72 72
73# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 81
79our %COMMAND = (); 82our %COMMAND = ();
80our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
81 84
… …
85our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
87 90
88our $RELOAD; # number of reloads so far, non-zero while in reload 91our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
90 95
91our $CONFDIR = confdir; 96our $CONFDIR = confdir;
92our $DATADIR = datadir; 97our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
… …
105our %RESOURCE; 110our %RESOURCE;
106 111
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 114our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
111 116
112our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 120our $DB_ENV;
116 121
122our @EXTRA_MODULES = qw(pod match mapscript);
123
117our %CFG; 124our %CFG;
118 125
119our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 127our $RUNTIME;
121our $NOW; 128our $NOW;
… …
132our $JITTER; # average jitter 139our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
134 141
135our @POST_INIT; 142our @POST_INIT;
136 143
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
138 146
139binmode STDOUT; 147binmode STDOUT;
140binmode STDERR; 148binmode STDERR;
141 149
142# read virtual server time, if available 150# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 152 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
147} 155}
148 156
157eval "sub TICK() { $TICK } 1" or die;
158
149mkdir $_ 159mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 161
152our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
153 163
154sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 176
156############################################################################# 177#############################################################################
157 178
158=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
159 180
… …
210 231
211This array contains the results of the last C<invoke ()> call. When 232This 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 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 234that call.
214 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
215=back 242=back
216 243
217=cut 244=cut
218 245
219BEGIN { 246$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 247 my $msg = join "", @_;
222 248
223 $msg .= "\n" 249 $msg .= "\n"
224 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
225 251
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 253
228 LOG llevError, $msg; 254 LOG llevError, $msg;
229 }; 255};
230}
231 256
232$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
234 261
235 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 264 return;#d#
238 }#d# 265 }#d#
239 266
240 # kill coroutine otherwise 267 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 268 Coro::terminate
243}; 269};
244
245$SIG{__DIE__} = sub { }; #d#?
246 270
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
1147 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1148 1172
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1153 aio_close $fh; 1180 aio_close $fh;
1154 1181
1155 if (@$objs) { 1182 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1161 aio_close $fh; 1191 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1193 }
1164 } else { 1194 } else {
1165 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
… …
1168 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1169 1199
1170 $filename =~ s%/[^/]+$%%; 1200 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1201 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1202 } else {
1173 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1174 } 1204 }
1175 } else { 1205 } else {
1176 aio_unlink $filename; 1206 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1178 } 1208 }
… …
1316 1346
1317# "readahead" all extensions 1347# "readahead" all extensions
1318sub cache_extensions { 1348sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1349 my $grp = IO::AIO::aio_group;
1320 1350
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1352 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1354 }
1325 }; 1355 };
1326 1356
… …
1862 1892
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1865} 1895}
1866 1896
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 1897sub decay_objects {
1877 my ($self) = @_; 1898 my ($self) = @_;
1878 1899
1879 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1880 1901
… …
2043 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2065 $self->decay_objects;
2045 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2046 $self->update_buttons; 2067 $self->update_buttons;
2047 cf::cede_to_tick; 2068 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2069 $self->activate;
2051 } 2070 }
2052 2071
2053 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2220 2239
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2241
2223 return if $self->players; 2242 return if $self->players;
2224 2243
2225 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2226 2245
2227 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2228 2247
2229 # need to save uniques path 2248 # need to save uniques path
2230 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2395 2414
2396our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2397 id => "say", 2416 id => "say",
2398 title => "Map", 2417 title => "Map",
2399 reply => "say ", 2418 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2420};
2402 2421
2403our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2404 id => "chat", 2423 id => "chat",
2405 title => "Chat", 2424 title => "Chat",
… …
2531 2550
2532 $map->load; 2551 $map->load;
2533 $map->load_neighbours; 2552 $map->load_neighbours;
2534 2553
2535 return unless $self->contr->active; 2554 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2555
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2541} 2561}
2542 2562
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2544 2564
2545Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
… …
2780 id => "infobox", 2800 id => "infobox",
2781 title => "Body Parts", 2801 title => "Body Parts",
2782 reply => undef, 2802 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2784 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2785 "c/skills" => { 2811 "c/skills" => {
2786 id => "infobox", 2812 id => "infobox",
2787 title => "Skills", 2813 title => "Skills",
2788 reply => undef, 2814 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2790 }, 2840 },
2791 "c/uptime" => { 2841 "c/uptime" => {
2792 id => "infobox", 2842 id => "infobox",
2793 title => "Uptime", 2843 title => "Uptime",
2794 reply => undef, 2844 reply => undef,
… …
2804 id => "party", 2854 id => "party",
2805 title => "Party", 2855 title => "Party",
2806 reply => "gsay ", 2856 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2808 }, 2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2809); 2867);
2810 2868
2811sub cf::client::send_msg { 2869sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2813 2871
… …
2818 2876
2819 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2822 2880
2823 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2827 2883
2828 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 2889 }
2835 2890
2836 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2837 } 2892 }
2838 2893
2839 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2840 2895
2841 if ($self->can_msg) {
2842 # default colour, mask it out 2896 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2845 2899
2846 my $pkt = "msg " 2900 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 2901 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 2903 );
2850 2904
2851 # try lzf for large packets 2905 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt 2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf}; 2907 if 1024 <= length $pkt and $self->{can_lzf};
2854 2908
2855 # split very large packets 2909 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) { 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag"; 2912 $pkt = "frag";
2859 } 2913 }
2860 2914
2861 $self->send_packet ($pkt); 2915 $self->send_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 2916}
2888 2917
2889=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2890 2919
2891Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3066The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3067 3096
3068 cf::object 3097 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3071 3101
3072 cf::object::player 3102 cf::object::player
3073 player 3103 player
3074 3104
3075 cf::player 3105 cf::player
… …
3081=cut 3111=cut
3082 3112
3083for ( 3113for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3090) { 3120) {
3091 no strict 'refs'; 3121 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3110 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3111 3141
3112 my $qcode = $code; 3142 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3115 3147
3116 local $_; 3148 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3118 3150
3119 my $eval = 3151 my $eval =
… …
3389 3421
3390 seek $fh, 0, 0; 3422 seek $fh, 0, 0;
3391 print $fh $$; 3423 print $fh $$;
3392} 3424}
3393 3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3394sub main { 3435sub main {
3395 cf::init_globals; # initialise logging 3436 cf::init_globals; # initialise logging
3396 3437
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3401 3442
3402 cf::init_experience; 3443 cf::init_experience;
3403 cf::init_anim; 3444 cf::init_anim;
3404 cf::init_attackmess; 3445 cf::init_attackmess;
3405 cf::init_dynamic; 3446 cf::init_dynamic;
3406 cf::init_block;
3407 3447
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3449
3410 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
… …
3437 load_extensions; 3477 load_extensions;
3438 3478
3439 utime time, time, $RUNTIMEFILE; 3479 utime time, time, $RUNTIMEFILE;
3440 3480
3441 # no (long-running) fork's whatsoever before this point(!) 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3484
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3485 (pop @POST_INIT)->(0) while @POST_INIT;
3445 }; 3486 };
3446 3487
3447 EV::loop; 3488 main_loop;
3448} 3489}
3449 3490
3450############################################################################# 3491#############################################################################
3451# initialisation and cleanup 3492# initialisation and cleanup
3452 3493
… …
3708 clear_package "safe::$_" 3749 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3751
3711 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3755
3715 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3757 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3718 3759
… …
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3936 } 3977 }
3937} 3978}
3938 3979
3939# load additional modules 3980# load additional modules
3940use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3941 3982
3942END { cf::emergency_save } 3983END { cf::emergency_save }
3943 3984
39441 39851
3945 3986

Diff Legend

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