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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 2012 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,2009,2010,2011,2012 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# 18# <http://www.gnu.org/licenses/>.
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 utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
107 135
108our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
110our $NOW; 139our $NOW;
111 140
112our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 148our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 149our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 150our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 151our $TICK_START; # for load detecting purposes
123 152
153our @POST_INIT;
154
155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
160
124binmode STDOUT; 161binmode STDOUT;
125binmode STDERR; 162binmode STDERR;
126 163
127# read virtual server time, if available 164# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 165unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 166 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 167 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 168 $RUNTIME = <$fh> + 0.;
132} 169}
170
171eval "sub TICK() { $TICK } 1" or die;
133 172
134mkdir $_ 173mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 174 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 175
137our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
138 177
139sub cf::map::normalise; 178sub cf::map::normalise;
140 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
141############################################################################# 184#############################################################################
142 185
186%REFLECT = ();
187for (@REFLECT) {
188 my $reflect = JSON::XS::decode_json $_;
189 $REFLECT{$reflect->{class}} = $reflect;
190}
191
192# this is decidedly evil
193$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
194
195#############################################################################
196
143=head2 GLOBAL VARIABLES 197=head2 GLOBAL VARIABLES
144 198
145=over 4 199=over 4
146 200
147=item $cf::UPTIME 201=item $cf::UPTIME
148 202
149The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
150 219
151=item $cf::RUNTIME 220=item $cf::RUNTIME
152 221
153The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 223every server tick.
160Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
163database environment. 232database environment.
164 233
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 234=item $cf::LOADAVG
174 235
175The current CPU load on the server (alpha-smoothed), as a value between 0 236The current CPU load on the server (alpha-smoothed), as a value between 0
176(none) and 1 (overloaded), indicating how much time is spent on processing 237(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 247from wherever your confdir points to.
187 248
188=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
189 250
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 252returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
271
194=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
195 273
196This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 276that call.
199 277
278=item %cf::REFLECT
279
280Contains, for each (C++) class name, a hash reference with information
281about object members (methods, scalars, arrays and flags) and other
282metadata, which is useful for introspection.
283
200=back 284=back
201 285
202=cut 286=cut
203 287
204BEGIN { 288sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 289sub warn (@) { LOG llevWarn , join "", @_ }
290sub info (@) { LOG llevInfo , join "", @_ }
291sub debug(@) { LOG llevDebug, join "", @_ }
292sub trace(@) { LOG llevTrace, join "", @_ }
293
294$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 295 my $msg = join "", @_;
207 296
208 $msg .= "\n" 297 $msg .= "\n"
209 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
210 299
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 300 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 301
213 LOG llevError, $msg; 302 LOG llevWarn, $msg;
214 }; 303};
215}
216 304
217$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
219 307
220 if ($Coro::current == $Coro::main) {#d# 308 error Carp::longmess $_[0];
309
310 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 312 return;#d#
223 }#d# 313 }#d#
224 314
225 # kill coroutine otherwise 315 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 316 Coro::terminate
228}; 317};
229
230$SIG{__DIE__} = sub { }; #d#?
231 318
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 319@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 320@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 321@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 322@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 329for my $pkg (qw(
243 cf::global cf::attachable 330 cf::global cf::attachable
244 cf::object cf::object::player 331 cf::object cf::object::player
245 cf::client cf::player 332 cf::client cf::player
246 cf::arch cf::living 333 cf::arch cf::living
334 cf::map cf::mapspace
247 cf::map cf::party cf::region 335 cf::party cf::region
248)) { 336)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 338}
252 339
253$EV::DIED = sub { 340$EV::DIED = sub {
254 warn "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
255}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
256 348
257############################################################################# 349#############################################################################
258 350
259=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
260 352
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 374 $d
283 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
284} 376}
285 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
286=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
287 431
288Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
289 433
290=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 441
298sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
300 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
476=item cf::post_init { BLOCK }
477
478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
479but I<before> the server starts ticking again.
480
481The codeblock will have a single boolean argument to indicate whether this
482is a reload or not.
483
484=cut
485
486sub post_init(&) {
487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
505}
506
301=item cf::lock_wait $string 507=item cf::lock_wait $string
302 508
303Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
304 510
305=item my $lock = cf::lock_acquire $string 511=item my $lock = cf::lock_acquire $string
306 512
307Wait until the given lock is available and then acquires it and returns 513Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 514a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 515for example when the coroutine gets canceled), the lock is automatically
310returned. 516returned.
311 517
312Locks are *not* recursive, locking from the same coro twice results in a 518Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 519deadlocked coro.
319 525
320Return true if the lock is currently active, i.e. somebody has locked it. 526Return true if the lock is currently active, i.e. somebody has locked it.
321 527
322=cut 528=cut
323 529
324our %LOCK; 530our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 531
327sub lock_wait($) { 532sub lock_wait($) {
328 my ($key) = @_; 533 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 534}
341 535
342sub lock_acquire($) { 536sub lock_acquire($) {
343 my ($key) = @_; 537 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 538}
357 539
358sub lock_active($) { 540sub lock_active($) {
359 my ($key) = @_; 541 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 542}
363 543
364sub freeze_mainloop { 544sub freeze_mainloop {
365 tick_inhibit_inc; 545 tick_inhibit_inc;
366 546
367 Coro::guard \&tick_inhibit_dec; 547 &Guard::guard (\&tick_inhibit_dec);
368} 548}
369 549
370=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
371 551
372Like EV::periodic, but randomly selects a starting point so that the actions 552Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 553get spread over time.
374 554
375=cut 555=cut
376 556
377sub periodic($$) { 557sub periodic($$) {
378 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
383} 563}
384 564
385=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
386 566
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
390 574
391The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
393 577
394Useful for short background jobs. 578Useful for short background jobs.
395 579
396=cut 580=cut
397 581
398our @SLOT_QUEUE; 582our @SLOT_QUEUE;
399our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
400 585
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
404 589
405 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
406 592
407 while () { 593 while () {
408 next_job: 594 next_job:
595
409 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 597
411 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 602 $job->[2]->send;
415 Coro::cede; 603 Coro::cede;
416 goto next_job; 604 goto next_job;
417 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 607 }
419 } 608 }
420 609
421 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 613 } else {
614 $busy = 0;
426 Coro::schedule; 615 Coro::schedule;
427 } 616 }
428 } 617 }
429}; 618};
430 619
431sub get_slot($;$$) { 620sub get_slot($;$$) {
621 return if tick_inhibit || $Coro::current == $Coro::main;
622
432 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
433 624
434 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
435 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
436 628
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
465=cut 657=cut
466 658
467sub sync_job(&) { 659sub sync_job(&) {
468 my ($job) = @_; 660 my ($job) = @_;
469 661
470 if ($Coro::current == $Coro::main) { 662 if (in_main) {
471 my $time = EV::time; 663 my $time = AE::time;
472 664
473 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
475 667
476 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
477 669
478 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
479 671
480 my $busy = 1; 672 my $busy = 1;
481 my @res; 673 my @res;
482 674
483 (async { 675 (async {
484 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 677 @res = eval { $job->() };
486 warn $@ if $@; 678 error $@ if $@;
487 undef $busy; 679 undef $busy;
488 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
489 681
490 while ($busy) { 682 while ($busy) {
491 if (Coro::nready) { 683 if (Coro::nready) {
493 } else { 685 } else {
494 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
495 } 687 }
496 } 688 }
497 689
498 my $time = EV::time - $time; 690 my $time = AE::time - $time;
499 691
500 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
501 693
502 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
503 } else { 695 } else {
525 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
526 718
527 $coro 719 $coro
528} 720}
529 721
530=item fork_call { }, $args 722=item fork_call { }, @args
531 723
532Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 727never block itself or use any form of event handling.
536 728
537=cut 729=cut
538 730
731sub post_fork {
732 reset_signals;
733}
734
539sub fork_call(&@) { 735sub fork_call(&@) {
540 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
541 737
542 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
543 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
545 741
546 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
547 reset_signals; 743 cf::post_fork;
548 &$cb 744 &$cb
549 }, @args; 745 } @args;
550 746
551 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
748}
749
750sub objinfo {
751 (
752 "counter value" => cf::object::object_count,
753 "objects created" => cf::object::create_count,
754 "objects destroyed" => cf::object::destroy_count,
755 "freelist size" => cf::object::free_count,
756 "allocated objects" => cf::object::objects_size,
757 "active objects" => cf::object::actives_size,
758 )
552} 759}
553 760
554=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
555 762
556=cut 763=cut
593within each server. 800within each server.
594 801
595=cut 802=cut
596 803
597sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
598 my ($name) = @_; 808 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
600 810
601 eval { 811 eval {
602 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
612} 822}
613 823
614our $DB; 824our $DB;
615 825
616sub db_init { 826sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
619 };
620} 828}
621 829
622sub db_get($$) { 830sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
624 832
625 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
626 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
627 837
628 $! ? () 838 $! ? ()
629 : $data 839 : $data
630 }
631} 840}
632 841
633sub db_put($$$) { 842sub db_put($$$) {
634 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
663 872
664 my @data; 873 my @data;
665 my $md5; 874 my $md5;
666 875
667 for (0 .. $#$src) { 876 for (0 .. $#$src) {
668 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
669 or Carp::croak "$src->[$_]: $!";
670 } 878 }
671 879
672 # if processing is expensive, check 880 # if processing is expensive, check
673 # checksum first 881 # checksum first
674 if (1) { 882 if (1) {
691 899
692 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 901 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
695 903
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 905
698 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
701 909
711 919
712=cut 920=cut
713 921
714sub datalog($@) { 922sub datalog($@) {
715 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 925}
718 926
719=back 927=back
720 928
721=cut 929=cut
722 930
723############################################################################# 931#############################################################################
724 932
725=head2 ATTACHABLE OBJECTS 933=head2 ATTACHABLE OBJECTS
726 934
727Many objects in crossfire are so-called attachable objects. That means you can 935Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 936attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 937to it. All such attachable objects support the following methods.
730 938
731In the following description, CLASS can be any of C<global>, C<object> 939In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 940C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 990=item cf::CLASS::attachment $name, ...
783 991
784Register an attachment by C<$name> through which attachable objects of the 992Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 993given CLASS can refer to this attachment.
786 994
787Some classes such as crossfire maps and objects can specify attachments 995Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 996that are attached at load/instantiate time, thus the need for a name.
789 997
790These calls expect any number of the following handler/hook descriptions: 998These calls expect any number of the following handler/hook descriptions:
791 999
792=over 4 1000=over 4
916 1124
917 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1127
920 } elsif (ref $type) { 1128 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
922 1130
923 } else { 1131 } else {
924 shift @arg; 1132 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
926 } 1134 }
927 } 1135 }
928} 1136}
929 1137
930sub _object_attach { 1138sub _object_attach {
940 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
941 } 1149 }
942 1150
943 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
944 } else { 1152 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1154 }
947 1155
948 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
949} 1157}
950 1158
1009 1217
1010 for (@$callbacks) { 1218 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1012 1220
1013 if ($@) { 1221 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1223 override;
1017 } 1224 }
1018 1225
1019 return 1 if $override; 1226 return 1 if $override;
1020 } 1227 }
1083 1290
1084sub reattach { 1291sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1292 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1293 my ($obj) = @_;
1087 1294
1295 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1296 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1297
1090 my $registry = $obj->registry; 1298 my $registry = $obj->registry;
1091 1299
1092 @$registry = (); 1300 @$registry = ();
1093 1301
1098 for (@$attach) { 1306 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1101 } 1309 }
1102 } else { 1310 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1312 }
1105 } 1313 }
1106} 1314}
1107 1315
1108cf::attachable->attach ( 1316cf::attachable->attach (
1135 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1136 1344
1137 sync_job { 1345 sync_job {
1138 if (length $$rdata) { 1346 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1142 1351
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1353 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1355 if ($cf::USE_FSYNC) {
1356 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;
1357 aio_fsync $fh;
1358 }
1147 close $fh; 1359 aio_close $fh;
1148 1360
1149 if (@$objs) { 1361 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1362 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1363 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1366 if ($cf::USE_FSYNC) {
1367 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;
1368 aio_fsync $fh;
1369 }
1155 close $fh; 1370 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1372 }
1158 } else { 1373 } else {
1159 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1160 } 1375 }
1161 1376
1162 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1381 } else {
1164 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1165 } 1383 }
1166 } else { 1384 } else {
1167 aio_unlink $filename; 1385 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1169 } 1387 }
1193 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1412 $av = $st->{objs};
1195 } 1413 }
1196 1414
1197 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1200 1419
1201 ($data, $av) 1420 ($data, $av)
1202} 1421}
1203 1422
1204=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1260 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1261 1480
1262 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1263} 1482}
1264 1483
1484use File::Glob ();
1485
1265cf::player->attach ( 1486cf::player->attach (
1266 on_command => sub { 1487 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1268 1489
1269 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1270 or return; 1491 or return;
1271 1492
1279 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1280 1501
1281 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1282 1503
1283 if (ref $msg) { 1504 if (ref $msg) {
1284 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1285 "ARRAY" eq ref $msg
1286 ? @$msg
1287 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1288 1506
1289 my @reply; 1507 my @reply;
1290 1508
1291 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1292 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1294 1512
1295 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1514 if $reply;
1297 1515
1298 } else { 1516 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1518 }
1301 1519
1302 cf::override; 1520 cf::override;
1303 }, 1521 },
1304); 1522);
1305 1523
1524# "readahead" all extensions
1525sub cache_extensions {
1526 my $grp = IO::AIO::aio_group;
1527
1528 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1529 for (grep /\.ext$/, @{$_[0]}) {
1530 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1531 }
1532 };
1533
1534 $grp
1535}
1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1306sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1307 cf::sync_job { 1553 cf::sync_job {
1308 my %todo; 1554 my %todo;
1309 1555
1310 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1557 next unless -r $path;
1329 1575
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1578
1333 $ext{source} = 1579 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1336 . $source 1582 . $source
1337 . "\n};\n1"; 1583 . "\n};\n1";
1338 1584
1339 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1340 } 1586 }
1341 1587
1588 my $pass = 0;
1342 my %done; 1589 my %done;
1343 while (%todo) { 1590 while (%todo) {
1344 my $progress; 1591 my $progress;
1345 1592
1593 ++$pass;
1594
1595 ext:
1346 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1598 next ext
1349 unless exists $done{$_}; 1599 unless exists $done{$_};
1350 } 1600 }
1351 1601
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1603
1354 unless (eval $v->{source}) { 1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1613 my $active = eval $source;
1614
1615 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1617
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1619 if exists $v->{meta}{mandatory};
1362 1620
1363 warn $msg; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1623 } else {
1624 $done{$k} = delete $todo{$k};
1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1364 } 1630 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1631 }
1370 1632
1371 skip: 1633 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 unless $progress; 1635
1636 while (my ($k, $v) = each %todo) {
1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1638 if exists $v->{meta}{mandatory};
1639 }
1640
1641 last;
1642 }
1374 } 1643 }
1375 }; 1644 };
1376} 1645}
1377 1646
1378############################################################################# 1647#############################################################################
1379 1648
1380=back 1649=back
1381 1650
1382=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1383 1652
1384Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1385 1654
1386=cut 1655=cut
1387 1656
1388package cf::player; 1657package cf::player;
1389 1658
1432 1701
1433sub exists($) { 1702sub exists($) {
1434 my ($login) = @_; 1703 my ($login) = @_;
1435 1704
1436 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1438} 1707}
1439 1708
1440sub find($) { 1709sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1711 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1723 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1724 or return;
1456 1725
1457 my $pl = cf::player::load_pl $f 1726 my $pl = cf::player::load_pl $f
1458 or return; 1727 or return;
1728
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1729 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1730 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1462 } 1732 }
1463 } 1733 }
1464} 1734}
1465 1735
1736cf::player->attach (
1737 on_load => sub {
1738 my ($pl, $path) = @_;
1739
1740 # restore slots saved in save, below
1741 my $slots = delete $pl->{_slots};
1742
1743 $pl->ob->current_weapon ($slots->[0]);
1744 $pl->combat_ob ($slots->[1]);
1745 $pl->ranged_ob ($slots->[2]);
1746 },
1747);
1748
1466sub save($) { 1749sub save($) {
1467 my ($pl) = @_; 1750 my ($pl) = @_;
1468 1751
1469 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1470 1753
1473 1756
1474 return if $pl->{deny_save}; 1757 return if $pl->{deny_save};
1475 1758
1476 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1761
1762 cf::get_slot 0.01;
1763
1764 # save slots, to be restored later
1765 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1766
1479 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1768 cf::cede_to_tick;
1481} 1769}
1482 1770
1514 my ($pl) = @_; 1802 my ($pl) = @_;
1515 1803
1516 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1517 1805
1518 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1808
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1810 $pl->deactivate;
1811
1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1524 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1525 1817
1526 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1566 1858
1567 for my $login (@$dirs) { 1859 for my $login (@$dirs) {
1568 my $path = path $login; 1860 my $path = path $login;
1569 1861
1570 # a .pst is a dead give-away for a valid player 1862 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1863 # if no pst file found, open and chekc for blocked users
1864 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1865 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1866 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1867 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1868 }
1576 1869
1580 1873
1581 \@logins 1874 \@logins
1582} 1875}
1583 1876
1584=item $player->maps 1877=item $player->maps
1878
1879=item cf::player::maps $login
1585 1880
1586Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1587player. May block. 1882player. May block.
1588 1883
1589=cut 1884=cut
1607 } 1902 }
1608 1903
1609 \@paths 1904 \@paths
1610} 1905}
1611 1906
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1908
1614Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1910
1705=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1706 1912
1707Sends an ext reply to the player. 1913Sends an ext reply to the player.
1708 1914
1740 1946
1741=cut 1947=cut
1742 1948
1743sub find_by_path($) { 1949sub find_by_path($) {
1744 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1745 1953
1746 my ($match, $specificity); 1954 my ($match, $specificity);
1747 1955
1748 for my $region (list) { 1956 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1778sub generate_random_map { 1986sub generate_random_map {
1779 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1780 1988
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782 1990
1783 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1792 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1793 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1794 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1795 (cf::region::find $rmp->{region}), $rmp->{custom}
1796 )
1797} 1992}
1798 1993
1799=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1800 1995
1801Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
1806 2001
1807sub register { 2002sub register {
1808 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1809 my $pkg = caller; 2004 my $pkg = caller;
1810 2005
1811 no strict;
1812 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1813 2007
1814 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1815} 2009}
1816 2010
1817# also paths starting with '/' 2011# also paths starting with '/'
1818$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1819 2013
1820sub thawer_merge { 2014sub thawer_merge {
1821 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1822 2016
1823 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1828} 2022}
1829 2023
1830sub normalise { 2024sub normalise {
1831 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1832 2026
1833 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1834 2028
1835 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1836 2030
1837 # map plan: 2031 # map plan:
1838 # 2032 #
1853 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1854 $path = "$base/$path"; 2048 $path = "$base/$path";
1855 } 2049 }
1856 2050
1857 for ($path) { 2051 for ($path) {
1858 redo if s{//}{/};
1859 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1860 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1861 } 2054 }
1862 2055
1863 $path 2056 $path
1877 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1878 return $self; 2071 return $self;
1879 } 2072 }
1880 } 2073 }
1881 2074
1882 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1883 () 2076 ()
1884} 2077}
1885 2078
2079# may re-bless or do other evil things
1886sub init { 2080sub init {
1887 my ($self) = @_; 2081 my ($self) = @_;
1888 2082
1889 $self 2083 $self
1890} 2084}
1909 2103
1910# the temporary/swap location 2104# the temporary/swap location
1911sub save_path { 2105sub save_path {
1912 my ($self) = @_; 2106 my ($self) = @_;
1913 2107
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 2109 "$TMPDIR/$path.map"
1916} 2110}
1917 2111
1918# the unique path, undef == no special unique path 2112# the unique path, undef == no special unique path
1919sub uniq_path { 2113sub uniq_path {
1920 my ($self) = @_; 2114 my ($self) = @_;
1921 2115
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 2118}
1934 2119
1935sub decay_objects { 2120sub decay_objects {
1936 my ($self) = @_; 2121 my ($self) = @_;
1937 2122
1964 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1965 2150
1966 1 2151 1
1967} 2152}
1968 2153
2154# used to laod the header of an original map
1969sub load_header_orig { 2155sub load_header_orig {
1970 my ($self) = @_; 2156 my ($self) = @_;
1971 2157
1972 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1973} 2159}
1974 2160
2161# used to laod the header of an instantiated map
1975sub load_header_temp { 2162sub load_header_temp {
1976 my ($self) = @_; 2163 my ($self) = @_;
1977 2164
1978 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1979} 2166}
1980 2167
2168# called after loading the header from an instantiated map
1981sub prepare_temp { 2169sub prepare_temp {
1982 my ($self) = @_; 2170 my ($self) = @_;
1983 2171
1984 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1985 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1986 # safety 2174 # safety
1987 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1988 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1989} 2177}
1990 2178
2179# called after loading the header from an original map
1991sub prepare_orig { 2180sub prepare_orig {
1992 my ($self) = @_; 2181 my ($self) = @_;
1993 2182
1994 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1995 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
2019 2208
2020sub find; 2209sub find;
2021sub find { 2210sub find {
2022 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2023 2212
2213 cf::cede_to_tick;
2214
2024 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2025 2216
2026 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2219
2029 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
2034 or return; 2222 or return;
2035 2223
2036 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
2037 2225
2039 or return; 2227 or return;
2040 2228
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2229 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2230 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2231 #$cf::WAIT_FOR_TICK->wait;
2232 undef $guard2;
2044 undef $guard1; 2233 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2234 $map->reset;
2047 return find $path; 2235 return find $path;
2048 } 2236 }
2049 2237
2050 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2051 } 2239 }
2052} 2240}
2053 2241
2054sub pre_load { } 2242sub pre_load { }
2055sub post_load { } 2243#sub post_load { } # XS
2056 2244
2057sub load { 2245sub load {
2058 my ($self) = @_; 2246 my ($self) = @_;
2059 2247
2060 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2063 2251
2064 { 2252 {
2065 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2066 2254
2067 return unless $self->valid; 2255 return unless $self->valid;
2068 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2069
2070 $self->in_memory (cf::MAP_LOADING);
2071 2257
2072 $self->alloc; 2258 $self->alloc;
2073 2259
2074 $self->pre_load; 2260 $self->pre_load;
2075 cf::cede_to_tick; 2261 cf::cede_to_tick;
2076 2262
2263 if (exists $self->{load_path}) {
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2265 $f->skip_block;
2079 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2080 or return; 2267 or return;
2081 2268
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2269 $self->post_load_original
2083 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2084 2271
2085 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2273 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2089 $self->clear_unique_items; 2276 $self->clear_unique_items;
2090 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2092 } 2280 }
2093 } 2281 }
2094 }
2095 2282
2096 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2097 2290
2098 cf::cede_to_tick; 2291 cf::cede_to_tick;
2099 # now do the right thing for maps 2292 # now do the right thing for maps
2100 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2101 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2105 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2299 $self->decay_objects;
2107 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2108 $self->update_buttons; 2301 $self->update_buttons;
2109 cf::cede_to_tick; 2302 cf::cede_to_tick;
2110 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2111 cf::cede_to_tick;
2112 $self->activate;
2113 } 2304 }
2114 2305
2115 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2117
2118 $self->in_memory (cf::MAP_IN_MEMORY);
2119 } 2308 }
2120 2309
2121 $self->post_load; 2310 $self->post_load;
2122}
2123 2311
2312 1
2313}
2314
2315# customize the map for a given player, i.e.
2316# return the _real_ map. used by e.g. per-player
2317# maps to change the path to ~playername/mappath
2124sub customise_for { 2318sub customise_for {
2125 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2126 2320
2127 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2322 if $self->per_player;
2131# if $self->per_party; 2325# if $self->per_party;
2132 2326
2133 $self 2327 $self
2134} 2328}
2135 2329
2136# find and load all maps in the 3x3 area around a map
2137sub load_neighbours {
2138 my ($map) = @_;
2139
2140 my @neigh; # diagonal neighbours
2141
2142 for (0 .. 3) {
2143 my $neigh = $map->tile_path ($_)
2144 or next;
2145 $neigh = find $neigh, $map
2146 or next;
2147 $neigh->load;
2148
2149 push @neigh,
2150 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2151 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2152 }
2153
2154 for (grep defined $_->[0], @neigh) {
2155 my ($path, $origin) = @$_;
2156 my $neigh = find $path, $origin
2157 or next;
2158 $neigh->load;
2159 }
2160}
2161
2162sub find_sync { 2330sub find_sync {
2163 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2164 2332
2165 cf::sync_job { find $path, $origin } 2333 # it's a bug to call this from the main context
2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2335 if $Coro::current == $Coro::main;
2336
2337 find $path, $origin
2166} 2338}
2167 2339
2168sub do_load_sync { 2340sub do_load_sync {
2169 my ($map) = @_; 2341 my ($map) = @_;
2170 2342
2343 # it's a bug to call this from the main context
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2173 2346
2174 cf::sync_job { $map->load }; 2347 $map->load;
2175} 2348}
2176 2349
2177our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2178our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2179 2352
2180sub find_async { 2353sub find_async {
2181 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2182 2355
2183 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2184 2357
2185 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2359 return $map if !$load || $map->linkable;
2187 } 2360 }
2188 2361
2189 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2190 2363
2191 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2205 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2206 2379
2207 () 2380 ()
2208} 2381}
2209 2382
2383# common code, used by both ->save and ->swapout
2210sub save { 2384sub _save {
2211 my ($self) = @_; 2385 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2386
2215 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2216 2388
2217 return unless $self->dirty; 2389 return unless $self->dirty;
2218 2390
2227 2399
2228 cf::async { 2400 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2401 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2402 $_->contr->save for $self->players;
2231 }; 2403 };
2404
2405 cf::get_slot 0.02;
2232 2406
2233 if ($uniq) { 2407 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2408 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2409 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2410 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2411 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2238 } 2412 }
2239} 2413}
2240 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2241sub swap_out { 2423sub swap_out {
2242 my ($self) = @_; 2424 my ($self) = @_;
2243 2425
2244 # save first because save cedes
2245 $self->save;
2246
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2249 return if $self->players; 2430 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2431
2432 # first deactivate the map and "unlink" it from the core
2433 $self->deactivate;
2434 $_->clear_links_to ($self) for values %cf::MAP;
2435 $self->state (cf::MAP_SWAPPED);
2436
2437 # then atomically save
2438 $self->_save;
2439
2440 # then free the map
2441 $self->clear;
2442}
2443
2444sub reset_at {
2445 my ($self) = @_;
2446
2447 # TODO: safety, remove and allow resettable per-player maps
2251 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2252 2449
2450 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2451 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2452
2453 $time + $to
2454}
2455
2456sub should_reset {
2457 my ($self) = @_;
2458
2459 $self->reset_at <= $cf::RUNTIME
2460}
2461
2462sub reset {
2463 my ($self) = @_;
2464
2465 my $lock = cf::lock_acquire "map_data:$self->{path}";
2466
2467 return if $self->players;
2468
2469 cf::trace "resetting map ", $self->path, "\n";
2470
2253 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # need to save uniques path
2474 unless ($self->{deny_save}) {
2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2476
2477 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2478 if $uniq;
2479 }
2480
2481 delete $cf::MAP{$self->path};
2254 2482
2255 $self->deactivate; 2483 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear; 2485 $self->clear;
2258}
2259
2260sub reset_at {
2261 my ($self) = @_;
2262
2263 # TODO: safety, remove and allow resettable per-player maps
2264 return 1e99 if $self->{deny_reset};
2265
2266 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2267 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2268
2269 $time + $to
2270}
2271
2272sub should_reset {
2273 my ($self) = @_;
2274
2275 $self->reset_at <= $cf::RUNTIME
2276}
2277
2278sub reset {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 return if $self->players;
2284
2285 warn "resetting map ", $self->path;
2286
2287 $self->in_memory (cf::MAP_SWAPPED);
2288
2289 # need to save uniques path
2290 unless ($self->{deny_save}) {
2291 my $uniq = $self->uniq_path; utf8::encode $uniq;
2292
2293 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2294 if $uniq;
2295 }
2296
2297 delete $cf::MAP{$self->path};
2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2301 $self->clear;
2302 2486
2303 $self->unlink_save; 2487 $self->unlink_save;
2304 $self->destroy; 2488 $self->destroy;
2305} 2489}
2306 2490
2314 2498
2315 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2316 2500
2317 $self->unlink_save; 2501 $self->unlink_save;
2318 2502
2319 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2320 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2321 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2322 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2324 2508
2373 2557
2374sub unique_maps() { 2558sub unique_maps() {
2375 [ 2559 [
2376 map { 2560 map {
2377 utf8::decode $_; 2561 utf8::decode $_;
2378 /\.map$/ 2562 s/\.map$//; # TODO future compatibility hack
2563 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2564 ? ()
2379 ? normalise $_ 2565 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2567 ]
2383} 2568}
2384 2569
2570=item cf::map::static_maps
2571
2572Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2573file in the shared directory excluding F</styles> and F</editor>). May
2574block.
2575
2576=cut
2577
2578sub static_maps() {
2579 my @dirs = "";
2580 my @maps;
2581
2582 while (@dirs) {
2583 my $dir = shift @dirs;
2584
2585 next if $dir eq "/styles" || $dir eq "/editor";
2586
2587 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2588 or return;
2589
2590 for (@$files) {
2591 s/\.map$// or next;
2592 utf8::decode $_;
2593 push @maps, "$dir/$_";
2594 }
2595
2596 push @dirs, map "$dir/$_", @$dirs;
2597 }
2598
2599 \@maps
2600}
2601
2385=back 2602=back
2386 2603
2387=head3 cf::object 2604=head3 cf::object
2388 2605
2389=cut 2606=cut
2392 2609
2393=over 4 2610=over 4
2394 2611
2395=item $ob->inv_recursive 2612=item $ob->inv_recursive
2396 2613
2397Returns the inventory of the object _and_ their inventories, recursively. 2614Returns the inventory of the object I<and> their inventories, recursively,
2615but I<not> the object itself.
2398 2616
2399=cut 2617=cut
2400 2618
2401sub inv_recursive_; 2619sub inv_recursive_;
2402sub inv_recursive_ { 2620sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2625 inv_recursive_ inv $_[0]
2408} 2626}
2409 2627
2410=item $ref = $ob->ref 2628=item $ref = $ob->ref
2411 2629
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2630Creates and returns a persistent reference to an object that can be stored as a string.
2413 2631
2414=item $ob = cf::object::deref ($refstring) 2632=item $ob = cf::object::deref ($refstring)
2415 2633
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2634returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2635even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2667can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2668dialogue with the given NPC character.
2451 2669
2452=cut 2670=cut
2453 2671
2672our $SAY_CHANNEL = {
2673 id => "say",
2674 title => "Map",
2675 reply => "say ",
2676 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2677};
2678
2679our $CHAT_CHANNEL = {
2680 id => "chat",
2681 title => "Chat",
2682 reply => "chat ",
2683 tooltip => "Player chat and shouts, global to the server.",
2684};
2685
2454# rough implementation of a future "reply" method that works 2686# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2687# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2688#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2689sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2690 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2701 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2702 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2703
2472 } else { 2704 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2705 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2706 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2707 }
2476 } 2708 }
2477} 2709}
2478 2710
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2711=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2736
2505=item $player_object->enter_link 2737=item $player_object->enter_link
2506 2738
2507Freezes the player and moves him/her to a special map (C<{link}>). 2739Freezes the player and moves him/her to a special map (C<{link}>).
2508 2740
2509The player should be reasonably safe there for short amounts of time. You 2741The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2742for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2743though, as the player cannot control the character while it is on the link
2744map.
2511 2745
2512Will never block. 2746Will never block.
2513 2747
2514=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2515 2749
2535sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2536 my ($self) = @_; 2770 my ($self) = @_;
2537 2771
2538 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2539 2773
2774 ++$self->{_link_recursion};
2775
2540 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2541 2777
2542 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2543 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2544 2780
2545 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2546} 2782}
2547 2783
2548sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2549 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2550 2786
2567 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2569 2805
2570 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2573 2809
2574 $map->load; 2810 $map->load;
2575 $map->load_neighbours;
2576 2811
2577 return unless $self->contr->active; 2812 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2813
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2582} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2583 2821
2822}
2823
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2824=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2585 2825
2586Moves the player to the given map-path and coordinates by first freezing 2826Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2828that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2829the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2830be called at the end of this process.
2591 2831
2832Note that $check will be called with a potentially non-loaded map, so if
2833it needs a loaded map it has to call C<< ->load >>.
2834
2592=cut 2835=cut
2593 2836
2594our $GOTOGEN; 2837our $GOTOGEN;
2595 2838
2596sub cf::object::player::goto { 2839sub cf::object::player::goto {
2597 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2841
2842 if ($self->{_link_recursion} >= $MAX_LINKS) {
2843 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2844 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2845 ($path, $x, $y) = @$EMERGENCY_POSITION;
2846 }
2598 2847
2599 # do generation counting so two concurrent goto's will be executed in-order 2848 # do generation counting so two concurrent goto's will be executed in-order
2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2601 2850
2602 $self->enter_link; 2851 $self->enter_link;
2622 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2623 } 2872 }
2624 } 2873 }
2625 2874
2626 my $map = eval { 2875 my $map = eval {
2627 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2628 2877
2629 if ($map) { 2878 if ($map) {
2630 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2631 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2632 } else { 2881 } else {
2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2882 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2634 } 2883 }
2635 2884
2636 $map 2885 $map
2644 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2645 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2646 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2647 } 2896 }
2648 2897
2649 $done->() if $done; 2898 $done->($self) if $done;
2650 })->prio (1); 2899 })->prio (1);
2651} 2900}
2652 2901
2653=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2654 2903
2674} 2923}
2675 2924
2676sub prepare_random_map { 2925sub prepare_random_map {
2677 my ($exit) = @_; 2926 my ($exit) = @_;
2678 2927
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2928 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2929 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2930 # that depends on the exit object
2684 2931
2685 my $rmp = parse_random_map_params $exit->msg; 2932 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2934 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2935 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2936 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2937 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2938 $rmp->{origin_y} = $exit->y;
2939
2940 $exit->map->touch;
2692 } 2941 }
2693 2942
2694 $rmp->{random_seed} ||= $exit->random_seed; 2943 $rmp->{random_seed} ||= $exit->random_seed;
2695 2944
2696 my $data = cf::encode_json $rmp; 2945 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2946 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2947 my $meta = "$RANDOMDIR/$md5.meta";
2699 2948
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2949 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2950 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2951 undef $fh;
2703 aio_rename "$meta~", $meta; 2952 aio_rename "$meta~", $meta;
2704 2953
2954 my $slaying = "?random/$md5";
2955
2956 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2957 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2958 $exit->msg (undef);
2959 }
2707 } 2960 }
2708} 2961}
2709 2962
2710sub cf::object::player::enter_exit { 2963sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2964 my ($self, $exit) = @_;
2712 2965
2713 return unless $self->type == cf::PLAYER; 2966 return unless $self->type == cf::PLAYER;
2714 2967
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2968 $self->enter_link;
2727 2969
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2970 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2971 $Coro::current->{desc} = "enter_exit";
2734 2972
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2973 unless (eval {
2974 $self->deactivate_recursive; # just to be sure
2975
2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2977 my $x = $exit->stats->hp;
2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
3002
2737 $self->goto ($slaying, $hp, $sp); 3003 $self->goto ($map, $x, $y);
2738 3004
3005 # if exit is damned, update players death & WoR home-position
3006 $self->contr->savebed ($map, $x, $y)
3007 if $exit->flag (cf::FLAG_DAMNED);
3008
2739 1; 3009 1
2740 }) { 3010 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 3012 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2745 3015
2746 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2747 $self->leave_link; 3017 $self->leave_link;
2748 } 3018 }
2749 })->prio (1); 3019 })->prio (1);
2750} 3020}
2751 3021
2763sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2765 3035
2766 utf8::encode $text; 3036 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3037 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3038}
3039
3040=item $client->send_big_packet ($pkt)
3041
3042Like C<send_packet>, but tries to compress large packets, and fragments
3043them as required.
3044
3045=cut
3046
3047our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3048
3049sub cf::client::send_big_packet {
3050 my ($self, $pkt) = @_;
3051
3052 # try lzf for large packets
3053 $pkt = "lzf " . Compress::LZF::compress $pkt
3054 if 1024 <= length $pkt and $self->{can_lzf};
3055
3056 # split very large packets
3057 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3058 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3059 $pkt = "frag";
3060 }
3061
3062 $self->send_packet ($pkt);
2768} 3063}
2769 3064
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 3066
2772Send a drawinfo or msg packet to the client, formatting the msg for the 3067Send a drawinfo or msg packet to the client, formatting the msg for the
2776 3071
2777=cut 3072=cut
2778 3073
2779# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2781 "c/identify" => { 3082 "c/identify" => {
2782 id => "infobox", 3083 id => "infobox",
2783 title => "Identify", 3084 title => "Identify",
2784 reply => undef, 3085 reply => undef,
2785 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2787 "c/examine" => { 3088 "c/examine" => {
2788 id => "infobox", 3089 id => "infobox",
2789 title => "Examine", 3090 title => "Examine",
2790 reply => undef, 3091 reply => undef,
2791 tooltip => "Signs and other items you examined", 3092 tooltip => "Signs and other items you examined",
3093 },
3094 "c/shopinfo" => {
3095 id => "infobox",
3096 title => "Shop Info",
3097 reply => undef,
3098 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 3099 },
2793 "c/book" => { 3100 "c/book" => {
2794 id => "infobox", 3101 id => "infobox",
2795 title => "Book", 3102 title => "Book",
2796 reply => undef, 3103 reply => undef,
2812 id => "infobox", 3119 id => "infobox",
2813 title => "Body Parts", 3120 title => "Body Parts",
2814 reply => undef, 3121 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2816 }, 3123 },
3124 "c/statistics" => {
3125 id => "infobox",
3126 title => "Statistics",
3127 reply => undef,
3128 tooltip => "Shows your primary statistics",
3129 },
3130 "c/skills" => {
3131 id => "infobox",
3132 title => "Skills",
3133 reply => undef,
3134 tooltip => "Shows your experience per skill and item power",
3135 },
3136 "c/shopitems" => {
3137 id => "infobox",
3138 title => "Shop Items",
3139 reply => undef,
3140 tooltip => "Shows the items currently for sale in this shop",
3141 },
3142 "c/resistances" => {
3143 id => "infobox",
3144 title => "Resistances",
3145 reply => undef,
3146 tooltip => "Shows your resistances",
3147 },
3148 "c/pets" => {
3149 id => "infobox",
3150 title => "Pets",
3151 reply => undef,
3152 tooltip => "Shows information abotu your pets/a specific pet",
3153 },
3154 "c/perceiveself" => {
3155 id => "infobox",
3156 title => "Perceive Self",
3157 reply => undef,
3158 tooltip => "You gained detailed knowledge about yourself",
3159 },
2817 "c/uptime" => { 3160 "c/uptime" => {
2818 id => "infobox", 3161 id => "infobox",
2819 title => "Uptime", 3162 title => "Uptime",
2820 reply => undef, 3163 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 3167 id => "infobox",
2825 title => "Map Info", 3168 title => "Map Info",
2826 reply => undef, 3169 reply => undef,
2827 tooltip => "Information related to the maps", 3170 tooltip => "Information related to the maps",
2828 }, 3171 },
3172 "c/party" => {
3173 id => "party",
3174 title => "Party",
3175 reply => "gsay ",
3176 tooltip => "Messages and chat related to your party",
3177 },
3178 "c/death" => {
3179 id => "death",
3180 title => "Death",
3181 reply => undef,
3182 tooltip => "Reason for and more info about your most recent death",
3183 },
3184 "c/say" => $SAY_CHANNEL,
3185 "c/chat" => $CHAT_CHANNEL,
2829); 3186);
2830 3187
2831sub cf::client::send_msg { 3188sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2833 3190
2834 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2835 3193
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 3195
2838 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2841 3199
2842 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2846 3202
2847 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 3208 }
2854 3209
2855 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2856 } 3211 }
2857 3212
2858 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2859 3214
2860 if ($self->can_msg) {
2861 # default colour, mask it out 3215 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2864 3218
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 3222 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 3223
2879 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 3225}
2893 3226
2894=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2895 3228
2896Sends an ext event to the client. 3229Sends an ext event to the client.
2899 3232
2900sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2902 3235
2903 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3241 }
2909} 3242}
2910 3243
2911=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2912 3245
2915=cut 3248=cut
2916 3249
2917sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2919 3252
2920 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 }
2927} 3256}
2928 3257
2929=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2930 3259
2931Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2986 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2987 3316
2988 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2989 3318
2990 if (ref $msg) { 3319 if (ref $msg) {
2991 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2992 "ARRAY" eq ref $msg
2993 ? @$msg
2994 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2995 3321
2996 my @reply; 3322 my @reply;
2997 3323
2998 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
2999 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3001 3327
3002 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3003 if $reply; 3329 if $reply;
3004 3330
3005 } else { 3331 } else {
3006 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3007 } 3333 }
3008 3334
3009 cf::override; 3335 cf::override;
3010 }, 3336 },
3011); 3337);
3031 3357
3032 $coro 3358 $coro
3033} 3359}
3034 3360
3035cf::client->attach ( 3361cf::client->attach (
3036 on_destroy => sub { 3362 on_client_destroy => sub {
3037 my ($ns) = @_; 3363 my ($ns) = @_;
3038 3364
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3366 },
3041); 3367);
3057our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3058 3384
3059$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3060 3386
3061$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3064 sort time 3390 sort time
3065)); 3391));
3066 3392
3067# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3070 3396
3071The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3072 3398
3073 cf::object 3399 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3400 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3401 insert remove name archname title slaying race decrease split
3402 value
3076 3403
3077 cf::object::player 3404 cf::object::player
3078 player 3405 player
3079 3406
3080 cf::player 3407 cf::player
3085 3412
3086=cut 3413=cut
3087 3414
3088for ( 3415for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3416 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3095) { 3422) {
3096 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3099 for @funs; 3425 for @funs;
3100} 3426}
3101 3427
3116 3442
3117 my $qcode = $code; 3443 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3120 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3121 local $_; 3450 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3451
3124 my $eval = 3452 my $eval =
3125 "do {\n" 3453 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3456 . $code
3129 . "\n}" 3457 . "\n}"
3130 ; 3458 ;
3131 3459
3460 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3464 sub_generation_inc;
3465 } else {
3466 local @cf::_safe_eval_args = values %vars;
3467 @res = wantarray ? eval eval : scalar eval $eval;
3468 }
3135 3469
3136 if ($@) { 3470 if ($@) {
3137 warn "$@"; 3471 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3140 } 3474 }
3141 3475
3142 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3143} 3477}
3144 3478
3158=cut 3492=cut
3159 3493
3160sub register_script_function { 3494sub register_script_function {
3161 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3162 3496
3163 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3165} 3499}
3166 3500
3167=back 3501=back
3168 3502
3169=cut 3503=cut
3178 # for this (global event?) 3512 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3514
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3516
3183 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3184 3518
3185 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3186 0 < aio_load $path, $facedata
3187 or die "$path: $!";
3188
3189 $facedata = Coro::Storable::thaw $facedata;
3190 3520
3191 $facedata->{version} == 2 3521 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3523
3194 # patch in the exptable 3524 # patch in the exptable
3525 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3526 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3527 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3528 data => $exp_table,
3529 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3530 };
3199 cf::cede_to_tick; 3531 cf::cede_to_tick;
3200 3532
3201 { 3533 {
3202 my $faces = $facedata->{faceinfo}; 3534 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3536 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3537 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3538
3207 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3542 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3543 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3211 3544
3212 cf::cede_to_tick; 3545 cf::cede_to_tick;
3213 } 3546 }
3214 3547
3215 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
3220 3553
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3557 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3559 }
3227 3560
3228 cf::cede_to_tick; 3561 cf::cede_to_tick;
3229 } 3562 }
3230 } 3563 }
3239 3572
3240 cf::anim::invalidate_all; # d'oh 3573 cf::anim::invalidate_all; # d'oh
3241 } 3574 }
3242 3575
3243 { 3576 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3247 3578
3248 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3583
3253 if ($info->{type} & 1) { 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3585 cf::face::set_type $idx, $type;
3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3268 } else { 3587 } else {
3269 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3270 } 3589 }
3271 3590
3272 cf::cede_to_tick; 3591 cf::cede_to_tick;
3273 } 3592 }
3274 } 3593 }
3275 3594
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3596
3278 1 3597 1
3279} 3598}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3599
3301register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3303 3602
3304 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3604 $ns->fx_want ($k, $v);
3306 } 3605 }
3307}; 3606};
3607
3608sub load_resource_file($) {
3609 my $guard = lock_acquire "load_resource_file";
3610
3611 my $status = load_resource_file_ $_[0];
3612 get_slot 0.1, 100;
3613 cf::arch::commit_load;
3614
3615 $status
3616}
3308 3617
3309sub reload_regions { 3618sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3619 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3620 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3621 %ext::player_env::MUSIC_FACE_CACHE = ();
3326} 3635}
3327 3636
3328sub reload_archetypes { 3637sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3638 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3639 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3640}
3337 3641
3338sub reload_treasures { 3642sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3341} 3645}
3342 3646
3647sub reload_sound {
3648 trace "loading sound config from $DATADIR/sound\n";
3649
3650 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3651
3652 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3653 my $sound = $soundconf->{compat}[$_]
3654 or next;
3655
3656 my $face = cf::face::find "sound/$sound->[1]";
3657 cf::sound::set $sound->[0] => $face;
3658 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3659 }
3660
3661 while (my ($k, $v) = each %{$soundconf->{event}}) {
3662 my $face = cf::face::find "sound/$v";
3663 cf::sound::set $k => $face;
3664 }
3665}
3666
3343sub reload_resources { 3667sub reload_resources {
3344 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3345 3669
3670 reload_exp_table;
3671 reload_materials;
3672 reload_facedata;
3673 reload_sound;
3674 reload_archetypes;
3346 reload_regions; 3675 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3676 reload_treasures;
3351 3677
3352 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3353}
3354
3355sub init {
3356 reload_resources;
3357} 3679}
3358 3680
3359sub reload_config { 3681sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3682 trace "reloading config file...\n";
3361 or return;
3362 3683
3363 local $/; 3684 my $config = load_file "$CONFDIR/config";
3364 *CFG = YAML::Load <$fh>; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3365 3687
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3689
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3690 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3691 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3692
3371 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
3375 }; 3697 };
3376 warn $@ if $@; 3698 warn $@ if $@;
3377 } 3699 }
3378} 3700}
3379 3701
3702sub pidfile() {
3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3704 or die "$PIDFILE: $!";
3705 flock $fh, &Fcntl::LOCK_EX
3706 or die "$PIDFILE: flock: $!";
3707 $fh
3708}
3709
3710# make sure only one server instance is running at any one time
3711sub atomic {
3712 my $fh = pidfile;
3713
3714 my $pid = <$fh>;
3715 kill 9, $pid if $pid > 0;
3716
3717 seek $fh, 0, 0;
3718 print $fh $$;
3719}
3720
3721sub main_loop {
3722 trace "EV::loop starting\n";
3723 if (1) {
3724 EV::loop;
3725 }
3726 trace "EV::loop returned\n";
3727 goto &main_loop unless $REALLY_UNLOOP;
3728}
3729
3380sub main { 3730sub main {
3731 cf::init_globals; # initialise logging
3732
3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3734 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3737
3738 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3739
3381 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3742 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3743 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3744 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3745 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3746 })->prio (Coro::PRIO_MAX);
3388 }; 3747 };
3389 3748
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3749 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3750
3751 cf::sync_job {
3752 cf::incloader::init ();
3753
3754 cf::init_anim;
3755 cf::init_attackmess;
3756 cf::init_dynamic;
3757
3758 cf::load_settings;
3759
3760 reload_resources;
3761 reload_config;
3762 db_init;
3763
3764 cf::init_uuid;
3765 cf::init_signals;
3766 cf::init_skills;
3767
3768 cf::init_beforeplay;
3769
3770 atomic;
3771
3772 load_extensions;
3773
3774 utime time, time, $RUNTIMEFILE;
3775
3776 # no (long-running) fork's whatsoever before this point(!)
3777 use POSIX ();
3778 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3779
3780 cf::_post_init 0;
3781 };
3782
3783 cf::object::thawer::errors_are_fatal 0;
3784 info "parse errors in files are no longer fatal from this point on.\n";
3785
3786 AE::postpone {
3787 undef &main; # free gobs of memory :)
3788 };
3789
3790 goto &main_loop;
3397} 3791}
3398 3792
3399############################################################################# 3793#############################################################################
3400# initialisation and cleanup 3794# initialisation and cleanup
3401 3795
3402# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3403BEGIN { 3797BEGIN {
3404 our %SIGWATCHER = (); 3798 our %SIGWATCHER = ();
3405 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3406 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3407 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3408 }; 3802 };
3409 } 3803 }
3410} 3804}
3411 3805
3412sub write_runtime_sync { 3806sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3807 my $t0 = AE::time;
3414 3808
3415 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3417 3811
3418 IO::AIO::aio_utime $runtime, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3813
3420 my $guard = cf::lock_acquire "write_runtime"; 3814 my $guard = cf::lock_acquire "write_runtime";
3421 3815
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3816 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3817 or return;
3424 3818
3425 my $value = $cf::RUNTIME + 90 + 10; 3819 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3820 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3821 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3831 aio_utime $fh, undef, undef;
3438 3832
3439 close $fh 3833 close $fh
3440 or return; 3834 or return;
3441 3835
3442 aio_rename "$runtime~", $runtime 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3837 and return;
3444 3838
3445 warn "runtime file written.\n"; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3446 3840
3447 1 3841 1
3448} 3842}
3449 3843
3450our $uuid_lock; 3844our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3853 my $uuid = "$LOCALDIR/uuid";
3460 3854
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3855 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3856 or return;
3463 3857
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3859
3860 unless ($value) {
3861 info "cowardly refusing to write zero uuid value!\n";
3862 return;
3863 }
3864
3865 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3866 $uuid_skip = 0;
3466 3867
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3868 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3869 and return;
3469 3870
3475 or return; 3876 or return;
3476 3877
3477 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3478 and return; 3879 and return;
3479 3880
3480 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3481 3882
3482 1 3883 1
3483 3884
3484} 3885}
3485 3886
3491} 3892}
3492 3893
3493sub emergency_save() { 3894sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3495 3896
3496 warn "enter emergency perl save\n"; 3897 info "emergency_perl_save: enter\n";
3898
3899 # this is a trade-off: we want to be very quick here, so
3900 # save all maps without fsync, and later call a global sync
3901 # (which in turn might be very very slow)
3902 local $USE_FSYNC = 0;
3497 3903
3498 cf::sync_job { 3904 cf::sync_job {
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3499 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3913 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3915 $pl->save;
3508 } 3916 }
3509 warn "end emergency player save\n"; 3917 info "emergency_perl_save: end player save\n";
3510 3918
3511 warn "begin emergency map save\n"; 3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3921 info "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3924 $map->valid or next;
3515 $map->save; 3925 $map->save;
3516 } 3926 }
3517 warn "end emergency map save\n"; 3927 info "emergency_perl_save: end map save\n";
3518 3928
3519 warn "begin emergency database checkpoint\n"; 3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3931 info "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3522 3934
3523 warn "begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3936 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3937 info "emergency_perl_save: end write uuid\n";
3938
3939 cf::write_runtime_sync; # external watchdog should not bark
3940
3941 trace "emergency_perl_save: syncing database to disk";
3942 BDB::db_env_txn_checkpoint $DB_ENV;
3943
3944 info "emergency_perl_save: starting sync\n";
3945 IO::AIO::aio_sync sub {
3946 info "emergency_perl_save: finished sync\n";
3947 };
3948
3949 cf::write_runtime_sync; # external watchdog should not bark
3950
3951 trace "emergency_perl_save: flushing outstanding aio requests";
3952 while (IO::AIO::nreqs || BDB::nreqs) {
3953 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3954 }
3955
3956 cf::write_runtime_sync; # external watchdog should not bark
3526 }; 3957 };
3527 3958
3528 warn "leave emergency perl save\n"; 3959 info "emergency_perl_save: leave\n";
3529} 3960}
3530 3961
3531sub post_cleanup { 3962sub post_cleanup {
3532 my ($make_core) = @_; 3963 my ($make_core) = @_;
3533 3964
3965 IO::AIO::flush;
3966
3534 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3968 if $make_core;
3969
3970 my $fh = pidfile;
3971 unlink $PIDFILE if <$fh> == $$;
3972}
3973
3974# a safer delete_package, copied from Symbol
3975sub clear_package($) {
3976 my $pkg = shift;
3977
3978 # expand to full symbol table name if needed
3979 unless ($pkg =~ /^main::.*::$/) {
3980 $pkg = "main$pkg" if $pkg =~ /^::/;
3981 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3982 $pkg .= '::' unless $pkg =~ /::$/;
3983 }
3984
3985 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3986 my $stem_symtab = *{$stem}{HASH};
3987
3988 defined $stem_symtab and exists $stem_symtab->{$leaf}
3989 or return;
3990
3991 # clear all symbols
3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3993 for my $name (keys %$leaf_symtab) {
3994 _gv_clear *{"$pkg$name"};
3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3996 }
3536} 3997}
3537 3998
3538sub do_reload_perl() { 3999sub do_reload_perl() {
3539 # can/must only be called in main 4000 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3541 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3542 return; 4003 return;
3543 } 4004 }
3544 4005
3545 warn "reloading..."; 4006 return if $RELOAD++;
3546 4007
3547 warn "entering sync_job"; 4008 my $t1 = AE::time;
3548 4009
4010 while ($RELOAD) {
4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
4013
4014 trace "perl_reload: entering sync_job";
4015
3549 cf::sync_job { 4016 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 4017 #cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark
3553 4018
3554 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV;
3556
3557 # if anything goes wrong in here, we should simply crash as we already saved
3558
3559 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs;
3565 warn "iterate...";
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = (); 4021 %EXT_CORO = ();
3573 4022
3574 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3575 %COMMAND = (); 4024 %COMMAND = ();
3576 4025
3577 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3578 %EXTCMD = (); 4027 %EXTCMD = ();
3579 %EXTICMD = (); 4028 %EXTICMD = ();
3580 4029
3581 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3582 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3584 4033
3585 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3586 eval { 4035 eval {
3587 $cb->($pkg); 4036 $cb->($pkg);
3588 1 4037 1
3589 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
4039 }
4040
4041 trace "... clearing $pkg";
4042 clear_package $pkg;
3590 } 4043 }
3591 4044
3592 warn "... nuking $pkg";
3593 Symbol::delete_package $pkg;
3594 }
3595
3596 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3597 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 4048
3600 warn "... unloading $k"; 4049 trace "... unloading $k";
3601 delete $INC{$k}; 4050 delete $INC{$k};
3602 4051
3603 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3605 4054
3606 if (my $cb = $k->can ("unload_module")) { 4055 if (my $cb = $k->can ("unload_module")) {
3607 $cb->(); 4056 $cb->();
4057 }
4058
4059 clear_package $k;
3608 } 4060 }
3609 4061
3610 Symbol::delete_package $k;
3611 }
3612
3613 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 4063 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4064 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 4065
3617 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 4069
3621 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3622 # and global variables created in xs 4071 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3624 4073
3625 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3626 4075
3627 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3628 require cf; 4077 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4078 cf::_connect_to_perl_1;
3630 4079
3631 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3632 cf::reload_config; 4081 cf::reload_config;
3633 4082
3634 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3635 cf::load_extensions; 4084 cf::load_extensions;
3636 4085
4086 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3640 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
4093 }
3643 4094
3644 warn "leaving sync_job"; 4095 cf::_post_init 1;
3645 4096
4097 trace "perl_reload: leaving sync_job";
4098
3646 1 4099 1
3647 } or do { 4100 } or do {
3648 warn $@; 4101 error $@;
3649 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
4103 };
4104
4105 --$RELOAD;
3650 }; 4106 }
3651 4107
3652 warn "reloaded"; 4108 $t1 = AE::time - $t1;
4109 info "perl_reload: completed in ${t1}s\n";
3653}; 4110};
3654 4111
3655our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3656 4113
3657sub reload_perl() { 4114sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 4115 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3660 4117
4118 $RELOAD_WATCHER ||= cf::async {
4119 Coro::AIO::aio_wait cache_extensions;
4120
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 4122 do_reload_perl;
3663 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
4124 };
3664 }; 4125 };
3665} 4126}
3666 4127
3667register_command "reload" => sub { 4128register_command "reload" => sub {
3668 my ($who, $arg) = @_; 4129 my ($who, $arg) = @_;
3674 reload_perl; 4135 reload_perl;
3675 }; 4136 };
3676 } 4137 }
3677}; 4138};
3678 4139
3679unshift @INC, $LIBDIR; 4140#############################################################################
3680 4141
3681my $bug_warning = 0; 4142my $bug_warning = 0;
3682 4143
3683our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN;
3685
3686sub wait_for_tick { 4144sub wait_for_tick() {
3687 return if tick_inhibit; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3688 return if $Coro::current == $Coro::main;
3689 4146
3690 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3691 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait;
3693} 4148}
3694 4149
3695sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3696 return if tick_inhibit; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3697 return if $Coro::current == $Coro::main;
3698 4152
3699 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 4155 $signal->wait;
3702} 4156}
3706 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4160 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3707 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3708 return; 4162 return;
3709 } 4163 }
3710 4164
3711 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
4166
4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3712 4168
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 4171 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3717 write_runtime_sync 4173 write_runtime_sync
3718 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3719 }; 4175 };
3720 } 4176 }
3721 4177
3722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3723 $sig->send; 4179 $sig->send;
3724 } 4180 }
3725 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3726 $sig->send;
3727 }
3728 4182
3729 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3730 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3731 4185
3732 if (0) { 4186 if (0) {
3733 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3734 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3735 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3736 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3737 } 4191 }
3738 } 4192 }
3739} 4193}
3740 4194
3741{ 4195{
3742 # configure BDB 4196 # configure BDB
3743 4197
3744 BDB::min_parallel 8; 4198 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3747 4201
3748 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 4205 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4206 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4207 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4208 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 4209
3755 cf::sync_job { 4210 cf::sync_job {
3756 eval { 4211 eval {
3782{ 4237{
3783 # configure IO::AIO 4238 # configure IO::AIO
3784 4239
3785 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4242 undef $AnyEvent::AIO::WATCHER;
3788} 4243}
3789 4244
3790my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
3791 4247
3792sub _log_backtrace { 4248sub _log_backtrace {
3793 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
3794 4250
3795 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
3796 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3797 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
3799 ++$_log_backtrace; 4259 ++$_log_backtrace;
4260 my $perl_bt = Carp::longmess $msg;
3800 async { 4261 async {
3801 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
3802 4263
3803 my @bt = fork_call { 4264 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4265 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4276 }
3816 4277
3817 @funcs 4278 @funcs
3818 }; 4279 };
3819 4280
3820 LOG llevInfo, "[ABT] $msg\n"; 4281 LOG llevInfo, "[ABT] $perl_bt\n";
4282 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4284 --$_log_backtrace;
3823 }; 4285 };
3824 } else { 4286 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3827 } 4289 }
3828} 4290}
3829 4291
3830# load additional modules 4292# load additional modules
3831use cf::pod; 4293require "cf/$_.pm" for @EXTRA_MODULES;
4294cf::_connect_to_perl_2;
3832 4295
3833END { cf::emergency_save } 4296END { cf::emergency_save }
3834 4297
38351 42981
3836 4299

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines