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.458 by root, Sat Dec 13 20:34:37 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 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;
… …
41use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent; 42use Coro::AnyEvent;
43use Coro::Timer; 43use Coro::Timer;
44use Coro::Signal; 44use Coro::Signal;
45use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
46use Coro::AnyEvent; 47use Coro::AnyEvent;
47use Coro::AIO; 48use Coro::AIO;
48use Coro::BDB 1.6; 49use Coro::BDB 1.6;
49use Coro::Storable; 50use Coro::Storable;
50use Coro::Util (); 51use Coro::Util ();
… …
71 72
72# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
74Compress::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
75 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79
76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
77 81
78our %COMMAND = (); 82our %COMMAND = ();
79our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
80 84
… …
84our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
85our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
86 90
87our $RELOAD; # number of reloads so far, non-zero while in reload 91our $RELOAD; # number of reloads so far, non-zero while in reload
88our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
89 95
90our $CONFDIR = confdir; 96our $CONFDIR = confdir;
91our $DATADIR = datadir; 97our $DATADIR = datadir;
92our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
93our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
… …
104our %RESOURCE; 110our %RESOURCE;
105 111
106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
108our $NEXT_TICK; 114our $NEXT_TICK;
109our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
110 116
111our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
113our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
114our $DB_ENV; 120our $DB_ENV;
115 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
116our %CFG; 124our %CFG;
117 125
118our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 127our $RUNTIME;
120our $NOW; 128our $NOW;
… …
131our $JITTER; # average jitter 139our $JITTER; # average jitter
132our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
133 141
134our @POST_INIT; 142our @POST_INIT;
135 143
136our $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 :)
137 146
138binmode STDOUT; 147binmode STDOUT;
139binmode STDERR; 148binmode STDERR;
140 149
141# read virtual server time, if available 150# read virtual server time, if available
… …
143 open my $fh, "<", $RUNTIMEFILE 152 open my $fh, "<", $RUNTIMEFILE
144 or die "unable to read $RUNTIMEFILE file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
145 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
146} 155}
147 156
157eval "sub TICK() { $TICK } 1" or die;
158
148mkdir $_ 159mkdir $_
149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
150 161
151our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
152 163
153sub 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} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
154 176
155############################################################################# 177#############################################################################
156 178
157=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
158 180
… …
209 231
210This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
211C<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
212that call. 234that call.
213 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
214=back 242=back
215 243
216=cut 244=cut
217 245
218BEGIN { 246$Coro::State::WARNHOOK = sub {
219 *CORE::GLOBAL::warn = sub {
220 my $msg = join "", @_; 247 my $msg = join "", @_;
221 248
222 $msg .= "\n" 249 $msg .= "\n"
223 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
224 251
225 $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;
226 253
227 LOG llevError, $msg; 254 LOG llevError, $msg;
228 }; 255};
229}
230 256
231$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
232 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
233 261
234 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
235 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
236 return;#d# 264 return;#d#
237 }#d# 265 }#d#
238 266
239 # kill coroutine otherwise 267 # kill coroutine otherwise
240 warn Carp::longmess $_[0];
241 Coro::terminate 268 Coro::terminate
242}; 269};
243
244$SIG{__DIE__} = sub { }; #d#?
245 270
246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
347 372
348Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
349 374
350=cut 375=cut
351 376
352our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 378
355sub lock_wait($) { 379sub lock_wait($) {
356 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
363 # wait for lock, if any
364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
366 push @{ $LOCK{$key} }, $Coro::current;
367 Coro::schedule;
368 }
369} 381}
370 382
371sub lock_acquire($) { 383sub lock_acquire($) {
372 my ($key) = @_; 384 $LOCKS->guard ($_[0])
373
374 # wait, to be sure we are not locked
375 lock_wait $key;
376
377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
379
380 Guard::guard {
381 delete $LOCKER{$key};#d#
382 # wake up all waiters, to be on the safe side
383 $_->ready for @{ delete $LOCK{$key} };
384 }
385} 385}
386 386
387sub lock_active($) { 387sub lock_active($) {
388 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 389}
392 390
393sub freeze_mainloop { 391sub freeze_mainloop {
394 tick_inhibit_inc; 392 tick_inhibit_inc;
395 393
… …
1173 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1174 1172
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 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 }
1179 aio_close $fh; 1180 aio_close $fh;
1180 1181
1181 if (@$objs) { 1182 if (@$objs) {
1182 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) {
1183 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1186 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 }
1187 aio_close $fh; 1191 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1193 }
1190 } else { 1194 } else {
1191 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
… …
1194 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1195 1199
1196 $filename =~ s%/[^/]+$%%; 1200 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1201 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1202 } else {
1199 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1200 } 1204 }
1201 } else { 1205 } else {
1202 aio_unlink $filename; 1206 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1204 } 1208 }
… …
1342 1346
1343# "readahead" all extensions 1347# "readahead" all extensions
1344sub cache_extensions { 1348sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1349 my $grp = IO::AIO::aio_group;
1346 1350
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1352 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1354 }
1351 }; 1355 };
1352 1356
… …
1888 1892
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1891} 1895}
1892 1896
1893# and all this just because we cannot iterate over
1894# all maps in C++...
1895sub change_all_map_light {
1896 my ($change) = @_;
1897
1898 $_->change_map_light ($change)
1899 for grep $_->outdoor, values %cf::MAP;
1900}
1901
1902sub decay_objects { 1897sub decay_objects {
1903 my ($self) = @_; 1898 my ($self) = @_;
1904 1899
1905 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1906 1901
… …
1988sub find { 1983sub find {
1989 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
1990 1985
1991 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
1992 1987
1993 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
1995 1990
1996 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
2000 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
2001 or return; 1993 or return;
2002 1994
2003 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
2004 1996
… …
2072 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2065 $self->decay_objects;
2074 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2075 $self->update_buttons; 2067 $self->update_buttons;
2076 cf::cede_to_tick; 2068 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick;
2079 $self->activate; 2069 $self->activate;
2080 } 2070 }
2081 2071
2082 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2249 2239
2250 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2251 2241
2252 return if $self->players; 2242 return if $self->players;
2253 2243
2254 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2255 2245
2256 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2257 2247
2258 # need to save uniques path 2248 # need to save uniques path
2259 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2424 2414
2425our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2426 id => "say", 2416 id => "say",
2427 title => "Map", 2417 title => "Map",
2428 reply => "say ", 2418 reply => "say ",
2429 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.",
2430}; 2420};
2431 2421
2432our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2433 id => "chat", 2423 id => "chat",
2434 title => "Chat", 2424 title => "Chat",
… …
2560 2550
2561 $map->load; 2551 $map->load;
2562 $map->load_neighbours; 2552 $map->load_neighbours;
2563 2553
2564 return unless $self->contr->active; 2554 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2566 $self->activate_recursive;
2567 2555
2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2569 $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;
2570} 2561}
2571 2562
2572=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2573 2564
2574Moves 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
… …
2809 id => "infobox", 2800 id => "infobox",
2810 title => "Body Parts", 2801 title => "Body Parts",
2811 reply => undef, 2802 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2813 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2814 "c/skills" => { 2811 "c/skills" => {
2815 id => "infobox", 2812 id => "infobox",
2816 title => "Skills", 2813 title => "Skills",
2817 reply => undef, 2814 reply => undef,
2818 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",
2819 }, 2840 },
2820 "c/uptime" => { 2841 "c/uptime" => {
2821 id => "infobox", 2842 id => "infobox",
2822 title => "Uptime", 2843 title => "Uptime",
2823 reply => undef, 2844 reply => undef,
… …
2833 id => "party", 2854 id => "party",
2834 title => "Party", 2855 title => "Party",
2835 reply => "gsay ", 2856 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2837 }, 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,
2838); 2867);
2839 2868
2840sub cf::client::send_msg { 2869sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2871
… …
2847 2876
2848 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2851 2880
2852 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2856 2883
2857 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 2889 }
2864 2890
2865 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2866 } 2892 }
2867 2893
2868 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2869 2895
2870 if ($self->can_msg) {
2871 # default colour, mask it out 2896 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2874 2899
2875 my $pkt = "msg " 2900 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 2901 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 2903 );
2879 2904
2880 # try lzf for large packets 2905 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt 2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf}; 2907 if 1024 <= length $pkt and $self->{can_lzf};
2883 2908
2884 # split very large packets 2909 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) { 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag"; 2912 $pkt = "frag";
2888 } 2913 }
2889 2914
2890 $self->send_packet ($pkt); 2915 $self->send_packet ($pkt);
2891 } else {
2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2910 } else {
2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2912 $self->send_packet ("drawinfo $color $msg")
2913 }
2914 }
2915 }
2916} 2916}
2917 2917
2918=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2919 2919
2920Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3095The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3096 3096
3097 cf::object 3097 cf::object
3098 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
3099 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3100 3101
3101 cf::object::player 3102 cf::object::player
3102 player 3103 player
3103 3104
3104 cf::player 3105 cf::player
… …
3110=cut 3111=cut
3111 3112
3112for ( 3113for (
3113 ["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
3114 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3119) { 3120) {
3120 no strict 'refs'; 3121 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3139 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3140 3141
3141 my $qcode = $code; 3142 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3144 3147
3145 local $_; 3148 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3147 3150
3148 my $eval = 3151 my $eval =
… …
3418 3421
3419 seek $fh, 0, 0; 3422 seek $fh, 0, 0;
3420 print $fh $$; 3423 print $fh $$;
3421} 3424}
3422 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
3423sub main { 3435sub main {
3424 cf::init_globals; # initialise logging 3436 cf::init_globals; # initialise logging
3425 3437
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 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.";
… …
3430 3442
3431 cf::init_experience; 3443 cf::init_experience;
3432 cf::init_anim; 3444 cf::init_anim;
3433 cf::init_attackmess; 3445 cf::init_attackmess;
3434 cf::init_dynamic; 3446 cf::init_dynamic;
3435 cf::init_block;
3436 3447
3437 $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
3438 3449
3439 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
… …
3466 load_extensions; 3477 load_extensions;
3467 3478
3468 utime time, time, $RUNTIMEFILE; 3479 utime time, time, $RUNTIMEFILE;
3469 3480
3470 # no (long-running) fork's whatsoever before this point(!) 3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3471 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};
3472 3484
3473 (pop @POST_INIT)->(0) while @POST_INIT; 3485 (pop @POST_INIT)->(0) while @POST_INIT;
3474 }; 3486 };
3475 3487
3476 EV::loop; 3488 main_loop;
3477} 3489}
3478 3490
3479############################################################################# 3491#############################################################################
3480# initialisation and cleanup 3492# initialisation and cleanup
3481 3493
… …
3737 clear_package "safe::$_" 3749 clear_package "safe::$_"
3738 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);
3739 3751
3740 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3755
3744 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3757 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3747 3759
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 3977 }
3966} 3978}
3967 3979
3968# load additional modules 3980# load additional modules
3969use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3970 3982
3971END { cf::emergency_save } 3983END { cf::emergency_save }
3972 3984
39731 39851
3974 3986

Diff Legend

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