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.494 by root, Mon Oct 26 05:18:00 2009 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
… …
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5; 58use Digest::MD5;
55use Fcntl; 59use Fcntl;
56use YAML (); 60use YAML::XS ();
57use IO::AIO (); 61use IO::AIO ();
58use Time::HiRes; 62use Time::HiRes;
59use Compress::LZF; 63use Compress::LZF;
60use Digest::MD5 (); 64use Digest::MD5 ();
61 65
… …
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 73$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 74
71# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 77Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 81
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 83
77our %COMMAND = (); 84our %COMMAND = ();
78our %COMMAND_TIME = (); 85our %COMMAND_TIME = ();
… …
83our %EXT_CORO = (); # coroutines bound to extensions 90our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 91our %EXT_MAP = (); # pluggable maps
85 92
86our $RELOAD; # number of reloads so far, non-zero while in reload 93our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 94our @EVENT;
95our @REFLECT; # set by XS
96our %REFLECT; # set by us
88 97
89our $CONFDIR = confdir; 98our $CONFDIR = confdir;
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
… …
103our %RESOURCE; 112our %RESOURCE;
104 113
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 116our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 117our $USE_FSYNC = 1; # use fsync to write maps - default on
109 118
110our $BDB_DEADLOCK_WATCHER; 119our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 120our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 121our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 122our $DB_ENV;
114 123
124our @EXTRA_MODULES = qw(pod match mapscript);
125
115our %CFG; 126our %CFG;
116 127
117our $UPTIME; $UPTIME ||= time; 128our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 129our $RUNTIME;
119our $NOW; 130our $NOW;
… …
130our $JITTER; # average jitter 141our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 142our $TICK_START; # for load detecting purposes
132 143
133our @POST_INIT; 144our @POST_INIT;
134 145
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :)
136 148
137binmode STDOUT; 149binmode STDOUT;
138binmode STDERR; 150binmode STDERR;
139 151
140# read virtual server time, if available 152# read virtual server time, if available
… …
142 open my $fh, "<", $RUNTIMEFILE 154 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 155 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 156 $RUNTIME = <$fh> + 0.;
145} 157}
146 158
159eval "sub TICK() { $TICK } 1" or die;
160
147mkdir $_ 161mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 162 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 163
150our $EMERGENCY_POSITION; 164our $EMERGENCY_POSITION;
151 165
152sub cf::map::normalise; 166sub cf::map::normalise;
167
168#############################################################################
169
170%REFLECT = ();
171for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_;
173 $REFLECT{$reflect->{class}} = $reflect;
174}
175
176# this is decidedly evil
177$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
153 178
154############################################################################# 179#############################################################################
155 180
156=head2 GLOBAL VARIABLES 181=head2 GLOBAL VARIABLES
157 182
… …
204returns directly I<after> the tick processing (and consequently, can only wake one process 229returns directly I<after> the tick processing (and consequently, can only wake one process
205per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 230per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
206 231
207=item @cf::INVOKE_RESULTS 232=item @cf::INVOKE_RESULTS
208 233
209This array contains the results of the last C<invoke ()> call. When 234This 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 235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
211that call. 236that call.
212 237
238=item %cf::REFLECT
239
240Contains, for each (C++) class name, a hash reference with information
241about object members (methods, scalars, arrays and flags) and other
242metadata, which is useful for introspection.
243
213=back 244=back
214 245
215=cut 246=cut
216 247
217BEGIN { 248$Coro::State::WARNHOOK = sub {
218 *CORE::GLOBAL::warn = sub {
219 my $msg = join "", @_; 249 my $msg = join "", @_;
220 250
221 $msg .= "\n" 251 $msg .= "\n"
222 unless $msg =~ /\n$/; 252 unless $msg =~ /\n$/;
223 253
224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
225 255
226 LOG llevError, $msg; 256 LOG llevError, $msg;
227 }; 257};
228}
229 258
230$Coro::State::DIEHOOK = sub { 259$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 260 return unless $^S eq 0; # "eq", not "=="
261
262 warn Carp::longmess $_[0];
232 263
233 if ($Coro::current == $Coro::main) {#d# 264 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 265 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 266 return;#d#
236 }#d# 267 }#d#
237 268
238 # kill coroutine otherwise 269 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 270 Coro::terminate
241}; 271};
242
243$SIG{__DIE__} = sub { }; #d#?
244 272
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 273@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 274@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 275@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 276@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
262)) { 290)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 292}
265 293
266$EV::DIED = sub { 294$EV::DIED = sub {
267 warn "error in event callback: @_"; 295 Carp::cluck "error in event callback: @_";
268}; 296};
269 297
270############################################################################# 298#############################################################################
271 299
272=head2 UTILITY FUNCTIONS 300=head2 UTILITY FUNCTIONS
… …
330Wait until the given lock is available. See cf::lock_acquire. 358Wait until the given lock is available. See cf::lock_acquire.
331 359
332=item my $lock = cf::lock_acquire $string 360=item my $lock = cf::lock_acquire $string
333 361
334Wait until the given lock is available and then acquires it and returns 362Wait 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, 363a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 364for example when the coroutine gets canceled), the lock is automatically
337returned. 365returned.
338 366
339Locks are *not* recursive, locking from the same coro twice results in a 367Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 368deadlocked coro.
… …
346 374
347Return true if the lock is currently active, i.e. somebody has locked it. 375Return true if the lock is currently active, i.e. somebody has locked it.
348 376
349=cut 377=cut
350 378
351our %LOCK; 379our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 380
354sub lock_wait($) { 381sub lock_wait($) {
355 my ($key) = @_; 382 $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} 383}
369 384
370sub lock_acquire($) { 385sub lock_acquire($) {
371 my ($key) = @_; 386 $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} 387}
385 388
386sub lock_active($) { 389sub lock_active($) {
387 my ($key) = @_; 390 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 391}
391 392
392sub freeze_mainloop { 393sub freeze_mainloop {
393 tick_inhibit_inc; 394 tick_inhibit_inc;
394 395
395 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
396} 397}
397 398
398=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
399 400
400Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
… …
1172 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1173 1174
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1176 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 aio_fsync $fh if $cf::USE_FSYNC; 1178 if ($cf::USE_FSYNC) {
1179 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;
1180 aio_fsync $fh;
1181 }
1178 aio_close $fh; 1182 aio_close $fh;
1179 1183
1180 if (@$objs) { 1184 if (@$objs) {
1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1185 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1186 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1187 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1188 aio_write $fh, 0, (length $data), $data, 0;
1185 aio_fsync $fh if $cf::USE_FSYNC; 1189 if ($cf::USE_FSYNC) {
1190 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;
1191 aio_fsync $fh;
1192 }
1186 aio_close $fh; 1193 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1194 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1195 }
1189 } else { 1196 } else {
1190 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
… …
1193 aio_rename "$filename~", $filename; 1200 aio_rename "$filename~", $filename;
1194 1201
1195 $filename =~ s%/[^/]+$%%; 1202 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1203 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1204 } else {
1198 warn "FATAL: $filename~: $!\n"; 1205 warn "unable to save objects: $filename~: $!\n";
1199 } 1206 }
1200 } else { 1207 } else {
1201 aio_unlink $filename; 1208 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1209 aio_unlink "$filename.pst";
1203 } 1210 }
… …
1341 1348
1342# "readahead" all extensions 1349# "readahead" all extensions
1343sub cache_extensions { 1350sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1351 my $grp = IO::AIO::aio_group;
1345 1352
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1353 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1354 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1355 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1356 }
1350 }; 1357 };
1351 1358
… …
1887 1894
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1895 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1896 "$UNIQUEDIR/$path"
1890} 1897}
1891 1898
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 { 1899sub decay_objects {
1902 my ($self) = @_; 1900 my ($self) = @_;
1903 1901
1904 return if $self->{deny_reset}; 1902 return if $self->{deny_reset};
1905 1903
… …
1987sub find { 1985sub find {
1988 my ($path, $origin) = @_; 1986 my ($path, $origin) = @_;
1989 1987
1990 $path = normalise $path, $origin && $origin->path; 1988 $path = normalise $path, $origin && $origin->path;
1991 1989
1992 cf::lock_wait "map_data:$path";#d#remove 1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 1991 my $guard2 = cf::lock_acquire "map_find:$path";
1994 1992
1995 $cf::MAP{$path} || do { 1993 $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 1994 my $map = new_from_path cf::map $path
2000 or return; 1995 or return;
2001 1996
2002 $map->{last_save} = $cf::RUNTIME; 1997 $map->{last_save} = $cf::RUNTIME;
2003 1998
… …
2071 unless ($self->{deny_activate}) { 2066 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2067 $self->decay_objects;
2073 $self->fix_auto_apply; 2068 $self->fix_auto_apply;
2074 $self->update_buttons; 2069 $self->update_buttons;
2075 cf::cede_to_tick; 2070 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2071 $self->activate;
2079 } 2072 }
2080 2073
2081 $self->{last_save} = $cf::RUNTIME; 2074 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2075 $self->last_access ($cf::RUNTIME);
… …
2248 2241
2249 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250 2243
2251 return if $self->players; 2244 return if $self->players;
2252 2245
2253 warn "resetting map ", $self->path; 2246 warn "resetting map ", $self->path, "\n";
2254 2247
2255 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2256 2249
2257 # need to save uniques path 2250 # need to save uniques path
2258 unless ($self->{deny_save}) { 2251 unless ($self->{deny_save}) {
… …
2349 : normalise $_ 2342 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2343 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2344 ]
2352} 2345}
2353 2346
2347=item cf::map::static_maps
2348
2349Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2350file in the shared directory excluding F</styles> and F</editor>). May
2351block.
2352
2353=cut
2354
2355sub static_maps() {
2356 my @dirs = "";
2357 my @maps;
2358
2359 while (@dirs) {
2360 my $dir = shift @dirs;
2361
2362 next if $dir eq "/styles" || $dir eq "/editor";
2363
2364 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2365 or return;
2366
2367 for (@$files) {
2368 s/\.map$// or next;
2369 utf8::decode $_;
2370 push @maps, "$dir/$_";
2371 }
2372
2373 push @dirs, map "$dir/$_", @$dirs;
2374 }
2375
2376 \@maps
2377}
2378
2354=back 2379=back
2355 2380
2356=head3 cf::object 2381=head3 cf::object
2357 2382
2358=cut 2383=cut
… …
2423 2448
2424our $SAY_CHANNEL = { 2449our $SAY_CHANNEL = {
2425 id => "say", 2450 id => "say",
2426 title => "Map", 2451 title => "Map",
2427 reply => "say ", 2452 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2453 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2454};
2430 2455
2431our $CHAT_CHANNEL = { 2456our $CHAT_CHANNEL = {
2432 id => "chat", 2457 id => "chat",
2433 title => "Chat", 2458 title => "Chat",
… …
2553 ($x, $y) = (-1, -1) 2578 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2579 unless (defined $x) && (defined $y);
2555 2580
2556 # use -1 or undef as default coordinates, not 0, 0 2581 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2582 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2583 if $x <= 0 && $y <= 0;
2559 2584
2560 $map->load; 2585 $map->load;
2561 $map->load_neighbours; 2586 $map->load_neighbours;
2562 2587
2563 return unless $self->contr->active; 2588 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2589
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2591 $self->enter_map ($map, $x, $y);
2592
2593 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive;
2569} 2595}
2570 2596
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2572 2598
2573Moves the player to the given map-path and coordinates by first freezing 2599Moves the player to the given map-path and coordinates by first freezing
… …
2761 2787
2762 utf8::encode $text; 2788 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2764} 2790}
2765 2791
2792=item $client->send_big_packet ($pkt)
2793
2794Like C<send_packet>, but tries to compress large packets, and fragments
2795them as required.
2796
2797=cut
2798
2799our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2800
2801sub cf::client::send_big_packet {
2802 my ($self, $pkt) = @_;
2803
2804 # try lzf for large packets
2805 $pkt = "lzf " . Compress::LZF::compress $pkt
2806 if 1024 <= length $pkt and $self->{can_lzf};
2807
2808 # split very large packets
2809 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2810 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2811 $pkt = "frag";
2812 }
2813
2814 $self->send_packet ($pkt);
2815}
2816
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2817=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2818
2768Send a drawinfo or msg packet to the client, formatting the msg for the 2819Send a drawinfo or msg packet to the client, formatting the msg for the
2769client if neccessary. C<$type> should be a string identifying the type of 2820client if neccessary. C<$type> should be a string identifying the type of
2770the message, with C<log> being the default. If C<$color> is negative, suppress 2821the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2772 2823
2773=cut 2824=cut
2774 2825
2775# non-persistent channels (usually the info channel) 2826# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2827our %CHANNEL = (
2828 "c/motd" => {
2829 id => "infobox",
2830 title => "MOTD",
2831 reply => undef,
2832 tooltip => "The message of the day",
2833 },
2777 "c/identify" => { 2834 "c/identify" => {
2778 id => "infobox", 2835 id => "infobox",
2779 title => "Identify", 2836 title => "Identify",
2780 reply => undef, 2837 reply => undef,
2781 tooltip => "Items recently identified", 2838 tooltip => "Items recently identified",
… …
2783 "c/examine" => { 2840 "c/examine" => {
2784 id => "infobox", 2841 id => "infobox",
2785 title => "Examine", 2842 title => "Examine",
2786 reply => undef, 2843 reply => undef,
2787 tooltip => "Signs and other items you examined", 2844 tooltip => "Signs and other items you examined",
2845 },
2846 "c/shopinfo" => {
2847 id => "infobox",
2848 title => "Shop Info",
2849 reply => undef,
2850 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 2851 },
2789 "c/book" => { 2852 "c/book" => {
2790 id => "infobox", 2853 id => "infobox",
2791 title => "Book", 2854 title => "Book",
2792 reply => undef, 2855 reply => undef,
… …
2808 id => "infobox", 2871 id => "infobox",
2809 title => "Body Parts", 2872 title => "Body Parts",
2810 reply => undef, 2873 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2874 tooltip => "Shows which body parts you posess and are available",
2812 }, 2875 },
2876 "c/statistics" => {
2877 id => "infobox",
2878 title => "Statistics",
2879 reply => undef,
2880 tooltip => "Shows your primary statistics",
2881 },
2813 "c/skills" => { 2882 "c/skills" => {
2814 id => "infobox", 2883 id => "infobox",
2815 title => "Skills", 2884 title => "Skills",
2816 reply => undef, 2885 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 2886 tooltip => "Shows your experience per skill and item power",
2887 },
2888 "c/shopitems" => {
2889 id => "infobox",
2890 title => "Shop Items",
2891 reply => undef,
2892 tooltip => "Shows the items currently for sale in this shop",
2893 },
2894 "c/resistances" => {
2895 id => "infobox",
2896 title => "Resistances",
2897 reply => undef,
2898 tooltip => "Shows your resistances",
2899 },
2900 "c/pets" => {
2901 id => "infobox",
2902 title => "Pets",
2903 reply => undef,
2904 tooltip => "Shows information abotu your pets/a specific pet",
2905 },
2906 "c/perceiveself" => {
2907 id => "infobox",
2908 title => "Perceive Self",
2909 reply => undef,
2910 tooltip => "You gained detailed knowledge about yourself",
2818 }, 2911 },
2819 "c/uptime" => { 2912 "c/uptime" => {
2820 id => "infobox", 2913 id => "infobox",
2821 title => "Uptime", 2914 title => "Uptime",
2822 reply => undef, 2915 reply => undef,
… …
2832 id => "party", 2925 id => "party",
2833 title => "Party", 2926 title => "Party",
2834 reply => "gsay ", 2927 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 2928 tooltip => "Messages and chat related to your party",
2836 }, 2929 },
2930 "c/death" => {
2931 id => "death",
2932 title => "Death",
2933 reply => undef,
2934 tooltip => "Reason for and more info about your most recent death",
2935 },
2936 "c/say" => $SAY_CHANNEL,
2937 "c/chat" => $CHAT_CHANNEL,
2837); 2938);
2838 2939
2839sub cf::client::send_msg { 2940sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2941 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2942
… …
2846 2947
2847 # check predefined channels, for the benefit of C 2948 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 2949 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 2950 $channel = $CHANNEL{$channel};
2850 2951
2851 $self->ext_msg (channel_info => $channel) 2952 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 2953 $channel = $channel->{id};
2855 2954
2856 } elsif (ref $channel) { 2955 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 2956 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 2957 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 2958 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 2959 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 2960 }
2863 2961
2864 $channel = $channel->{id}; 2962 $channel = $channel->{id};
2865 } 2963 }
2866 2964
2867 return unless @extra || length $msg; 2965 return unless @extra || length $msg;
2868 2966
2869 if ($self->can_msg) {
2870 # default colour, mask it out 2967 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2968 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 2969 if $color & cf::NDI_DEF;
2873 2970
2874 my $pkt = "msg " 2971 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 2972 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 2973 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 2974 );
2878 2975
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 2976 $self->send_big_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} 2977}
2916 2978
2917=item $client->ext_msg ($type, @msg) 2979=item $client->ext_msg ($type, @msg)
2918 2980
2919Sends an ext event to the client. 2981Sends an ext event to the client.
… …
2922 2984
2923sub cf::client::ext_msg($$@) { 2985sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 2986 my ($self, $type, @msg) = @_;
2925 2987
2926 if ($self->extcmd == 2) { 2988 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2989 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 2990 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 2991 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2992 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 2993 }
2932} 2994}
2933 2995
2934=item $client->ext_reply ($msgid, @msg) 2996=item $client->ext_reply ($msgid, @msg)
2935 2997
… …
2939 3001
2940sub cf::client::ext_reply($$@) { 3002sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3003 my ($self, $id, @msg) = @_;
2942 3004
2943 if ($self->extcmd == 2) { 3005 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3006 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3007 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3008 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3009 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3011 }
2950} 3012}
2951 3013
2952=item $success = $client->query ($flags, "text", \&cb) 3014=item $success = $client->query ($flags, "text", \&cb)
2953 3015
… …
3094The following functions and methods are available within a safe environment: 3156The following functions and methods are available within a safe environment:
3095 3157
3096 cf::object 3158 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3159 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3160 insert remove name archname title slaying race decrease split
3161 value
3099 3162
3100 cf::object::player 3163 cf::object::player
3101 player 3164 player
3102 3165
3103 cf::player 3166 cf::player
… …
3109=cut 3172=cut
3110 3173
3111for ( 3174for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3175 ["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 3176 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3177 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3178 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3179 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3180 ["cf::map" => qw(trigger)],
3118) { 3181) {
3119 no strict 'refs'; 3182 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3183 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3184 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3138 my ($code, %vars) = @_; 3201 my ($code, %vars) = @_;
3139 3202
3140 my $qcode = $code; 3203 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3205 $qcode =~ s/\n/\\n/g;
3206
3207 %vars = (_dummy => 0) unless %vars;
3143 3208
3144 local $_; 3209 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars; 3210 local @safe::cf::_safe_eval_args = values %vars;
3146 3211
3147 my $eval = 3212 my $eval =
… …
3378 3443
3379 warn "finished reloading resource files\n"; 3444 warn "finished reloading resource files\n";
3380} 3445}
3381 3446
3382sub reload_config { 3447sub reload_config {
3448 warn "reloading config file...\n";
3449
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3450 open my $fh, "<:utf8", "$CONFDIR/config"
3384 or return; 3451 or return;
3385 3452
3386 local $/; 3453 local $/;
3387 *CFG = YAML::Load <$fh>; 3454 *CFG = YAML::XS::Load scalar <$fh>;
3388 3455
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3456 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3390 3457
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3458 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3459 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3396 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3463 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3397 and die "WARNING: m(un)lockall failed: $!\n"; 3464 and die "WARNING: m(un)lockall failed: $!\n";
3398 }; 3465 };
3399 warn $@ if $@; 3466 warn $@ if $@;
3400 } 3467 }
3468
3469 warn "finished reloading resource files\n";
3401} 3470}
3402 3471
3403sub pidfile() { 3472sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3473 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!"; 3474 or die "$PIDFILE: $!";
… …
3417 3486
3418 seek $fh, 0, 0; 3487 seek $fh, 0, 0;
3419 print $fh $$; 3488 print $fh $$;
3420} 3489}
3421 3490
3491sub main_loop {
3492 warn "EV::loop starting\n";
3493 if (1) {
3494 EV::loop;
3495 }
3496 warn "EV::loop returned\n";
3497 goto &main_loop unless $REALLY_UNLOOP;
3498}
3499
3422sub main { 3500sub main {
3423 cf::init_globals; # initialise logging 3501 cf::init_globals; # initialise logging
3424 3502
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3429 3507
3430 cf::init_experience; 3508 cf::init_experience;
3431 cf::init_anim; 3509 cf::init_anim;
3432 cf::init_attackmess; 3510 cf::init_attackmess;
3433 cf::init_dynamic; 3511 cf::init_dynamic;
3434 cf::init_block;
3435 3512
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3514
3438 # we must not ever block the main coroutine 3515 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3516 local $Coro::idle = sub {
… …
3465 load_extensions; 3542 load_extensions;
3466 3543
3467 utime time, time, $RUNTIMEFILE; 3544 utime time, time, $RUNTIMEFILE;
3468 3545
3469 # no (long-running) fork's whatsoever before this point(!) 3546 # no (long-running) fork's whatsoever before this point(!)
3547 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3549
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3550 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3551 };
3474 3552
3475 EV::loop; 3553 main_loop;
3476} 3554}
3477 3555
3478############################################################################# 3556#############################################################################
3479# initialisation and cleanup 3557# initialisation and cleanup
3480 3558
… …
3736 clear_package "safe::$_" 3814 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3815 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3816
3739 warn "unloading cf.pm \"a bit\""; 3817 warn "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3818 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3819 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3820
3743 # don't, removes xs symbols, too, 3821 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3822 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3823 #clear_package __PACKAGE__;
3746 3824
3747 warn "unload completed, starting to reload now"; 3825 warn "unload completed, starting to reload now";
3748 3826
3749 warn "reloading cf.pm"; 3827 warn "reloading cf.pm";
3750 require cf; 3828 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3829 cf::_connect_to_perl_1;
3752 3830
3753 warn "loading config and database again"; 3831 warn "loading config and database again";
3754 cf::reload_config; 3832 cf::reload_config;
3755 3833
3756 warn "loading extensions"; 3834 warn "loading extensions";
… …
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4041 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4042 }
3965} 4043}
3966 4044
3967# load additional modules 4045# load additional modules
3968use cf::pod; 4046require "cf/$_.pm" for @EXTRA_MODULES;
4047cf::_connect_to_perl_2;
3969 4048
3970END { cf::emergency_save } 4049END { cf::emergency_save }
3971 4050
39721 40511
3973 4052

Diff Legend

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