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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.582 by root, Fri Feb 3 03:01:45 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
63 64
64# configure various modules to our taste 65# configure various modules to our taste
65# 66#
66$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 75
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
71 78
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76 85
77our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
87our $DATADIR = datadir; 99our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
91our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 112
100our %RESOURCE; 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;
101 120
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 123our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
106 125
107our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 129our $DB_ENV;
111 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
112our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
113 135
114our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
116our $NOW; 139our $NOW;
117 140
118our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
119our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
120our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
124 147
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 148our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 149our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 150our $JITTER; # average jitter
128our $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;
129 160
130binmode STDOUT; 161binmode STDOUT;
131binmode STDERR; 162binmode STDERR;
132 163
133# read virtual server time, if available 164# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 166 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 167 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 168 $RUNTIME = <$fh> + 0.;
138} 169}
139 170
171eval "sub TICK() { $TICK } 1" or die;
172
140mkdir $_ 173mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 174 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 175
143our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
144 177
145sub cf::map::normalise; 178sub cf::map::normalise;
146 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
147############################################################################# 184#############################################################################
148 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
149=head2 GLOBAL VARIABLES 197=head2 GLOBAL VARIABLES
150 198
151=over 4 199=over 4
152 200
153=item $cf::UPTIME 201=item $cf::UPTIME
154 202
155The 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.
156 219
157=item $cf::RUNTIME 220=item $cf::RUNTIME
158 221
159The 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
160every server tick. 223every server tick.
166Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
167directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
168unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
169database environment. 232database environment.
170 233
171=item $cf::NOW
172
173The time of the last (current) server tick.
174
175=item $cf::TICK
176
177The interval between server ticks, in seconds.
178
179=item $cf::LOADAVG 234=item $cf::LOADAVG
180 235
181The 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
182(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
183objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
192from wherever your confdir points to. 247from wherever your confdir points to.
193 248
194=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
195 250
196These 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
197returns 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
198per 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.
199 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
200=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
201 273
202This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 276that call.
205 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
206=back 284=back
207 285
208=cut 286=cut
209 287
210BEGIN { 288sub error(@) { LOG llevError, join "", @_ }
211 *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 {
212 my $msg = join "", @_; 295 my $msg = join "", @_;
213 296
214 $msg .= "\n" 297 $msg .= "\n"
215 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
216 299
217 $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;
218 301
219 LOG llevError, $msg; 302 LOG llevWarn, $msg;
220 }; 303};
221}
222 304
223$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
225 307
226 if ($Coro::current == $Coro::main) {#d# 308 error Carp::longmess $_[0];
309
310 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 312 return;#d#
229 }#d# 313 }#d#
230 314
231 # kill coroutine otherwise 315 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 316 Coro::terminate
234}; 317};
235
236$SIG{__DIE__} = sub { }; #d#?
237 318
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 319@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 320@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 321@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 322@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 336)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 338}
258 339
259$EV::DIED = sub { 340$EV::DIED = sub {
260 warn "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
261}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
262 348
263############################################################################# 349#############################################################################
264 350
265=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
266 352
287 $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;
288 $d 374 $d
289 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
290} 376}
291 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
292=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
293 431
294Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
295 433
296=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
302our $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
303 441
304sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 507=item cf::lock_wait $string
308 508
309Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
310 510
311=item my $lock = cf::lock_acquire $string 511=item my $lock = cf::lock_acquire $string
312 512
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 515for example when the coroutine gets canceled), the lock is automatically
316returned. 516returned.
317 517
318Locks 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
319deadlocked coro. 519deadlocked coro.
325 525
326Return 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.
327 527
328=cut 528=cut
329 529
330our %LOCK; 530our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 531
333sub lock_wait($) { 532sub lock_wait($) {
334 my ($key) = @_; 533 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 534}
347 535
348sub lock_acquire($) { 536sub lock_acquire($) {
349 my ($key) = @_; 537 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 538}
363 539
364sub lock_active($) { 540sub lock_active($) {
365 my ($key) = @_; 541 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 542}
369 543
370sub freeze_mainloop { 544sub freeze_mainloop {
371 tick_inhibit_inc; 545 tick_inhibit_inc;
372 546
373 Coro::guard \&tick_inhibit_dec; 547 &Guard::guard (\&tick_inhibit_dec);
374} 548}
375 549
376=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
377 551
378Like 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
379get spread over timer. 553get spread over time.
380 554
381=cut 555=cut
382 556
383sub periodic($$) { 557sub periodic($$) {
384 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
388 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
389} 563}
390 564
391=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
392 566
393Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
394This 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
395of 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.
396 574
397The 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
398used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
399 577
400Useful for short background jobs. 578Useful for short background jobs.
401 579
402=cut 580=cut
403 581
404our @SLOT_QUEUE; 582our @SLOT_QUEUE;
405our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
406 585
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
410 589
411 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
412 592
413 while () { 593 while () {
414 next_job: 594 next_job:
595
415 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 597
417 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 602 $job->[2]->send;
421 Coro::cede; 603 Coro::cede;
422 goto next_job; 604 goto next_job;
423 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 607 }
425 } 608 }
426 609
427 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
430 $signal->wait;
431 } else { 613 } else {
614 $busy = 0;
432 Coro::schedule; 615 Coro::schedule;
433 } 616 }
434 } 617 }
435}; 618};
436 619
437sub get_slot($;$$) { 620sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
439 622
440 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
441 624
442 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
443 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
444 628
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
473=cut 657=cut
474 658
475sub sync_job(&) { 659sub sync_job(&) {
476 my ($job) = @_; 660 my ($job) = @_;
477 661
478 if ($Coro::current == $Coro::main) { 662 if (in_main) {
479 my $time = EV::time; 663 my $time = AE::time;
480 664
481 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
483 667
484 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
485 669
486 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
487 671
488 my $busy = 1; 672 my $busy = 1;
489 my @res; 673 my @res;
490 674
491 (async { 675 (async {
492 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 677 @res = eval { $job->() };
494 warn $@ if $@; 678 error $@ if $@;
495 undef $busy; 679 undef $busy;
496 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
497 681
498 while ($busy) { 682 while ($busy) {
499 if (Coro::nready) { 683 if (Coro::nready) {
501 } else { 685 } else {
502 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
503 } 687 }
504 } 688 }
505 689
506 my $time = EV::time - $time; 690 my $time = AE::time - $time;
507 691
508 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
509 693
510 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
511 } else { 695 } else {
533 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
534 718
535 $coro 719 $coro
536} 720}
537 721
538=item fork_call { }, $args 722=item fork_call { }, @args
539 723
540Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 727never block itself or use any form of event handling.
544 728
545=cut 729=cut
546 730
731sub post_fork {
732 reset_signals;
733}
734
547sub fork_call(&@) { 735sub fork_call(&@) {
548 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
549 737
550 # 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,
551 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
553 741
554 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
555 reset_signals; 743 cf::post_fork;
556 &$cb 744 &$cb
557 }, @args; 745 } @args;
558 746
559 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 )
560} 759}
561 760
562=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
563 762
564=cut 763=cut
601within each server. 800within each server.
602 801
603=cut 802=cut
604 803
605sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
606 my ($name) = @_; 808 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
608 810
609 eval { 811 eval {
610 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
620} 822}
621 823
622our $DB; 824our $DB;
623 825
624sub db_init { 826sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
627 };
628} 828}
629 829
630sub db_get($$) { 830sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
632 832
633 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
634 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
635 837
636 $! ? () 838 $! ? ()
637 : $data 839 : $data
638 }
639} 840}
640 841
641sub db_put($$$) { 842sub db_put($$$) {
642 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
671 872
672 my @data; 873 my @data;
673 my $md5; 874 my $md5;
674 875
675 for (0 .. $#$src) { 876 for (0 .. $#$src) {
676 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
677 or Carp::croak "$src->[$_]: $!";
678 } 878 }
679 879
680 # if processing is expensive, check 880 # if processing is expensive, check
681 # checksum first 881 # checksum first
682 if (1) { 882 if (1) {
699 899
700 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
701 my $data = $process->(\@data); 901 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
703 903
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 905
706 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
709 909
719 919
720=cut 920=cut
721 921
722sub datalog($@) { 922sub datalog($@) {
723 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 925}
726 926
727=back 927=back
728 928
729=cut 929=cut
924 1124
925 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1127
928 } elsif (ref $type) { 1128 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
930 1130
931 } else { 1131 } else {
932 shift @arg; 1132 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
934 } 1134 }
935 } 1135 }
936} 1136}
937 1137
938sub _object_attach { 1138sub _object_attach {
948 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
949 } 1149 }
950 1150
951 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
952 } else { 1152 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1154 }
955 1155
956 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
957} 1157}
958 1158
1017 1217
1018 for (@$callbacks) { 1218 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1020 1220
1021 if ($@) { 1221 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1223 override;
1025 } 1224 }
1026 1225
1027 return 1 if $override; 1226 return 1 if $override;
1028 } 1227 }
1107 for (@$attach) { 1306 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1110 } 1309 }
1111 } else { 1310 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1312 }
1114 } 1313 }
1115} 1314}
1116 1315
1117cf::attachable->attach ( 1316cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1145 1344
1146 sync_job { 1345 sync_job {
1147 if (length $$rdata) { 1346 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1151 1351
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1359 aio_close $fh;
1157 1360
1158 if (@$objs) { 1361 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1363 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1370 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1372 }
1167 } else { 1373 } else {
1168 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1169 } 1375 }
1170 1376
1171 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1381 } else {
1173 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1174 } 1383 }
1175 } else { 1384 } else {
1176 aio_unlink $filename; 1385 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1178 } 1387 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1412 $av = $st->{objs};
1204 } 1413 }
1205 1414
1206 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1209 1419
1210 ($data, $av) 1420 ($data, $av)
1211} 1421}
1212 1422
1213=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1269 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1270 1480
1271 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1272} 1482}
1273 1483
1484use File::Glob ();
1485
1274cf::player->attach ( 1486cf::player->attach (
1275 on_command => sub { 1487 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1277 1489
1278 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1279 or return; 1491 or return;
1280 1492
1288 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1289 1501
1290 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1291 1503
1292 if (ref $msg) { 1504 if (ref $msg) {
1293 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1294 "ARRAY" eq ref $msg
1295 ? @$msg
1296 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1297 1506
1298 my @reply; 1507 my @reply;
1299 1508
1300 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1301 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1303 1512
1304 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1305 if $reply; 1514 if $reply;
1306 1515
1307 } else { 1516 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1518 }
1310 1519
1311 cf::override; 1520 cf::override;
1312 }, 1521 },
1313); 1522);
1314 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
1315sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1316 cf::sync_job { 1553 cf::sync_job {
1317 my %todo; 1554 my %todo;
1318 1555
1319 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1557 next unless -r $path;
1338 1575
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1578
1342 $ext{source} = 1579 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1345 . $source 1582 . $source
1346 . "\n};\n1"; 1583 . "\n};\n1";
1347 1584
1348 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1349 } 1586 }
1350 1587
1588 my $pass = 0;
1351 my %done; 1589 my %done;
1352 while (%todo) { 1590 while (%todo) {
1353 my $progress; 1591 my $progress;
1354 1592
1593 ++$pass;
1594
1595 ext:
1355 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1598 next ext
1358 unless exists $done{$_}; 1599 unless exists $done{$_};
1359 } 1600 }
1360 1601
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1603
1363 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 $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1617
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1619 if exists $v->{meta}{mandatory};
1371 1620
1372 warn $msg; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1623 } else {
1624 $done{$k} = delete $todo{$k};
1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1373 } 1630 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1631 }
1379 1632
1380 skip: 1633 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 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 }
1383 } 1643 }
1384 }; 1644 };
1385} 1645}
1386 1646
1387############################################################################# 1647#############################################################################
1441 1701
1442sub exists($) { 1702sub exists($) {
1443 my ($login) = @_; 1703 my ($login) = @_;
1444 1704
1445 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1447} 1707}
1448 1708
1449sub find($) { 1709sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1711 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1472 } 1732 }
1473 } 1733 }
1474} 1734}
1475 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
1476sub save($) { 1749sub save($) {
1477 my ($pl) = @_; 1750 my ($pl) = @_;
1478 1751
1479 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1480 1753
1485 1758
1486 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1488 1761
1489 cf::get_slot 0.01; 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];
1490 1766
1491 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1768 cf::cede_to_tick;
1493} 1769}
1494 1770
1528 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1529 1805
1530 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1808
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1810 $pl->deactivate;
1811
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1538 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1539 1817
1540 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1596 \@logins 1874 \@logins
1597} 1875}
1598 1876
1599=item $player->maps 1877=item $player->maps
1600 1878
1879=item cf::player::maps $login
1880
1601Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1602player. May block. 1882player. May block.
1603 1883
1604=cut 1884=cut
1605 1885
1667=cut 1947=cut
1668 1948
1669sub find_by_path($) { 1949sub find_by_path($) {
1670 my ($path) = @_; 1950 my ($path) = @_;
1671 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1672 my ($match, $specificity); 1954 my ($match, $specificity);
1673 1955
1674 for my $region (list) { 1956 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1676 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
1704sub generate_random_map { 1986sub generate_random_map {
1705 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1706 1988
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708 1990
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 1992}
1724 1993
1725=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1726 1995
1727Register 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
1732 2001
1733sub register { 2002sub register {
1734 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 2004 my $pkg = caller;
1736 2005
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 2007
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 2009}
1742 2010
1743# also paths starting with '/' 2011# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 2013
1746sub thawer_merge { 2014sub thawer_merge {
1747 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1748 2016
1749 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1754} 2022}
1755 2023
1756sub normalise { 2024sub normalise {
1757 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1758 2026
1759 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1760 2028
1761 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1762 2030
1763 # map plan: 2031 # map plan:
1764 # 2032 #
1779 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 2048 $path = "$base/$path";
1781 } 2049 }
1782 2050
1783 for ($path) { 2051 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1787 } 2054 }
1788 2055
1789 $path 2056 $path
1803 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1804 return $self; 2071 return $self;
1805 } 2072 }
1806 } 2073 }
1807 2074
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 2076 ()
1810} 2077}
1811 2078
2079# may re-bless or do other evil things
1812sub init { 2080sub init {
1813 my ($self) = @_; 2081 my ($self) = @_;
1814 2082
1815 $self 2083 $self
1816} 2084}
1847 2115
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1850} 2118}
1851 2119
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 2120sub decay_objects {
1862 my ($self) = @_; 2121 my ($self) = @_;
1863 2122
1864 return if $self->{deny_reset}; 2123 return if $self->{deny_reset};
1865 2124
1890 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1891 2150
1892 1 2151 1
1893} 2152}
1894 2153
2154# used to laod the header of an original map
1895sub load_header_orig { 2155sub load_header_orig {
1896 my ($self) = @_; 2156 my ($self) = @_;
1897 2157
1898 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1899} 2159}
1900 2160
2161# used to laod the header of an instantiated map
1901sub load_header_temp { 2162sub load_header_temp {
1902 my ($self) = @_; 2163 my ($self) = @_;
1903 2164
1904 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1905} 2166}
1906 2167
2168# called after loading the header from an instantiated map
1907sub prepare_temp { 2169sub prepare_temp {
1908 my ($self) = @_; 2170 my ($self) = @_;
1909 2171
1910 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1911 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1912 # safety 2174 # safety
1913 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1914 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1915} 2177}
1916 2178
2179# called after loading the header from an original map
1917sub prepare_orig { 2180sub prepare_orig {
1918 my ($self) = @_; 2181 my ($self) = @_;
1919 2182
1920 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1921 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1945 2208
1946sub find; 2209sub find;
1947sub find { 2210sub find {
1948 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1949 2212
2213 cf::cede_to_tick;
2214
1950 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1951 2216
1952 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2219
1955 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
1960 or return; 2222 or return;
1961 2223
1962 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
1963 2225
1975 2237
1976 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
1977 } 2239 }
1978} 2240}
1979 2241
1980sub pre_load { } 2242sub pre_load { }
1981sub post_load { } 2243#sub post_load { } # XS
1982 2244
1983sub load { 2245sub load {
1984 my ($self) = @_; 2246 my ($self) = @_;
1985 2247
1986 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
1989 2251
1990 { 2252 {
1991 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
1992 2254
1993 return unless $self->valid; 2255 return unless $self->valid;
1994 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
1995
1996 $self->in_memory (cf::MAP_LOADING);
1997 2257
1998 $self->alloc; 2258 $self->alloc;
1999 2259
2000 $self->pre_load; 2260 $self->pre_load;
2001 cf::cede_to_tick; 2261 cf::cede_to_tick;
2002 2262
2263 if (exists $self->{load_path}) {
2003 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block; 2265 $f->skip_block;
2005 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2006 or return; 2267 or return;
2007 2268
2008 $self->post_load_original 2269 $self->post_load_original
2009 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2010 2271
2011 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2012 utf8::encode $uniq; 2273 utf8::encode $uniq;
2013 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2015 $self->clear_unique_items; 2276 $self->clear_unique_items;
2016 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2018 } 2280 }
2019 } 2281 }
2020 }
2021 2282
2022 $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);
2023 2290
2024 cf::cede_to_tick; 2291 cf::cede_to_tick;
2025 # now do the right thing for maps 2292 # now do the right thing for maps
2026 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2027 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2031 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2299 $self->decay_objects;
2033 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2034 $self->update_buttons; 2301 $self->update_buttons;
2035 cf::cede_to_tick; 2302 cf::cede_to_tick;
2036 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2037 cf::cede_to_tick;
2038 $self->activate;
2039 } 2304 }
2040 2305
2041 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2043
2044 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2308 }
2046 2309
2047 $self->post_load; 2310 $self->post_load;
2048}
2049 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
2050sub customise_for { 2318sub customise_for {
2051 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2052 2320
2053 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2322 if $self->per_player;
2057# if $self->per_party; 2325# if $self->per_party;
2058 2326
2059 $self 2327 $self
2060} 2328}
2061 2329
2062# find and load all maps in the 3x3 area around a map
2063sub load_neighbours {
2064 my ($map) = @_;
2065
2066 my @neigh; # diagonal neighbours
2067
2068 for (0 .. 3) {
2069 my $neigh = $map->tile_path ($_)
2070 or next;
2071 $neigh = find $neigh, $map
2072 or next;
2073 $neigh->load;
2074
2075 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 }
2079
2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
2082 my $neigh = find $path, $origin
2083 or next;
2084 $neigh->load;
2085 }
2086}
2087
2088sub find_sync { 2330sub find_sync {
2089 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2090 2332
2091 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
2092} 2338}
2093 2339
2094sub do_load_sync { 2340sub do_load_sync {
2095 my ($map) = @_; 2341 my ($map) = @_;
2096 2342
2343 # it's a bug to call this from the main context
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2099 2346
2100 cf::sync_job { $map->load }; 2347 $map->load;
2101} 2348}
2102 2349
2103our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2105 2352
2106sub find_async { 2353sub find_async {
2107 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2108 2355
2109 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2110 2357
2111 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2113 } 2360 }
2114 2361
2115 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2116 2363
2117 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2131 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2132 2379
2133 () 2380 ()
2134} 2381}
2135 2382
2383# common code, used by both ->save and ->swapout
2136sub save { 2384sub _save {
2137 my ($self) = @_; 2385 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2386
2141 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2142 2388
2143 return unless $self->dirty; 2389 return unless $self->dirty;
2144 2390
2164 } else { 2410 } else {
2165 $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);
2166 } 2412 }
2167} 2413}
2168 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2169sub swap_out { 2423sub swap_out {
2170 my ($self) = @_; 2424 my ($self) = @_;
2171 2425
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2177 return if $self->players; 2430 return if $self->players;
2178 return if $self->in_memory != cf::MAP_ACTIVE; 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
2179 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2180 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
2181 $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};
2182 2482
2183 $self->deactivate; 2483 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2485 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2486
2231 $self->unlink_save; 2487 $self->unlink_save;
2232 $self->destroy; 2488 $self->destroy;
2233} 2489}
2234 2490
2242 2498
2243 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2244 2500
2245 $self->unlink_save; 2501 $self->unlink_save;
2246 2502
2247 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2508
2309 : normalise $_ 2565 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2567 ]
2312} 2568}
2313 2569
2570=item cf::map::static_maps
2571
2572Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2573file in the shared directory excluding F</styles> and F</editor>). May
2574block.
2575
2576=cut
2577
2578sub static_maps() {
2579 my @dirs = "";
2580 my @maps;
2581
2582 while (@dirs) {
2583 my $dir = shift @dirs;
2584
2585 next if $dir eq "/styles" || $dir eq "/editor";
2586
2587 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2588 or return;
2589
2590 for (@$files) {
2591 s/\.map$// or next;
2592 utf8::decode $_;
2593 push @maps, "$dir/$_";
2594 }
2595
2596 push @dirs, map "$dir/$_", @$dirs;
2597 }
2598
2599 \@maps
2600}
2601
2314=back 2602=back
2315 2603
2316=head3 cf::object 2604=head3 cf::object
2317 2605
2318=cut 2606=cut
2383 2671
2384our $SAY_CHANNEL = { 2672our $SAY_CHANNEL = {
2385 id => "say", 2673 id => "say",
2386 title => "Map", 2674 title => "Map",
2387 reply => "say ", 2675 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2676 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2389}; 2677};
2390 2678
2391our $CHAT_CHANNEL = { 2679our $CHAT_CHANNEL = {
2392 id => "chat", 2680 id => "chat",
2393 title => "Chat", 2681 title => "Chat",
2450 2738
2451Freezes 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}>).
2452 2740
2453The player should be reasonably safe there for short amounts of time (e.g. 2741The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2742for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2743though, as the player cannot control the character while it is on the link
2456map. 2744map.
2457 2745
2458Will never block. 2746Will never block.
2459 2747
2460=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2482 my ($self) = @_; 2770 my ($self) = @_;
2483 2771
2484 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2485 2773
2774 ++$self->{_link_recursion};
2775
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2777
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2490 2780
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2782}
2493 2783
2494sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2496 2786
2513 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2515 2805
2516 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2519 2809
2520 $map->load; 2810 $map->load;
2521 $map->load_neighbours;
2522 2811
2523 return unless $self->contr->active; 2812 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
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
2543 2836
2544our $GOTOGEN; 2837our $GOTOGEN;
2545 2838
2546sub cf::object::player::goto { 2839sub cf::object::player::goto {
2547 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 }
2548 2847
2549 # 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
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2850
2552 $self->enter_link; 2851 $self->enter_link;
2572 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2573 } 2872 }
2574 } 2873 }
2575 2874
2576 my $map = eval { 2875 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2578 2877
2579 if ($map) { 2878 if ($map) {
2580 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2881 } else {
2583 $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);
2584 } 2883 }
2585 2884
2586 $map 2885 $map
2594 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2597 } 2896 }
2598 2897
2599 $done->() if $done; 2898 $done->($self) if $done;
2600 })->prio (1); 2899 })->prio (1);
2601} 2900}
2602 2901
2603=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2604 2903
2672 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2673 2972
2674 unless (eval { 2973 unless (eval {
2675 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2676 2975
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2686 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp; 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 }
2688 3002
2689 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2690 3004
2691 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
2697 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "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. "
2699 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2701 3015
2702 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 3017 $self->leave_link;
2704 } 3018 }
2705 })->prio (1); 3019 })->prio (1);
2706} 3020}
2707 3021
2719sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2721 3035
2722 utf8::encode $text; 3036 utf8::encode $text;
2723 $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);
2724} 3063}
2725 3064
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 3066
2728Send 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
2732 3071
2733=cut 3072=cut
2734 3073
2735# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2737 "c/identify" => { 3082 "c/identify" => {
2738 id => "infobox", 3083 id => "infobox",
2739 title => "Identify", 3084 title => "Identify",
2740 reply => undef, 3085 reply => undef,
2741 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2743 "c/examine" => { 3088 "c/examine" => {
2744 id => "infobox", 3089 id => "infobox",
2745 title => "Examine", 3090 title => "Examine",
2746 reply => undef, 3091 reply => undef,
2747 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",
2748 }, 3099 },
2749 "c/book" => { 3100 "c/book" => {
2750 id => "infobox", 3101 id => "infobox",
2751 title => "Book", 3102 title => "Book",
2752 reply => undef, 3103 reply => undef,
2768 id => "infobox", 3119 id => "infobox",
2769 title => "Body Parts", 3120 title => "Body Parts",
2770 reply => undef, 3121 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2772 }, 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 },
2773 "c/uptime" => { 3160 "c/uptime" => {
2774 id => "infobox", 3161 id => "infobox",
2775 title => "Uptime", 3162 title => "Uptime",
2776 reply => undef, 3163 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3173 id => "party",
2787 title => "Party", 3174 title => "Party",
2788 reply => "gsay ", 3175 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3176 tooltip => "Messages and chat related to your party",
2790 }, 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,
2791); 3186);
2792 3187
2793sub cf::client::send_msg { 3188sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3190
2800 3195
2801 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2804 3199
2805 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2809 3202
2810 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3208 }
2817 3209
2818 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2819 } 3211 }
2820 3212
2821 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2822 3214
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3215 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2827 3218
2828 my $pkt = "msg " 3219 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3220 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3222 );
2832 3223
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3224 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3225}
2870 3226
2871=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2872 3228
2873Sends an ext event to the client. 3229Sends an ext event to the client.
2876 3232
2877sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2879 3235
2880 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 } 3241 }
2886} 3242}
2887 3243
2888=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2889 3245
2892=cut 3248=cut
2893 3249
2894sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2896 3252
2897 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904} 3256}
2905 3257
2906=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2907 3259
2908Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2963 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2964 3316
2965 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2966 3318
2967 if (ref $msg) { 3319 if (ref $msg) {
2968 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2969 "ARRAY" eq ref $msg
2970 ? @$msg
2971 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2972 3321
2973 my @reply; 3322 my @reply;
2974 3323
2975 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
2976 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
2978 3327
2979 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
2980 if $reply; 3329 if $reply;
2981 3330
2982 } else { 3331 } else {
2983 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";
2984 } 3333 }
2985 3334
2986 cf::override; 3335 cf::override;
2987 }, 3336 },
2988); 3337);
3008 3357
3009 $coro 3358 $coro
3010} 3359}
3011 3360
3012cf::client->attach ( 3361cf::client->attach (
3013 on_destroy => sub { 3362 on_client_destroy => sub {
3014 my ($ns) = @_; 3363 my ($ns) = @_;
3015 3364
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3366 },
3018); 3367);
3034our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3035 3384
3036$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3037 3386
3038$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3041 sort time 3390 sort time
3042)); 3391));
3043 3392
3044# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3049 3398
3050 cf::object 3399 cf::object
3051 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
3052 insert remove name archname title slaying race decrease split 3401 insert remove name archname title slaying race decrease split
3402 value
3053 3403
3054 cf::object::player 3404 cf::object::player
3055 player 3405 player
3056 3406
3057 cf::player 3407 cf::player
3063=cut 3413=cut
3064 3414
3065for ( 3415for (
3066 ["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
3067 insert remove inv nrof name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3072) { 3422) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3425 for @funs;
3077} 3426}
3078 3427
3093 3442
3094 my $qcode = $code; 3443 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3097 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3098 local $_; 3450 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3451
3101 my $eval = 3452 my $eval =
3102 "do {\n" 3453 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3456 . $code
3106 . "\n}" 3457 . "\n}"
3107 ; 3458 ;
3108 3459
3460 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 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 }
3112 3469
3113 if ($@) { 3470 if ($@) {
3114 warn "$@"; 3471 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3117 } 3474 }
3118 3475
3119 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3120} 3477}
3121 3478
3135=cut 3492=cut
3136 3493
3137sub register_script_function { 3494sub register_script_function {
3138 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3139 3496
3140 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3142} 3499}
3143 3500
3144=back 3501=back
3145 3502
3146=cut 3503=cut
3155 # for this (global event?) 3512 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3157 3514
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3516
3160 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3161 3518
3162 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3163 0 < aio_load $path, $facedata
3164 or die "$path: $!";
3165
3166 $facedata = Coro::Storable::thaw $facedata;
3167 3520
3168 $facedata->{version} == 2 3521 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3170 3523
3171 # 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]);
3172 $facedata->{resource}{"res/exp_table"} = { 3526 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC, 3527 type => FT_RSRC,
3174 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),
3175 }; 3530 };
3176 cf::cede_to_tick; 3531 cf::cede_to_tick;
3177 3532
3178 { 3533 {
3179 my $faces = $facedata->{faceinfo}; 3534 my $faces = $facedata->{faceinfo};
3181 while (my ($face, $info) = each %$faces) { 3536 while (my ($face, $info) = each %$faces) {
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3537 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3538
3184 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3187 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} ;
3188 3544
3189 cf::cede_to_tick; 3545 cf::cede_to_tick;
3190 } 3546 }
3191 3547
3192 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
3197 3553
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3557 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3559 }
3204 3560
3205 cf::cede_to_tick; 3561 cf::cede_to_tick;
3206 } 3562 }
3207 } 3563 }
3216 3572
3217 cf::anim::invalidate_all; # d'oh 3573 cf::anim::invalidate_all; # d'oh
3218 } 3574 }
3219 3575
3220 { 3576 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3224 3578
3225 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3583
3230 if ($info->{type} & 1) { 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3585 cf::face::set_type $idx, $type;
3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3245 } else { 3587 } else {
3246 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3247 } 3589 }
3248 3590
3249 cf::cede_to_tick; 3591 cf::cede_to_tick;
3250 } 3592 }
3251 } 3593 }
3252 3594
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3596
3255 1 3597 1
3256} 3598}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3277 3599
3278register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3280 3602
3281 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
3320sub reload_treasures { 3642sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3323} 3645}
3324 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
3325sub reload_resources { 3667sub reload_resources {
3326 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3327 3669
3670 reload_exp_table;
3671 reload_materials;
3328 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3329 reload_archetypes; 3674 reload_archetypes;
3330 reload_regions; 3675 reload_regions;
3331 reload_treasures; 3676 reload_treasures;
3332 3677
3333 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3334}
3335
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342} 3679}
3343 3680
3344sub reload_config { 3681sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3682 trace "reloading config file...\n";
3346 or return;
3347 3683
3348 local $/; 3684 my $config = load_file "$CONFDIR/config";
3349 *CFG = YAML::Load <$fh>; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3350 3687
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3689
3353 $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};
3354 $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};
3355 3692
3356 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
3379 3716
3380 seek $fh, 0, 0; 3717 seek $fh, 0, 0;
3381 print $fh $$; 3718 print $fh $$;
3382} 3719}
3383 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
3384sub main { 3730sub main {
3385 atomic; 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
3386 3739
3387 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
3389 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#
3390 (async { 3743 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3744 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3745 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3746 })->prio (Coro::PRIO_MAX);
3394 }; 3747 };
3395 3748
3396 { 3749 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 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;
3398 reload_config; 3761 reload_config;
3399 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
3400 load_extensions; 3772 load_extensions;
3401 3773
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3774 utime time, time, $RUNTIMEFILE;
3406 3775
3407 # no (long-running) fork's whatsoever before this point(!) 3776 # no (long-running) fork's whatsoever before this point(!)
3777 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3778 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3779
3410 EV::loop; 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;
3411} 3791}
3412 3792
3413############################################################################# 3793#############################################################################
3414# initialisation and cleanup 3794# initialisation and cleanup
3415 3795
3416# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3417BEGIN { 3797BEGIN {
3418 our %SIGWATCHER = (); 3798 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3422 }; 3802 };
3423 } 3803 }
3424} 3804}
3425 3805
3426sub write_runtime_sync { 3806sub write_runtime_sync {
3807 my $t0 = AE::time;
3808
3427 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3429 3811
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3813
3432 my $guard = cf::lock_acquire "write_runtime"; 3814 my $guard = cf::lock_acquire "write_runtime";
3433 3815
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3816 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3817 or return;
3436 3818
3437 my $value = $cf::RUNTIME + 90 + 10; 3819 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3820 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3821 # 60 allows for the watchdog to kill the server.
3452 or return; 3834 or return;
3453 3835
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3837 and return;
3456 3838
3457 warn "runtime file written.\n"; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3840
3459 1 3841 1
3460} 3842}
3461 3843
3462our $uuid_lock; 3844our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3853 my $uuid = "$LOCALDIR/uuid";
3472 3854
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3855 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3856 or return;
3475 3857
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3858 my $value = uuid_seq uuid_cur;
3859
3860 unless ($value) {
3861 info "cowardly refusing to write zero uuid value!\n";
3862 return;
3863 }
3864
3865 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3866 $uuid_skip = 0;
3478 3867
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3868 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3869 and return;
3481 3870
3487 or return; 3876 or return;
3488 3877
3489 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3490 and return; 3879 and return;
3491 3880
3492 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3493 3882
3494 1 3883 1
3495 3884
3496} 3885}
3497 3886
3503} 3892}
3504 3893
3505sub emergency_save() { 3894sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3507 3896
3508 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;
3509 3903
3510 cf::sync_job { 3904 cf::sync_job {
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3511 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 3913 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 3915 $pl->save;
3520 } 3916 }
3521 warn "end emergency player save\n"; 3917 info "emergency_perl_save: end player save\n";
3522 3918
3523 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";
3524 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 3924 $map->valid or next;
3527 $map->save; 3925 $map->save;
3528 } 3926 }
3529 warn "end emergency map save\n"; 3927 info "emergency_perl_save: end map save\n";
3530 3928
3531 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";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3534 3934
3535 warn "begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 3936 write_uuid_sync 1;
3537 warn "end write uuid\n"; 3937 info "emergency_perl_save: end write uuid\n";
3938
3939 cf::write_runtime_sync; # external watchdog should not bark
3940
3941 trace "emergency_perl_save: syncing database to disk";
3942 BDB::db_env_txn_checkpoint $DB_ENV;
3943
3944 info "emergency_perl_save: starting sync\n";
3945 IO::AIO::aio_sync sub {
3946 info "emergency_perl_save: finished sync\n";
3947 };
3948
3949 cf::write_runtime_sync; # external watchdog should not bark
3950
3951 trace "emergency_perl_save: flushing outstanding aio requests";
3952 while (IO::AIO::nreqs || BDB::nreqs) {
3953 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3954 }
3955
3956 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 3957 };
3539 3958
3540 warn "leave emergency perl save\n"; 3959 info "emergency_perl_save: leave\n";
3541} 3960}
3542 3961
3543sub post_cleanup { 3962sub post_cleanup {
3544 my ($make_core) = @_; 3963 my ($make_core) = @_;
3545 3964
3965 IO::AIO::flush;
3966
3546 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 3968 if $make_core;
3548 3969
3549 my $fh = pidfile; 3970 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 3971 unlink $PIDFILE if <$fh> == $$;
3551} 3972}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 3993 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 3994 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 3996 }
3576 warn "cleared package #$pkg\n";#d#
3577} 3997}
3578
3579our $RELOAD; # how many times to reload
3580 3998
3581sub do_reload_perl() { 3999sub do_reload_perl() {
3582 # can/must only be called in main 4000 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3584 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3585 return; 4003 return;
3586 } 4004 }
3587 4005
3588 return if $RELOAD++; 4006 return if $RELOAD++;
3589 4007
4008 my $t1 = AE::time;
4009
3590 while ($RELOAD) { 4010 while ($RELOAD) {
3591 warn "reloading..."; 4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
3592 4013
3593 warn "entering sync_job"; 4014 trace "perl_reload: entering sync_job";
3594 4015
3595 cf::sync_job { 4016 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 4017 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 4018
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 while (IO::AIO::nreqs || BDB::nreqs) {
3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608 }
3609
3610 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 4021 %EXT_CORO = ();
3613 4022
3614 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3615 %COMMAND = (); 4024 %COMMAND = ();
3616 4025
3617 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 4027 %EXTCMD = ();
3619 %EXTICMD = (); 4028 %EXTICMD = ();
3620 4029
3621 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3624 4033
3625 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3626 eval { 4035 eval {
3627 $cb->($pkg); 4036 $cb->($pkg);
3628 1 4037 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
3630 } 4039 }
3631 4040
3632 warn "... clearing $pkg"; 4041 trace "... clearing $pkg";
3633 clear_package $pkg; 4042 clear_package $pkg;
3634 } 4043 }
3635 4044
3636 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 4048
3640 warn "... unloading $k"; 4049 trace "... unloading $k";
3641 delete $INC{$k}; 4050 delete $INC{$k};
3642 4051
3643 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3645 4054
3648 } 4057 }
3649 4058
3650 clear_package $k; 4059 clear_package $k;
3651 } 4060 }
3652 4061
3653 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 4063 clear_package "safe::$_"
3655 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);
3656 4065
3657 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 4069
3661 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4071 # and global variables created in xs
3663 #clear_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3664 4073
3665 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3666 4075
3667 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3668 require cf; 4077 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4078 cf::_connect_to_perl_1;
3670 4079
3671 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4081 cf::reload_config;
3673 4082
3674 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4084 cf::load_extensions;
3676 4085
4086 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
4093 }
3683 4094
3684 warn "leaving sync_job"; 4095 cf::_post_init 1;
4096
4097 trace "perl_reload: leaving sync_job";
3685 4098
3686 1 4099 1
3687 } or do { 4100 } or do {
3688 warn $@; 4101 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4103 };
3691 4104
3692 warn "reloaded";
3693 --$RELOAD; 4105 --$RELOAD;
3694 } 4106 }
4107
4108 $t1 = AE::time - $t1;
4109 info "perl_reload: completed in ${t1}s\n";
3695}; 4110};
3696 4111
3697our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3698 4113
3699sub reload_perl() { 4114sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4115 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3702 4117
4118 $RELOAD_WATCHER ||= cf::async {
4119 Coro::AIO::aio_wait cache_extensions;
4120
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4122 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
4124 };
3706 }; 4125 };
3707} 4126}
3708 4127
3709register_command "reload" => sub { 4128register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4129 my ($who, $arg) = @_;
3716 reload_perl; 4135 reload_perl;
3717 }; 4136 };
3718 } 4137 }
3719}; 4138};
3720 4139
3721unshift @INC, $LIBDIR; 4140#############################################################################
3722 4141
3723my $bug_warning = 0; 4142my $bug_warning = 0;
3724 4143
3725our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN;
3727
3728sub wait_for_tick { 4144sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3730 4146
3731 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3732 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait;
3734} 4148}
3735 4149
3736sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4152
3739 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4155 $signal->wait;
3742} 4156}
3746 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"
3747 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3748 return; 4162 return;
3749 } 4163 }
3750 4164
3751 cf::server_tick; # one server iteration 4165 cf::one_tick; # one server iteration
4166
4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 4168
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4171 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4173 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3759 }; 4175 };
3760 } 4176 }
3761 4177
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4179 $sig->send;
3764 } 4180 }
3765 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3766 $sig->send;
3767 }
3768 4182
3769 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3771 4185
3772 if (0) { 4186 if (0) {
3773 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3777 } 4191 }
3778 } 4192 }
3779} 4193}
3780 4194
3781{ 4195{
3782 # configure BDB 4196 # configure BDB
3783 4197
3784 BDB::min_parallel 8; 4198 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3787 4201
3788 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4205 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3826 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
3827 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
3828 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
3829} 4243}
3830 4244
3831my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
3832 4247
3833sub _log_backtrace { 4248sub _log_backtrace {
3834 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
3835 4250
3836 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
3837 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3838 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
3839 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
3840 ++$_log_backtrace; 4259 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg; 4260 my $perl_bt = Carp::longmess $msg;
3842 async { 4261 async {
3843 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
3844 4263
3864 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
3865 --$_log_backtrace; 4284 --$_log_backtrace;
3866 }; 4285 };
3867 } else { 4286 } else {
3868 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3870 } 4289 }
3871} 4290}
3872 4291
3873# load additional modules 4292# load additional modules
3874use cf::pod; 4293require "cf/$_.pm" for @EXTRA_MODULES;
4294cf::_connect_to_perl_2;
3875 4295
3876END { cf::emergency_save } 4296END { cf::emergency_save }
3877 4297
38781 42981
3879 4299

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines