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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.582 by root, Fri Feb 3 03:01:45 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.1 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.51 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 75
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
63our $DATADIR = datadir; 99our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
67our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
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;
73 120
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 123our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
81 125
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 129our $DB_ENV;
87 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
88our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
89 135
90our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
139our $NOW;
92 140
93our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
96 144
97# used to convert map paths into valid unix filenames by replacing / by ∕ 145# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 146our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 147
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 148our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 149our $LOADAVG; # same thing, but with alpha-smoothing
150our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 151our $TICK_START; # for load detecting purposes
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;
103 160
104binmode STDOUT; 161binmode STDOUT;
105binmode STDERR; 162binmode STDERR;
106 163
107# read virtual server time, if available 164# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 165unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 166 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 167 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 168 $RUNTIME = <$fh> + 0.;
112} 169}
170
171eval "sub TICK() { $TICK } 1" or die;
113 172
114mkdir $_ 173mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 174 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 175
117our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
118 177
119sub cf::map::normalise; 178sub cf::map::normalise;
120 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
121############################################################################# 184#############################################################################
122 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
123=head2 GLOBAL VARIABLES 197=head2 GLOBAL VARIABLES
124 198
125=over 4 199=over 4
126 200
127=item $cf::UPTIME 201=item $cf::UPTIME
128 202
129The 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.
130 219
131=item $cf::RUNTIME 220=item $cf::RUNTIME
132 221
133The 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
134every server tick. 223every server tick.
140Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
141directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
142unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
143database environment. 232database environment.
144 233
145=item $cf::NOW
146
147The time of the last (current) server tick.
148
149=item $cf::TICK
150
151The interval between server ticks, in seconds.
152
153=item $cf::LOADAVG 234=item $cf::LOADAVG
154 235
155The 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
156(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
157objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
166from wherever your confdir points to. 247from wherever your confdir points to.
167 248
168=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
169 250
170These 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
171returns 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
172per 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.
173 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
174=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
175 273
176This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
177C<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
178that call. 276that call.
179 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
180=back 284=back
181 285
182=cut 286=cut
183 287
184BEGIN { 288sub error(@) { LOG llevError, join "", @_ }
185 *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 {
186 my $msg = join "", @_; 295 my $msg = join "", @_;
187 296
188 $msg .= "\n" 297 $msg .= "\n"
189 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
190 299
191 $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;
192 301
193 LOG llevError, $msg; 302 LOG llevWarn, $msg;
194 }; 303};
195} 304
305$Coro::State::DIEHOOK = sub {
306 return unless $^S eq 0; # "eq", not "=="
307
308 error Carp::longmess $_[0];
309
310 if (in_main) {#d#
311 error "DIEHOOK called in main context, Coro bug?\n";#d#
312 return;#d#
313 }#d#
314
315 # kill coroutine otherwise
316 Coro::terminate
317};
196 318
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 319@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 320@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 321@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 322@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 329for my $pkg (qw(
208 cf::global cf::attachable 330 cf::global cf::attachable
209 cf::object cf::object::player 331 cf::object cf::object::player
210 cf::client cf::player 332 cf::client cf::player
211 cf::arch cf::living 333 cf::arch cf::living
334 cf::map cf::mapspace
212 cf::map cf::party cf::region 335 cf::party cf::region
213)) { 336)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 338}
217 339
218$EV::DIED = sub { 340$EV::DIED = sub {
219 warn "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
220}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
221 348
222############################################################################# 349#############################################################################
223 350
224=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
225 352
246 $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;
247 $d 374 $d
248 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
249} 376}
250 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
251=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
252 431
253Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
254 433
255=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
261our $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
262 441
263sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
264sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
265 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
266=item cf::lock_wait $string 507=item cf::lock_wait $string
267 508
268Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
269 510
270=item my $lock = cf::lock_acquire $string 511=item my $lock = cf::lock_acquire $string
271 512
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 515for example when the coroutine gets canceled), the lock is automatically
275returned. 516returned.
276 517
277Locks 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
278deadlocked coro. 519deadlocked coro.
284 525
285Return 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.
286 527
287=cut 528=cut
288 529
289our %LOCK; 530our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 531
292sub lock_wait($) { 532sub lock_wait($) {
293 my ($key) = @_; 533 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 534}
306 535
307sub lock_acquire($) { 536sub lock_acquire($) {
308 my ($key) = @_; 537 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 538}
322 539
323sub lock_active($) { 540sub lock_active($) {
324 my ($key) = @_; 541 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 542}
328 543
329sub freeze_mainloop { 544sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 545 tick_inhibit_inc;
331 546
332 my $guard = Coro::guard { 547 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 548}
338 549
339=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
340 551
341Like 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
342get spread over timer. 553get spread over time.
343 554
344=cut 555=cut
345 556
346sub periodic($$) { 557sub periodic($$) {
347 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
351 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
352} 563}
353 564
354=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
355 566
356Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
357This 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
358of 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.
359 574
360The 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
361used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
362 577
363Useful for short background jobs. 578Useful for short background jobs.
364 579
365=cut 580=cut
366 581
367our @SLOT_QUEUE; 582our @SLOT_QUEUE;
368our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
369 585
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
373 589
374 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
375 592
376 while () { 593 while () {
377 next_job: 594 next_job:
595
378 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 597
380 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 602 $job->[2]->send;
384 Coro::cede; 603 Coro::cede;
385 goto next_job; 604 goto next_job;
386 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 607 }
388 } 608 }
389 609
390 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
391 # 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
392 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
393 $signal->wait;
394 } else { 613 } else {
614 $busy = 0;
395 Coro::schedule; 615 Coro::schedule;
396 } 616 }
397 } 617 }
398}; 618};
399 619
400sub get_slot($;$$) { 620sub get_slot($;$$) {
621 return if tick_inhibit || $Coro::current == $Coro::main;
622
401 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
402 624
403 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
404 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
405 628
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
434=cut 657=cut
435 658
436sub sync_job(&) { 659sub sync_job(&) {
437 my ($job) = @_; 660 my ($job) = @_;
438 661
439 if ($Coro::current == $Coro::main) { 662 if (in_main) {
440 my $time = EV::time; 663 my $time = AE::time;
441 664
442 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
444 667
445 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
446 669
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
450 671
451 my $busy = 1; 672 my $busy = 1;
452 my @res; 673 my @res;
453 674
454 (async { 675 (async {
455 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 677 @res = eval { $job->() };
457 warn $@ if $@; 678 error $@ if $@;
458 undef $busy; 679 undef $busy;
459 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
460 681
461 while ($busy) { 682 while ($busy) {
462 if (Coro::nready) { 683 if (Coro::nready) {
464 } else { 685 } else {
465 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
466 } 687 }
467 } 688 }
468 689
469 $time = EV::time - $time; 690 my $time = AE::time - $time;
470 691
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
475 693
476 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
477 } else { 695 } else {
478 # we are in another coroutine, how wonderful, everything just works 696 # we are in another coroutine, how wonderful, everything just works
479 697
499 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
500 718
501 $coro 719 $coro
502} 720}
503 721
504=item fork_call { }, $args 722=item fork_call { }, @args
505 723
506Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
507process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
508Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
509never block itself or use any form of event handling. 727never block itself or use any form of event handling.
510 728
511=cut 729=cut
512 730
731sub post_fork {
732 reset_signals;
733}
734
513sub fork_call(&@) { 735sub fork_call(&@) {
514 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
515 737
516 # 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,
517 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
518 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
519 741
520 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
521 reset_signals; 743 cf::post_fork;
522 &$cb 744 &$cb
523 }, @args; 745 } @args;
524 746
525 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 )
759}
760
761=item $coin = coin_from_name $name
762
763=cut
764
765our %coin_alias = (
766 "silver" => "silvercoin",
767 "silvercoin" => "silvercoin",
768 "silvercoins" => "silvercoin",
769 "gold" => "goldcoin",
770 "goldcoin" => "goldcoin",
771 "goldcoins" => "goldcoin",
772 "platinum" => "platinacoin",
773 "platinumcoin" => "platinacoin",
774 "platinumcoins" => "platinacoin",
775 "platina" => "platinacoin",
776 "platinacoin" => "platinacoin",
777 "platinacoins" => "platinacoin",
778 "royalty" => "royalty",
779 "royalties" => "royalty",
780);
781
782sub coin_from_name($) {
783 $coin_alias{$_[0]}
784 ? cf::arch::find $coin_alias{$_[0]}
785 : undef
526} 786}
527 787
528=item $value = cf::db_get $family => $key 788=item $value = cf::db_get $family => $key
529 789
530Returns a single value from the environment database. 790Returns a single value from the environment database.
540within each server. 800within each server.
541 801
542=cut 802=cut
543 803
544sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
545 my ($name) = @_; 808 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
547 810
548 eval { 811 eval {
549 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
559} 822}
560 823
561our $DB; 824our $DB;
562 825
563sub db_init { 826sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
566 };
567} 828}
568 829
569sub db_get($$) { 830sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
571 832
572 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
573 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
574 837
575 $! ? () 838 $! ? ()
576 : $data 839 : $data
577 }
578} 840}
579 841
580sub db_put($$$) { 842sub db_put($$$) {
581 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
610 872
611 my @data; 873 my @data;
612 my $md5; 874 my $md5;
613 875
614 for (0 .. $#$src) { 876 for (0 .. $#$src) {
615 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
616 or Carp::croak "$src->[$_]: $!";
617 } 878 }
618 879
619 # if processing is expensive, check 880 # if processing is expensive, check
620 # checksum first 881 # checksum first
621 if (1) { 882 if (1) {
638 899
639 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
640 my $data = $process->(\@data); 901 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
642 903
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 905
645 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
648 909
658 919
659=cut 920=cut
660 921
661sub datalog($@) { 922sub datalog($@) {
662 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 925}
665 926
666=back 927=back
667 928
668=cut 929=cut
669 930
670############################################################################# 931#############################################################################
671 932
672=head2 ATTACHABLE OBJECTS 933=head2 ATTACHABLE OBJECTS
673 934
674Many 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
675attach callbacks/event handlers (a collection of which is called an "attachment") 936attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 937to it. All such attachable objects support the following methods.
677 938
678In 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>
679C<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
729=item cf::CLASS::attachment $name, ... 990=item cf::CLASS::attachment $name, ...
730 991
731Register an attachment by C<$name> through which attachable objects of the 992Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 993given CLASS can refer to this attachment.
733 994
734Some classes such as crossfire maps and objects can specify attachments 995Some classes such as deliantra maps and objects can specify attachments
735that 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.
736 997
737These calls expect any number of the following handler/hook descriptions: 998These calls expect any number of the following handler/hook descriptions:
738 999
739=over 4 1000=over 4
863 1124
864 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 1127
867 } elsif (ref $type) { 1128 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
869 1130
870 } else { 1131 } else {
871 shift @arg; 1132 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
873 } 1134 }
874 } 1135 }
875} 1136}
876 1137
877sub _object_attach { 1138sub _object_attach {
887 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
888 } 1149 }
889 1150
890 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
891 } else { 1152 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1154 }
894 1155
895 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
896} 1157}
897 1158
956 1217
957 for (@$callbacks) { 1218 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
959 1220
960 if ($@) { 1221 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1223 override;
964 } 1224 }
965 1225
966 return 1 if $override; 1226 return 1 if $override;
967 } 1227 }
968 1228
969 0 1229 0
970} 1230}
971 1231
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1232=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1233
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1234=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1235
976Generate an object-specific event with the given arguments. 1236Generate an object-specific event with the given arguments.
977 1237
1030 1290
1031sub reattach { 1291sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1292 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1293 my ($obj) = @_;
1034 1294
1295 # no longer needed after getting rid of delete_package?
1035 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
1036 1297
1037 my $registry = $obj->registry; 1298 my $registry = $obj->registry;
1038 1299
1039 @$registry = (); 1300 @$registry = ();
1040 1301
1045 for (@$attach) { 1306 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1048 } 1309 }
1049 } else { 1310 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1312 }
1052 } 1313 }
1053} 1314}
1054 1315
1055cf::attachable->attach ( 1316cf::attachable->attach (
1082 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1083 1344
1084 sync_job { 1345 sync_job {
1085 if (length $$rdata) { 1346 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1089 1351
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1353 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 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 }
1094 close $fh; 1359 aio_close $fh;
1095 1360
1096 if (@$objs) { 1361 if (@$objs) {
1097 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) {
1098 chmod SAVE_MODE, $fh; 1363 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1101 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 }
1102 close $fh; 1370 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1372 }
1105 } else { 1373 } else {
1106 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1107 } 1375 }
1108 1376
1109 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1381 } else {
1111 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1112 } 1383 }
1113 } else { 1384 } else {
1114 aio_unlink $filename; 1385 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1116 } 1387 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1412 $av = $st->{objs};
1142 } 1413 }
1143 1414
1144 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1147 1419
1148 ($data, $av) 1420 ($data, $av)
1149} 1421}
1150 1422
1151=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1207 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1208 1480
1209 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1210} 1482}
1211 1483
1484use File::Glob ();
1485
1212cf::player->attach ( 1486cf::player->attach (
1213 on_command => sub { 1487 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1215 1489
1216 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1217 or return; 1491 or return;
1218 1492
1226 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1227 1501
1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1229 1503
1230 if (ref $msg) { 1504 if (ref $msg) {
1231 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235 1506
1236 my @reply; 1507 my @reply;
1237 1508
1238 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1239 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1241 1512
1242 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1243 if $reply; 1514 if $reply;
1244 1515
1245 } else { 1516 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1518 }
1248 1519
1249 cf::override; 1520 cf::override;
1250 }, 1521 },
1251); 1522);
1252 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
1253sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1254 cf::sync_job { 1553 cf::sync_job {
1255 my %todo; 1554 my %todo;
1256 1555
1257 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1557 next unless -r $path;
1276 1575
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1578
1280 $ext{source} = 1579 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1283 . $source 1582 . $source
1284 . "\n};\n1"; 1583 . "\n};\n1";
1285 1584
1286 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1287 } 1586 }
1288 1587
1588 my $pass = 0;
1289 my %done; 1589 my %done;
1290 while (%todo) { 1590 while (%todo) {
1291 my $progress; 1591 my $progress;
1292 1592
1593 ++$pass;
1594
1595 ext:
1293 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1598 next ext
1296 unless exists $done{$_}; 1599 unless exists $done{$_};
1297 } 1600 }
1298 1601
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1603
1301 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 $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1617
1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1619 if exists $v->{meta}{mandatory};
1306 warn $msg; 1620
1307 warn "mandatory extension failed to load, exiting.\n"; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1622 delete $todo{$k};
1309 } 1623 } else {
1310 1624 $done{$k} = delete $todo{$k};
1311 warn $msg; 1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1312 } 1630 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1631 }
1318 1632
1319 skip: 1633 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 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 }
1322 } 1643 }
1323 }; 1644 };
1324} 1645}
1325 1646
1326############################################################################# 1647#############################################################################
1327 1648
1328=back 1649=back
1329 1650
1330=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1331 1652
1332Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1333 1654
1334=cut 1655=cut
1335 1656
1336package cf::player; 1657package cf::player;
1337 1658
1380 1701
1381sub exists($) { 1702sub exists($) {
1382 my ($login) = @_; 1703 my ($login) = @_;
1383 1704
1384 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1386} 1707}
1387 1708
1388sub find($) { 1709sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1711 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1723 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1724 or return;
1404 1725
1405 my $pl = cf::player::load_pl $f 1726 my $pl = cf::player::load_pl $f
1406 or return; 1727 or return;
1728
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1729 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1730 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1410 } 1732 }
1411 } 1733 }
1412} 1734}
1413 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
1414sub save($) { 1749sub save($) {
1415 my ($pl) = @_; 1750 my ($pl) = @_;
1416 1751
1417 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1418 1753
1421 1756
1422 return if $pl->{deny_save}; 1757 return if $pl->{deny_save};
1423 1758
1424 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1425 $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];
1426 1766
1427 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1768 cf::cede_to_tick;
1429} 1769}
1430 1770
1462 my ($pl) = @_; 1802 my ($pl) = @_;
1463 1803
1464 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1465 1805
1466 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1467 $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
1468 1808
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1470 $pl->deactivate; 1810 $pl->deactivate;
1811
1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1472 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1473 1817
1474 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1476 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1514 1858
1515 for my $login (@$dirs) { 1859 for my $login (@$dirs) {
1516 my $path = path $login; 1860 my $path = path $login;
1517 1861
1518 # a .pst is a dead give-away for a valid player 1862 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1863 # if no pst file found, open and chekc for blocked users
1864 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1865 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1866 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1867 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1868 }
1524 1869
1528 1873
1529 \@logins 1874 \@logins
1530} 1875}
1531 1876
1532=item $player->maps 1877=item $player->maps
1878
1879=item cf::player::maps $login
1533 1880
1534Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1535player. May block. 1882player. May block.
1536 1883
1537=cut 1884=cut
1555 } 1902 }
1556 1903
1557 \@paths 1904 \@paths
1558} 1905}
1559 1906
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1908
1562Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652 1910
1653=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1654 1912
1655Sends an ext reply to the player. 1913Sends an ext reply to the player.
1656 1914
1688 1946
1689=cut 1947=cut
1690 1948
1691sub find_by_path($) { 1949sub find_by_path($) {
1692 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1693 1953
1694 my ($match, $specificity); 1954 my ($match, $specificity);
1695 1955
1696 for my $region (list) { 1956 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 1983our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 1984our $DEFAULT_RESET = 3000;
1725 1985
1726sub generate_random_map { 1986sub generate_random_map {
1727 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1728 # mit "rum" bekleckern, nicht 1988
1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1990
1729 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1992}
1743 1993
1744=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1745 1995
1746Register 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
1751 2001
1752sub register { 2002sub register {
1753 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 2004 my $pkg = caller;
1755 2005
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 2007
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 2009}
1761 2010
1762# also paths starting with '/' 2011# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 2013
1765sub thawer_merge { 2014sub thawer_merge {
1766 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1767 2016
1768 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1773} 2022}
1774 2023
1775sub normalise { 2024sub normalise {
1776 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1777 2026
1778 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1779 2028
1780 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1781 2030
1782 # map plan: 2031 # map plan:
1783 # 2032 #
1798 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 2048 $path = "$base/$path";
1800 } 2049 }
1801 2050
1802 for ($path) { 2051 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1806 } 2054 }
1807 2055
1808 $path 2056 $path
1822 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1823 return $self; 2071 return $self;
1824 } 2072 }
1825 } 2073 }
1826 2074
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2076 ()
1829} 2077}
1830 2078
2079# may re-bless or do other evil things
1831sub init { 2080sub init {
1832 my ($self) = @_; 2081 my ($self) = @_;
1833 2082
1834 $self 2083 $self
1835} 2084}
1854 2103
1855# the temporary/swap location 2104# the temporary/swap location
1856sub save_path { 2105sub save_path {
1857 my ($self) = @_; 2106 my ($self) = @_;
1858 2107
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 2109 "$TMPDIR/$path.map"
1861} 2110}
1862 2111
1863# the unique path, undef == no special unique path 2112# the unique path, undef == no special unique path
1864sub uniq_path { 2113sub uniq_path {
1865 my ($self) = @_; 2114 my ($self) = @_;
1866 2115
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 2118}
1879 2119
1880sub decay_objects { 2120sub decay_objects {
1881 my ($self) = @_; 2121 my ($self) = @_;
1882 2122
1909 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1910 2150
1911 1 2151 1
1912} 2152}
1913 2153
2154# used to laod the header of an original map
1914sub load_header_orig { 2155sub load_header_orig {
1915 my ($self) = @_; 2156 my ($self) = @_;
1916 2157
1917 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1918} 2159}
1919 2160
2161# used to laod the header of an instantiated map
1920sub load_header_temp { 2162sub load_header_temp {
1921 my ($self) = @_; 2163 my ($self) = @_;
1922 2164
1923 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1924} 2166}
1925 2167
2168# called after loading the header from an instantiated map
1926sub prepare_temp { 2169sub prepare_temp {
1927 my ($self) = @_; 2170 my ($self) = @_;
1928 2171
1929 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1930 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1931 # safety 2174 # safety
1932 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1933 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1934} 2177}
1935 2178
2179# called after loading the header from an original map
1936sub prepare_orig { 2180sub prepare_orig {
1937 my ($self) = @_; 2181 my ($self) = @_;
1938 2182
1939 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1940 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1964 2208
1965sub find; 2209sub find;
1966sub find { 2210sub find {
1967 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1968 2212
2213 cf::cede_to_tick;
2214
1969 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1970 2216
1971 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2219
1974 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
1979 or return; 2222 or return;
1980 2223
1981 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
1982 2225
1984 or return; 2227 or return;
1985 2228
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2229 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2230 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2231 #$cf::WAIT_FOR_TICK->wait;
2232 undef $guard2;
1989 undef $guard1; 2233 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2234 $map->reset;
1992 return find $path; 2235 return find $path;
1993 } 2236 }
1994 2237
1995 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
1996 } 2239 }
1997} 2240}
1998 2241
1999sub pre_load { } 2242sub pre_load { }
2000sub post_load { } 2243#sub post_load { } # XS
2001 2244
2002sub load { 2245sub load {
2003 my ($self) = @_; 2246 my ($self) = @_;
2004 2247
2005 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2008 2251
2009 { 2252 {
2010 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2011 2254
2012 return unless $self->valid; 2255 return unless $self->valid;
2013 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2014
2015 $self->in_memory (cf::MAP_LOADING);
2016 2257
2017 $self->alloc; 2258 $self->alloc;
2018 2259
2019 $self->pre_load; 2260 $self->pre_load;
2020 cf::cede_to_tick; 2261 cf::cede_to_tick;
2021 2262
2263 if (exists $self->{load_path}) {
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2265 $f->skip_block;
2024 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2025 or return; 2267 or return;
2026 2268
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2269 $self->post_load_original
2028 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2029 2271
2030 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2273 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2034 $self->clear_unique_items; 2276 $self->clear_unique_items;
2035 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2037 } 2280 }
2038 } 2281 }
2039 }
2040 2282
2041 $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);
2042 2290
2043 cf::cede_to_tick; 2291 cf::cede_to_tick;
2044 # now do the right thing for maps 2292 # now do the right thing for maps
2045 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2046 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2050 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2299 $self->decay_objects;
2052 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2053 $self->update_buttons; 2301 $self->update_buttons;
2054 cf::cede_to_tick; 2302 cf::cede_to_tick;
2055 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2056 cf::cede_to_tick;
2057 $self->activate;
2058 } 2304 }
2059 2305
2060 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2062
2063 $self->in_memory (cf::MAP_IN_MEMORY);
2064 } 2308 }
2065 2309
2066 $self->post_load; 2310 $self->post_load;
2067}
2068 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
2069sub customise_for { 2318sub customise_for {
2070 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2071 2320
2072 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2322 if $self->per_player;
2076# if $self->per_party; 2325# if $self->per_party;
2077 2326
2078 $self 2327 $self
2079} 2328}
2080 2329
2081# find and load all maps in the 3x3 area around a map
2082sub load_neighbours {
2083 my ($map) = @_;
2084
2085 my @neigh; # diagonal neighbours
2086
2087 for (0 .. 3) {
2088 my $neigh = $map->tile_path ($_)
2089 or next;
2090 $neigh = find $neigh, $map
2091 or next;
2092 $neigh->load;
2093
2094 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 }
2098
2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
2101 my $neigh = find $path, $origin
2102 or next;
2103 $neigh->load;
2104 }
2105}
2106
2107sub find_sync { 2330sub find_sync {
2108 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2109 2332
2110 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
2111} 2338}
2112 2339
2113sub do_load_sync { 2340sub do_load_sync {
2114 my ($map) = @_; 2341 my ($map) = @_;
2115 2342
2343 # it's a bug to call this from the main context
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2118 2346
2119 cf::sync_job { $map->load }; 2347 $map->load;
2120} 2348}
2121 2349
2122our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2124 2352
2125sub find_async { 2353sub find_async {
2126 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2127 2355
2128 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2129 2357
2130 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2359 return $map if !$load || $map->linkable;
2132 } 2360 }
2133 2361
2134 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2135 2363
2136 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2150 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2151 2379
2152 () 2380 ()
2153} 2381}
2154 2382
2383# common code, used by both ->save and ->swapout
2155sub save { 2384sub _save {
2156 my ($self) = @_; 2385 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2386
2160 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2161 2388
2162 return unless $self->dirty; 2389 return unless $self->dirty;
2163 2390
2172 2399
2173 cf::async { 2400 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2401 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2402 $_->contr->save for $self->players;
2176 }; 2403 };
2404
2405 cf::get_slot 0.02;
2177 2406
2178 if ($uniq) { 2407 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2408 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2409 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2410 } else {
2182 $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);
2183 } 2412 }
2184} 2413}
2185 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2186sub swap_out { 2423sub swap_out {
2187 my ($self) = @_; 2424 my ($self) = @_;
2188 2425
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2194 return if $self->players; 2430 return if $self->players;
2195 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
2196 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2197 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
2198 $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};
2199 2482
2200 $self->deactivate; 2483 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2485 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2486
2248 $self->unlink_save; 2487 $self->unlink_save;
2249 $self->destroy; 2488 $self->destroy;
2250} 2489}
2251 2490
2259 2498
2260 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2261 2500
2262 $self->unlink_save; 2501 $self->unlink_save;
2263 2502
2264 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2508
2318 2557
2319sub unique_maps() { 2558sub unique_maps() {
2320 [ 2559 [
2321 map { 2560 map {
2322 utf8::decode $_; 2561 utf8::decode $_;
2323 /\.map$/ 2562 s/\.map$//; # TODO future compatibility hack
2563 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2564 ? ()
2324 ? normalise $_ 2565 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2567 ]
2328} 2568}
2329 2569
2330package cf; 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}
2331 2601
2332=back 2602=back
2333 2603
2334=head3 cf::object 2604=head3 cf::object
2335 2605
2339 2609
2340=over 4 2610=over 4
2341 2611
2342=item $ob->inv_recursive 2612=item $ob->inv_recursive
2343 2613
2344Returns 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.
2345 2616
2346=cut 2617=cut
2347 2618
2348sub inv_recursive_; 2619sub inv_recursive_;
2349sub inv_recursive_ { 2620sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2625 inv_recursive_ inv $_[0]
2355} 2626}
2356 2627
2357=item $ref = $ob->ref 2628=item $ref = $ob->ref
2358 2629
2359creates 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.
2360 2631
2361=item $ob = cf::object::deref ($refstring) 2632=item $ob = cf::object::deref ($refstring)
2362 2633
2363returns 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,
2364even if the object actually exists. May block. 2635even if the object actually exists. May block.
2396can 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
2397dialogue with the given NPC character. 2668dialogue with the given NPC character.
2398 2669
2399=cut 2670=cut
2400 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
2401# rough implementation of a future "reply" method that works 2686# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2687# with dialog boxes.
2403#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
2404sub cf::object::player::reply($$$;$) { 2689sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2690 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2701 my $dialog = $pl->{npc_dialog};
2417 $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));
2418 2703
2419 } else { 2704 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2705 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2706 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2707 }
2423 } 2708 }
2424} 2709}
2425 2710
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2711=item $object->send_msg ($channel, $msg, $color, [extra...])
2451 2736
2452=item $player_object->enter_link 2737=item $player_object->enter_link
2453 2738
2454Freezes 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}>).
2455 2740
2456The 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.
2457I<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.
2458 2745
2459Will never block. 2746Will never block.
2460 2747
2461=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2462 2749
2482sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2483 my ($self) = @_; 2770 my ($self) = @_;
2484 2771
2485 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2486 2773
2774 ++$self->{_link_recursion};
2775
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2777
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2491 2780
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2782}
2494 2783
2495sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2497 2786
2514 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2516 2805
2517 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2520 2809
2521 $map->load; 2810 $map->load;
2522 $map->load_neighbours;
2523 2811
2524 return unless $self->contr->active; 2812 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2813
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2529} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2530 2821
2822}
2823
2531=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)]])
2532 2825
2533Moves 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
2534her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2535that 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
2536the 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
2537be called at the end of this process. 2830be called at the end of this process.
2538 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
2539=cut 2835=cut
2540 2836
2541our $GOTOGEN; 2837our $GOTOGEN;
2542 2838
2543sub cf::object::player::goto { 2839sub cf::object::player::goto {
2544 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 }
2545 2847
2546 # 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
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2850
2549 $self->enter_link; 2851 $self->enter_link;
2569 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2570 } 2872 }
2571 } 2873 }
2572 2874
2573 my $map = eval { 2875 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2575 2877
2576 if ($map) { 2878 if ($map) {
2577 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2881 } else {
2580 $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);
2581 } 2883 }
2582 2884
2583 $map 2885 $map
2591 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2594 } 2896 }
2595 2897
2596 $done->() if $done; 2898 $done->($self) if $done;
2597 })->prio (1); 2899 })->prio (1);
2598} 2900}
2599 2901
2600=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2601 2903
2621} 2923}
2622 2924
2623sub prepare_random_map { 2925sub prepare_random_map {
2624 my ($exit) = @_; 2926 my ($exit) = @_;
2625 2927
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2928 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2929 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2930 # that depends on the exit object
2631 2931
2632 my $rmp = parse_random_map_params $exit->msg; 2932 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2934 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2935 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2936 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2937 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2938 $rmp->{origin_y} = $exit->y;
2939
2940 $exit->map->touch;
2639 } 2941 }
2640 2942
2641 $rmp->{random_seed} ||= $exit->random_seed; 2943 $rmp->{random_seed} ||= $exit->random_seed;
2642 2944
2643 my $data = cf::encode_json $rmp; 2945 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2946 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2947 my $meta = "$RANDOMDIR/$md5.meta";
2646 2948
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2949 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 2950 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 2951 undef $fh;
2650 aio_rename "$meta~", $meta; 2952 aio_rename "$meta~", $meta;
2651 2953
2954 my $slaying = "?random/$md5";
2955
2956 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 2957 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 2958 $exit->msg (undef);
2959 }
2654 } 2960 }
2655} 2961}
2656 2962
2657sub cf::object::player::enter_exit { 2963sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 2964 my ($self, $exit) = @_;
2659 2965
2660 return unless $self->type == cf::PLAYER; 2966 return unless $self->type == cf::PLAYER;
2661 2967
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 2968 $self->enter_link;
2674 2969
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 2970 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2971 $Coro::current->{desc} = "enter_exit";
2681 2972
2682 $self->deactivate_recursive; # just to be sure
2683 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
2684 $self->goto ($slaying, $hp, $sp); 3003 $self->goto ($map, $x, $y);
2685 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
2686 1; 3009 1
2687 }) { 3010 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "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. "
2690 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2692 3015
2693 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 3017 $self->leave_link;
2695 } 3018 }
2696 })->prio (1); 3019 })->prio (1);
2697} 3020}
2698 3021
2710sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2711 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2712 3035
2713 utf8::encode $text; 3036 utf8::encode $text;
2714 $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);
2715} 3063}
2716 3064
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 3066
2719Send 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
2723 3071
2724=cut 3072=cut
2725 3073
2726# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2728 "c/identify" => { 3082 "c/identify" => {
2729 id => "infobox", 3083 id => "infobox",
2730 title => "Identify", 3084 title => "Identify",
2731 reply => undef, 3085 reply => undef,
2732 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2734 "c/examine" => { 3088 "c/examine" => {
2735 id => "infobox", 3089 id => "infobox",
2736 title => "Examine", 3090 title => "Examine",
2737 reply => undef, 3091 reply => undef,
2738 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",
2739 }, 3099 },
2740 "c/book" => { 3100 "c/book" => {
2741 id => "infobox", 3101 id => "infobox",
2742 title => "Book", 3102 title => "Book",
2743 reply => undef, 3103 reply => undef,
2759 id => "infobox", 3119 id => "infobox",
2760 title => "Body Parts", 3120 title => "Body Parts",
2761 reply => undef, 3121 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2763 }, 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 },
2764 "c/uptime" => { 3160 "c/uptime" => {
2765 id => "infobox", 3161 id => "infobox",
2766 title => "Uptime", 3162 title => "Uptime",
2767 reply => undef, 3163 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3167 id => "infobox",
2772 title => "Map Info", 3168 title => "Map Info",
2773 reply => undef, 3169 reply => undef,
2774 tooltip => "Information related to the maps", 3170 tooltip => "Information related to the maps",
2775 }, 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,
2776); 3186);
2777 3187
2778sub cf::client::send_msg { 3188sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3190
2781 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2782 3193
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3195
2785 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2788 3199
2789 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2793 3202
2794 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3208 }
2801 3209
2802 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2803 } 3211 }
2804 3212
2805 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2806 3214
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3215 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2811 3218
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3222 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3223
2826 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3225}
2840 3226
2841=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2842 3228
2843Sends an ext event to the client. 3229Sends an ext event to the client.
2846 3232
2847sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2849 3235
2850 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 } 3241 }
2856} 3242}
2857 3243
2858=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2859 3245
2862=cut 3248=cut
2863 3249
2864sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2866 3252
2867 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2874} 3256}
2875 3257
2876=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2877 3259
2878Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2933 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2934 3316
2935 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2936 3318
2937 if (ref $msg) { 3319 if (ref $msg) {
2938 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942 3321
2943 my @reply; 3322 my @reply;
2944 3323
2945 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
2946 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
2948 3327
2949 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
2950 if $reply; 3329 if $reply;
2951 3330
2952 } else { 3331 } else {
2953 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";
2954 } 3333 }
2955 3334
2956 cf::override; 3335 cf::override;
2957 }, 3336 },
2958); 3337);
2978 3357
2979 $coro 3358 $coro
2980} 3359}
2981 3360
2982cf::client->attach ( 3361cf::client->attach (
2983 on_destroy => sub { 3362 on_client_destroy => sub {
2984 my ($ns) = @_; 3363 my ($ns) = @_;
2985 3364
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3366 },
2988); 3367);
3004our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3005 3384
3006$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3007 3386
3008$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3011 sort time 3390 sort time
3012)); 3391));
3013 3392
3014# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3017 3396
3018The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3019 3398
3020 cf::object 3399 cf::object
3021 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
3022 insert remove name archname title slaying race decrease_ob_nr 3401 insert remove name archname title slaying race decrease split
3402 value
3023 3403
3024 cf::object::player 3404 cf::object::player
3025 player 3405 player
3026 3406
3027 cf::player 3407 cf::player
3032 3412
3033=cut 3413=cut
3034 3414
3035for ( 3415for (
3036 ["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
3037 insert remove inv name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3042) { 3422) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3425 for @funs;
3047} 3426}
3048 3427
3063 3442
3064 my $qcode = $code; 3443 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3067 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3068 local $_; 3450 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3451
3071 my $eval = 3452 my $eval =
3072 "do {\n" 3453 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3456 . $code
3076 . "\n}" 3457 . "\n}"
3077 ; 3458 ;
3078 3459
3460 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 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 }
3082 3469
3083 if ($@) { 3470 if ($@) {
3084 warn "$@"; 3471 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3087 } 3474 }
3088 3475
3089 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3090} 3477}
3091 3478
3105=cut 3492=cut
3106 3493
3107sub register_script_function { 3494sub register_script_function {
3108 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3109 3496
3110 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3112} 3499}
3113 3500
3114=back 3501=back
3115 3502
3116=cut 3503=cut
3125 # for this (global event?) 3512 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3127 3514
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3516
3130 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3131 3518
3132 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3133 0 < aio_load $path, $facedata
3134 or die "$path: $!";
3135
3136 $facedata = Coro::Storable::thaw $facedata;
3137 3520
3138 $facedata->{version} == 2 3521 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3140 3523
3141 # 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]);
3142 $facedata->{resource}{"res/exp_table"} = { 3526 $facedata->{resource}{"res/exp_table"} = {
3143 type => FT_RSRC, 3527 type => FT_RSRC,
3144 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),
3145 }; 3530 };
3146 cf::cede_to_tick; 3531 cf::cede_to_tick;
3147 3532
3148 { 3533 {
3149 my $faces = $facedata->{faceinfo}; 3534 my $faces = $facedata->{faceinfo};
3150 3535
3151 while (my ($face, $info) = each %$faces) { 3536 while (my ($face, $info) = each %$faces) {
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3537 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3538
3153 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3156 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} ;
3157 3544
3158 cf::cede_to_tick; 3545 cf::cede_to_tick;
3159 } 3546 }
3160 3547
3161 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3549 next unless $info->{smooth};
3550
3163 my $idx = cf::face::find $face 3551 my $idx = cf::face::find $face
3164 or next; 3552 or next;
3553
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3557 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3559 }
3171 3560
3172 cf::cede_to_tick; 3561 cf::cede_to_tick;
3173 } 3562 }
3174 } 3563 }
3183 3572
3184 cf::anim::invalidate_all; # d'oh 3573 cf::anim::invalidate_all; # d'oh
3185 } 3574 }
3186 3575
3187 { 3576 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3191 3578
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3583
3198 if ($info->{type} & 1) { 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3199 # prepend meta info 3585 cf::face::set_type $idx, $type;
3200 3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3201 my $meta = $enc->encode ({
3202 name => $name,
3203 %{ $info->{meta} || {} },
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3587 } else {
3208 $data = $info->{data}; 3588# $RESOURCE{$name} = $info; # unused
3209 } 3589 }
3210 3590
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick; 3591 cf::cede_to_tick;
3215 } 3592 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3593 }
3594
3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3235 3596
3236 1 3597 1
3237} 3598}
3238 3599
3239register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3241 3602
3242 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3604 $ns->fx_want ($k, $v);
3244 } 3605 }
3245}; 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}
3246 3617
3247sub reload_regions { 3618sub reload_regions {
3248 # 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
3249 # for this (global event?) 3620 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3621 %ext::player_env::MUSIC_FACE_CACHE = ();
3264} 3635}
3265 3636
3266sub reload_archetypes { 3637sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3638 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3639 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references
3270 # this really needs to be done in an extra post-pass
3271 # (which needs to be synchronous, so solve it differently)
3272 load_resource_file "$DATADIR/archetypes"
3273 or die "unable to load archetypes\n";
3274} 3640}
3275 3641
3276sub reload_treasures { 3642sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3279} 3645}
3280 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
3281sub reload_resources { 3667sub reload_resources {
3282 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3283 3669
3670 reload_exp_table;
3671 reload_materials;
3672 reload_facedata;
3673 reload_sound;
3674 reload_archetypes;
3284 reload_regions; 3675 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3676 reload_treasures;
3289 3677
3290 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3679}
3296 3680
3297sub reload_config { 3681sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3682 trace "reloading config file...\n";
3299 or return;
3300 3683
3301 local $/; 3684 my $config = load_file "$CONFDIR/config";
3302 *CFG = YAML::Syck::Load <$fh>; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3303 3687
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3689
3306 $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};
3307 $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};
3308 3692
3309 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
3313 }; 3697 };
3314 warn $@ if $@; 3698 warn $@ if $@;
3315 } 3699 }
3316} 3700}
3317 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
3318sub 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
3319 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
3321 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#
3322 (async { 3743 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3744 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3745 EV::loop EV::LOOP_ONESHOT;
3325 })->prio (Coro::PRIO_MAX); 3746 })->prio (Coro::PRIO_MAX);
3326 }; 3747 };
3327 3748
3749 evthread_start IO::AIO::poll_fileno;
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;
3328 reload_config; 3761 reload_config;
3329 db_init; 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
3330 load_extensions; 3772 load_extensions;
3331 3773
3332 $TICK_WATCHER->start; 3774 utime time, time, $RUNTIMEFILE;
3333 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3775
3334 EV::loop; 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;
3335} 3791}
3336 3792
3337############################################################################# 3793#############################################################################
3338# initialisation and cleanup 3794# initialisation and cleanup
3339 3795
3340# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3341BEGIN { 3797BEGIN {
3342 our %SIGWATCHER = (); 3798 our %SIGWATCHER = ();
3343 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3344 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3345 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3346 }; 3802 };
3347 } 3803 }
3348} 3804}
3349 3805
3350sub write_runtime { 3806sub write_runtime_sync {
3351 my $runtime = "$LOCALDIR/runtime"; 3807 my $t0 = AE::time;
3352 3808
3353 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3354 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3355 3811
3356 IO::AIO::aio_utime $runtime, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3357 3813
3358 my $guard = cf::lock_acquire "write_runtime"; 3814 my $guard = cf::lock_acquire "write_runtime";
3359 3815
3360 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3816 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3361 or return; 3817 or return;
3362 3818
3363 my $value = $cf::RUNTIME + 90 + 10; 3819 my $value = $cf::RUNTIME + 90 + 10;
3364 # 10 is the runtime save interval, for a monotonic clock 3820 # 10 is the runtime save interval, for a monotonic clock
3365 # 60 allows for the watchdog to kill the server. 3821 # 60 allows for the watchdog to kill the server.
3375 aio_utime $fh, undef, undef; 3831 aio_utime $fh, undef, undef;
3376 3832
3377 close $fh 3833 close $fh
3378 or return; 3834 or return;
3379 3835
3380 aio_rename "$runtime~", $runtime 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3381 and return; 3837 and return;
3382 3838
3383 warn "runtime file written.\n"; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3384 3840
3385 1 3841 1
3842}
3843
3844our $uuid_lock;
3845our $uuid_skip;
3846
3847sub write_uuid_sync($) {
3848 $uuid_skip ||= $_[0];
3849
3850 return if $uuid_lock;
3851 local $uuid_lock = 1;
3852
3853 my $uuid = "$LOCALDIR/uuid";
3854
3855 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3856 or return;
3857
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;
3866 $uuid_skip = 0;
3867
3868 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3869 and return;
3870
3871 # always fsync - this file is important
3872 aio_fsync $fh
3873 and return;
3874
3875 close $fh
3876 or return;
3877
3878 aio_rename "$uuid~", $uuid
3879 and return;
3880
3881 trace "uuid file written ($value).\n";
3882
3883 1
3884
3885}
3886
3887sub write_uuid($$) {
3888 my ($skip, $sync) = @_;
3889
3890 $sync ? write_uuid_sync $skip
3891 : async { write_uuid_sync $skip };
3386} 3892}
3387 3893
3388sub emergency_save() { 3894sub emergency_save() {
3389 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3390 3896
3391 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;
3392 3903
3393 cf::sync_job { 3904 cf::sync_job {
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3394 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3395 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3396 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3397 warn "begin emergency player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3398 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3399 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3400 $pl->valid or next; 3913 $pl->valid or next;
3401 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3402 $pl->save; 3915 $pl->save;
3403 } 3916 }
3404 warn "end emergency player save\n"; 3917 info "emergency_perl_save: end player save\n";
3405 3918
3406 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";
3407 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3408 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3409 $map->valid or next; 3924 $map->valid or next;
3410 $map->save; 3925 $map->save;
3411 } 3926 }
3412 warn "end emergency map save\n"; 3927 info "emergency_perl_save: end map save\n";
3413 3928
3414 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";
3415 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3416 warn "end emergency database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3934
3935 info "emergency_perl_save: begin write uuid\n";
3936 write_uuid_sync 1;
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
3417 }; 3957 };
3418 3958
3419 warn "leave emergency perl save\n"; 3959 info "emergency_perl_save: leave\n";
3420} 3960}
3421 3961
3422sub post_cleanup { 3962sub post_cleanup {
3423 my ($make_core) = @_; 3963 my ($make_core) = @_;
3424 3964
3965 IO::AIO::flush;
3966
3425 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3426 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 }
3427} 3997}
3428 3998
3429sub do_reload_perl() { 3999sub do_reload_perl() {
3430 # can/must only be called in main 4000 # can/must only be called in main
3431 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3432 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3433 return; 4003 return;
3434 } 4004 }
3435 4005
3436 warn "reloading..."; 4006 return if $RELOAD++;
3437 4007
3438 warn "entering sync_job"; 4008 my $t1 = AE::time;
3439 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
3440 cf::sync_job { 4016 cf::sync_job {
3441 cf::write_runtime; # external watchdog should not bark
3442 cf::emergency_save; 4017 #cf::emergency_save;
3443 cf::write_runtime; # external watchdog should not bark
3444 4018
3445 warn "syncing database to disk";
3446 BDB::db_env_txn_checkpoint $DB_ENV;
3447
3448 # if anything goes wrong in here, we should simply crash as we already saved
3449
3450 warn "flushing outstanding aio requests";
3451 for (;;) {
3452 BDB::flush;
3453 IO::AIO::flush;
3454 Coro::cede_notself;
3455 last unless IO::AIO::nreqs || BDB::nreqs;
3456 warn "iterate...";
3457 }
3458
3459 ++$RELOAD;
3460
3461 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3462 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3463 %EXT_CORO = (); 4021 %EXT_CORO = ();
3464 4022
3465 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3466 %COMMAND = (); 4024 %COMMAND = ();
3467 4025
3468 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3469 %EXTCMD = (); 4027 %EXTCMD = ();
3470 %EXTICMD = (); 4028 %EXTICMD = ();
3471 4029
3472 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3473 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3474 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3475 4033
3476 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3477 eval { 4035 eval {
3478 $cb->($pkg); 4036 $cb->($pkg);
3479 1 4037 1
3480 } 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;
3481 } 4043 }
3482 4044
3483 warn "... nuking $pkg";
3484 Symbol::delete_package $pkg;
3485 }
3486
3487 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3488 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3489 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3490 4048
3491 warn "... unloading $k"; 4049 trace "... unloading $k";
3492 delete $INC{$k}; 4050 delete $INC{$k};
3493 4051
3494 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3495 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3496 4054
3497 if (my $cb = $k->can ("unload_module")) { 4055 if (my $cb = $k->can ("unload_module")) {
3498 $cb->(); 4056 $cb->();
4057 }
4058
4059 clear_package $k;
3499 } 4060 }
3500 4061
3501 Symbol::delete_package $k;
3502 }
3503
3504 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3505 Symbol::delete_package "safe::$_" 4063 clear_package "safe::$_"
3506 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);
3507 4065
3508 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3509 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3510 delete $INC{"cf/pod.pm"}; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3511 4069
3512 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3513 # and global variables created in xs 4071 # and global variables created in xs
3514 #Symbol::delete_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3515 4073
3516 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3517 4075
3518 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3519 require cf; 4077 require cf;
3520 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4078 cf::_connect_to_perl_1;
3521 4079
3522 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3523 cf::reload_config; 4081 cf::reload_config;
3524 4082
3525 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3526 cf::load_extensions; 4084 cf::load_extensions;
3527 4085
4086 if ($REATTACH_ON_RELOAD) {
3528 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3529 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3530 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3531 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3532 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3533 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
4093 }
3534 4094
3535 warn "leaving sync_job"; 4095 cf::_post_init 1;
3536 4096
4097 trace "perl_reload: leaving sync_job";
4098
3537 1 4099 1
3538 } or do { 4100 } or do {
3539 warn $@; 4101 error $@;
3540 warn "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3541 exit 1; 4103 };
4104
4105 --$RELOAD;
3542 }; 4106 }
3543 4107
3544 warn "reloaded"; 4108 $t1 = AE::time - $t1;
4109 info "perl_reload: completed in ${t1}s\n";
3545}; 4110};
3546 4111
3547our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3548 4113
3549sub reload_perl() { 4114sub reload_perl() {
3550 # doing reload synchronously and two reloads happen back-to-back, 4115 # doing reload synchronously and two reloads happen back-to-back,
3551 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3552 4117
4118 $RELOAD_WATCHER ||= cf::async {
4119 Coro::AIO::aio_wait cache_extensions;
4120
3553 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4122 do_reload_perl;
3554 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
3555 do_reload_perl; 4124 };
3556 }; 4125 };
3557} 4126}
3558 4127
3559register_command "reload" => sub { 4128register_command "reload" => sub {
3560 my ($who, $arg) = @_; 4129 my ($who, $arg) = @_;
3566 reload_perl; 4135 reload_perl;
3567 }; 4136 };
3568 } 4137 }
3569}; 4138};
3570 4139
3571unshift @INC, $LIBDIR; 4140#############################################################################
3572 4141
3573my $bug_warning = 0; 4142my $bug_warning = 0;
3574 4143
3575our @WAIT_FOR_TICK;
3576our @WAIT_FOR_TICK_BEGIN;
3577
3578sub wait_for_tick { 4144sub wait_for_tick() {
3579 return unless $TICK_WATCHER->is_active; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3580 return if $Coro::current == $Coro::main;
3581 4146
3582 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3583 push @WAIT_FOR_TICK, $signal;
3584 $signal->wait;
3585} 4148}
3586 4149
3587sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3588 return unless $TICK_WATCHER->is_active; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3589 return if $Coro::current == $Coro::main;
3590 4152
3591 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3592 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3593 $signal->wait; 4155 $signal->wait;
3594} 4156}
3595 4157
3596$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4158sub tick {
3597 if ($Coro::current != $Coro::main) { 4159 if ($Coro::current != $Coro::main) {
3598 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"
3599 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3600 return; 4162 return;
3601 } 4163 }
3602 4164
3603 $NOW = $tick_start = EV::now; 4165 cf::one_tick; # one server iteration
3604 4166
3605 cf::server_tick; # one server iteration 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3606
3607 $RUNTIME += $TICK;
3608 $NEXT_TICK += $TICK;
3609 4168
3610 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3611 $NEXT_RUNTIME_WRITE = $NOW + 10; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3612 Coro::async_pool { 4171 Coro::async_pool {
3613 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3614 write_runtime 4173 write_runtime_sync
3615 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3616 }; 4175 };
3617 } 4176 }
3618 4177
3619 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3620 $sig->send; 4179 $sig->send;
3621 } 4180 }
3622 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3623 $sig->send;
3624 }
3625 4182
3626 $LOAD = ($NOW - $tick_start) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3627 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3628 4185
3629 _post_tick; 4186 if (0) {
3630}; 4187 if ($NEXT_TICK) {
3631$TICK_WATCHER->priority (EV::MAXPRI); 4188 my $jitter = $TICK_START - $NEXT_TICK;
4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4190 debug "jitter $JITTER\n";#d#
4191 }
4192 }
4193}
3632 4194
3633{ 4195{
4196 # configure BDB
4197
3634 BDB::min_parallel 8; 4198 BDB::min_parallel 16;
3635 BDB::max_poll_time $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3636 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3637
3638 BDB::set_sync_prepare {
3639 my $status;
3640 my $current = $Coro::current;
3641 (
3642 sub {
3643 $status = $!;
3644 $current->ready; undef $current;
3645 },
3646 sub {
3647 Coro::schedule while defined $current;
3648 $! = $status;
3649 },
3650 )
3651 };
3652 4201
3653 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | 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;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4207 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4208 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4209
3660 cf::sync_job { 4210 cf::sync_job {
3661 eval { 4211 eval {
3683 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4233 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3684 }; 4234 };
3685} 4235}
3686 4236
3687{ 4237{
4238 # configure IO::AIO
4239
3688 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4242 undef $AnyEvent::AIO::WATCHER;
3693} 4243}
3694 4244
3695my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
3696 4247
3697sub _log_backtrace { 4248sub _log_backtrace {
3698 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
3699 4250
3700 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
3701 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3702 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
3704 ++$_log_backtrace; 4259 ++$_log_backtrace;
4260 my $perl_bt = Carp::longmess $msg;
3705 async { 4261 async {
3706 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
3707 4263
3708 my @bt = fork_call { 4264 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4265 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4276 }
3721 4277
3722 @funcs 4278 @funcs
3723 }; 4279 };
3724 4280
3725 LOG llevInfo, "[ABT] $msg\n"; 4281 LOG llevInfo, "[ABT] $perl_bt\n";
4282 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4284 --$_log_backtrace;
3728 }; 4285 };
3729 } else { 4286 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3732 } 4289 }
3733} 4290}
3734 4291
3735# load additional modules 4292# load additional modules
3736use cf::pod; 4293require "cf/$_.pm" for @EXTRA_MODULES;
4294cf::_connect_to_perl_2;
3737 4295
3738END { cf::emergency_save } 4296END { cf::emergency_save }
3739 4297
37401 42981
3741 4299

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines