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.478 by root, Thu Sep 17 01:57:31 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
… …
105our %RESOURCE; 108our %RESOURCE;
106 109
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 112our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
111 114
112our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 118our $DB_ENV;
116 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
117our %CFG; 122our %CFG;
118 123
119our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 125our $RUNTIME;
121our $NOW; 126our $NOW;
… …
132our $JITTER; # average jitter 137our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
134 139
135our @POST_INIT; 140our @POST_INIT;
136 141
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
138 144
139binmode STDOUT; 145binmode STDOUT;
140binmode STDERR; 146binmode STDERR;
141 147
142# read virtual server time, if available 148# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 150 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
147} 153}
148 154
155eval "sub TICK() { $TICK } 1" or die;
156
149mkdir $_ 157mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 159
152our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
153 161
… …
214 222
215=back 223=back
216 224
217=cut 225=cut
218 226
219BEGIN { 227$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 228 my $msg = join "", @_;
222 229
223 $msg .= "\n" 230 $msg .= "\n"
224 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
225 232
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 234
228 LOG llevError, $msg; 235 LOG llevError, $msg;
229 }; 236};
230}
231 237
232$Coro::State::DIEHOOK = sub { 238$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
234 242
235 if ($Coro::current == $Coro::main) {#d# 243 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 245 return;#d#
238 }#d# 246 }#d#
239 247
240 # kill coroutine otherwise 248 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 249 Coro::terminate
243}; 250};
244
245$SIG{__DIE__} = sub { }; #d#?
246 251
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
1147 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1148 1153
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1155 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1157 if ($cf::USE_FSYNC) {
1158 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;
1159 aio_fsync $fh;
1160 }
1153 aio_close $fh; 1161 aio_close $fh;
1154 1162
1155 if (@$objs) { 1163 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1164 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1165 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1168 if ($cf::USE_FSYNC) {
1169 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;
1170 aio_fsync $fh;
1171 }
1161 aio_close $fh; 1172 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1174 }
1164 } else { 1175 } else {
1165 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
… …
1168 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1169 1180
1170 $filename =~ s%/[^/]+$%%; 1181 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1182 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1183 } else {
1173 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1174 } 1185 }
1175 } else { 1186 } else {
1176 aio_unlink $filename; 1187 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1178 } 1189 }
… …
1316 1327
1317# "readahead" all extensions 1328# "readahead" all extensions
1318sub cache_extensions { 1329sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1330 my $grp = IO::AIO::aio_group;
1320 1331
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1332 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1333 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1334 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1335 }
1325 }; 1336 };
1326 1337
… …
1862 1873
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1865} 1876}
1866 1877
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 { 1878sub decay_objects {
1877 my ($self) = @_; 1879 my ($self) = @_;
1878 1880
1879 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1880 1882
… …
2043 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2046 $self->decay_objects;
2045 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2046 $self->update_buttons; 2048 $self->update_buttons;
2047 cf::cede_to_tick; 2049 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2050 $self->activate;
2051 } 2051 }
2052 2052
2053 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
… …
2220 2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2222
2223 return if $self->players; 2223 return if $self->players;
2224 2224
2225 warn "resetting map ", $self->path; 2225 warn "resetting map ", $self->path, "\n";
2226 2226
2227 $self->in_memory (cf::MAP_SWAPPED); 2227 $self->in_memory (cf::MAP_SWAPPED);
2228 2228
2229 # need to save uniques path 2229 # need to save uniques path
2230 unless ($self->{deny_save}) { 2230 unless ($self->{deny_save}) {
… …
2395 2395
2396our $SAY_CHANNEL = { 2396our $SAY_CHANNEL = {
2397 id => "say", 2397 id => "say",
2398 title => "Map", 2398 title => "Map",
2399 reply => "say ", 2399 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2400 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2401};
2402 2402
2403our $CHAT_CHANNEL = { 2403our $CHAT_CHANNEL = {
2404 id => "chat", 2404 id => "chat",
2405 title => "Chat", 2405 title => "Chat",
… …
2531 2531
2532 $map->load; 2532 $map->load;
2533 $map->load_neighbours; 2533 $map->load_neighbours;
2534 2534
2535 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2536
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2538 $self->enter_map ($map, $x, $y);
2539
2540 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive;
2541} 2542}
2542 2543
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2544 2545
2545Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
… …
2780 id => "infobox", 2781 id => "infobox",
2781 title => "Body Parts", 2782 title => "Body Parts",
2782 reply => undef, 2783 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2784 }, 2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2785 "c/skills" => { 2792 "c/skills" => {
2786 id => "infobox", 2793 id => "infobox",
2787 title => "Skills", 2794 title => "Skills",
2788 reply => undef, 2795 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 2796 tooltip => "Shows your experience per skill and item power",
2797 },
2798 "c/shopitems" => {
2799 id => "infobox",
2800 title => "Shop Items",
2801 reply => undef,
2802 tooltip => "Shows the items currently for sale in this shop",
2803 },
2804 "c/resistances" => {
2805 id => "infobox",
2806 title => "Resistances",
2807 reply => undef,
2808 tooltip => "Shows your resistances",
2809 },
2810 "c/pets" => {
2811 id => "infobox",
2812 title => "Pets",
2813 reply => undef,
2814 tooltip => "Shows information abotu your pets/a specific pet",
2815 },
2816 "c/perceiveself" => {
2817 id => "infobox",
2818 title => "Perceive Self",
2819 reply => undef,
2820 tooltip => "You gained detailed knowledge about yourself",
2790 }, 2821 },
2791 "c/uptime" => { 2822 "c/uptime" => {
2792 id => "infobox", 2823 id => "infobox",
2793 title => "Uptime", 2824 title => "Uptime",
2794 reply => undef, 2825 reply => undef,
… …
2804 id => "party", 2835 id => "party",
2805 title => "Party", 2836 title => "Party",
2806 reply => "gsay ", 2837 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 2838 tooltip => "Messages and chat related to your party",
2808 }, 2839 },
2840 "c/death" => {
2841 id => "death",
2842 title => "Death",
2843 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death",
2845 },
2846 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL,
2809); 2848);
2810 2849
2811sub cf::client::send_msg { 2850sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2813 2852
… …
2818 2857
2819 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2822 2861
2823 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2827 2864
2828 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 2870 }
2835 2871
2836 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2837 } 2873 }
2838 2874
2839 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2840 2876
2841 if ($self->can_msg) {
2842 # default colour, mask it out 2877 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2845 2880
2846 my $pkt = "msg " 2881 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 2882 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 2884 );
2850 2885
2851 # try lzf for large packets 2886 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt 2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf}; 2888 if 1024 <= length $pkt and $self->{can_lzf};
2854 2889
2855 # split very large packets 2890 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) { 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag"; 2893 $pkt = "frag";
2859 } 2894 }
2860 2895
2861 $self->send_packet ($pkt); 2896 $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} 2897}
2888 2898
2889=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2890 2900
2891Sends an ext event to the client. 2901Sends an ext event to the client.
… …
3066The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3067 3077
3068 cf::object 3078 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3079 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3080 insert remove name archname title slaying race decrease split
3081 value
3071 3082
3072 cf::object::player 3083 cf::object::player
3073 player 3084 player
3074 3085
3075 cf::player 3086 cf::player
… …
3081=cut 3092=cut
3082 3093
3083for ( 3094for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["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 3096 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3090) { 3101) {
3091 no strict 'refs'; 3102 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3110 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3111 3122
3112 my $qcode = $code; 3123 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3115 3128
3116 local $_; 3129 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3118 3131
3119 my $eval = 3132 my $eval =
… …
3389 3402
3390 seek $fh, 0, 0; 3403 seek $fh, 0, 0;
3391 print $fh $$; 3404 print $fh $$;
3392} 3405}
3393 3406
3407sub main_loop {
3408 warn "EV::loop starting\n";
3409 if (1) {
3410 EV::loop;
3411 }
3412 warn "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP;
3414}
3415
3394sub main { 3416sub main {
3395 cf::init_globals; # initialise logging 3417 cf::init_globals; # initialise logging
3396 3418
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3401 3423
3402 cf::init_experience; 3424 cf::init_experience;
3403 cf::init_anim; 3425 cf::init_anim;
3404 cf::init_attackmess; 3426 cf::init_attackmess;
3405 cf::init_dynamic; 3427 cf::init_dynamic;
3406 cf::init_block;
3407 3428
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3430
3410 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
… …
3437 load_extensions; 3458 load_extensions;
3438 3459
3439 utime time, time, $RUNTIMEFILE; 3460 utime time, time, $RUNTIMEFILE;
3440 3461
3441 # no (long-running) fork's whatsoever before this point(!) 3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3465
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3466 (pop @POST_INIT)->(0) while @POST_INIT;
3445 }; 3467 };
3446 3468
3447 EV::loop; 3469 main_loop;
3448} 3470}
3449 3471
3450############################################################################# 3472#############################################################################
3451# initialisation and cleanup 3473# initialisation and cleanup
3452 3474
… …
3708 clear_package "safe::$_" 3730 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3732
3711 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3736
3715 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3738 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3718 3740
… …
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3936 } 3958 }
3937} 3959}
3938 3960
3939# load additional modules 3961# load additional modules
3940use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3941 3963
3942END { cf::emergency_save } 3964END { cf::emergency_save }
3943 3965
39441 39661
3945 3967

Diff Legend

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