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

Diff Legend

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