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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 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
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %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;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
116 135
117our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
119our $NOW; 139our $NOW;
120 140
121our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
129our $LOADAVG; # same thing, but with alpha-smoothing 149our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 150our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 151our $TICK_START; # for load detecting purposes
132 152
133our @POST_INIT; 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;
134 160
135binmode STDOUT; 161binmode STDOUT;
136binmode STDERR; 162binmode STDERR;
137 163
138# read virtual server time, if available 164# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 166 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 167 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 168 $RUNTIME = <$fh> + 0.;
143} 169}
144 170
171eval "sub TICK() { $TICK } 1" or die;
172
145mkdir $_ 173mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 174 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 175
148our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
149 177
150sub cf::map::normalise; 178sub cf::map::normalise;
151 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
152############################################################################# 184#############################################################################
153 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
154=head2 GLOBAL VARIABLES 197=head2 GLOBAL VARIABLES
155 198
156=over 4 199=over 4
157 200
158=item $cf::UPTIME 201=item $cf::UPTIME
159 202
160The 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.
161 219
162=item $cf::RUNTIME 220=item $cf::RUNTIME
163 221
164The 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
165every server tick. 223every server tick.
171Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
172directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
173unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
174database environment. 232database environment.
175 233
176=item $cf::NOW
177
178The time of the last (current) server tick.
179
180=item $cf::TICK
181
182The interval between server ticks, in seconds.
183
184=item $cf::LOADAVG 234=item $cf::LOADAVG
185 235
186The 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
187(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
188objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
197from wherever your confdir points to. 247from wherever your confdir points to.
198 248
199=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
200 250
201These 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
202returns 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
203per 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.
204 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
205=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
206 273
207This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 276that call.
210 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
211=back 284=back
212 285
213=cut 286=cut
214 287
215BEGIN { 288sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 295 my $msg = join "", @_;
218 296
219 $msg .= "\n" 297 $msg .= "\n"
220 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
221 299
222 $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;
223 301
224 LOG llevError, $msg; 302 LOG llevWarn, $msg;
225 }; 303};
226}
227 304
228$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
230 307
231 if ($Coro::current == $Coro::main) {#d# 308 error Carp::longmess $_[0];
309
310 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 312 return;#d#
234 }#d# 313 }#d#
235 314
236 # kill coroutine otherwise 315 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 316 Coro::terminate
239}; 317};
240
241$SIG{__DIE__} = sub { }; #d#?
242 318
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 319@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 320@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 321@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 322@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 336)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 338}
263 339
264$EV::DIED = sub { 340$EV::DIED = sub {
265 warn "error in event callback: @_"; 341 warn "error in event callback: $@";
266}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
267 348
268############################################################################# 349#############################################################################
269 350
270=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
271 352
292 $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;
293 $d 374 $d
294 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
295} 376}
296 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
297=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
298 431
299Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
300 433
301=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
307our $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
308 441
309sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
311 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
312=item cf::post_init { BLOCK } 476=item cf::post_init { BLOCK }
313 477
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 479but I<before> the server starts ticking again.
316 480
317The cdoeblock will have a single boolean argument to indicate whether this 481The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 482is a reload or not.
319 483
320=cut 484=cut
321 485
322sub post_init(&) { 486sub post_init(&) {
323 push @POST_INIT, shift; 487 push @POST_INIT, shift;
324} 488}
325 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
326=item cf::lock_wait $string 507=item cf::lock_wait $string
327 508
328Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
329 510
330=item my $lock = cf::lock_acquire $string 511=item my $lock = cf::lock_acquire $string
331 512
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 515for example when the coroutine gets canceled), the lock is automatically
335returned. 516returned.
336 517
337Locks 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
338deadlocked coro. 519deadlocked coro.
344 525
345Return 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.
346 527
347=cut 528=cut
348 529
349our %LOCK; 530our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 531
352sub lock_wait($) { 532sub lock_wait($) {
353 my ($key) = @_; 533 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 534}
367 535
368sub lock_acquire($) { 536sub lock_acquire($) {
369 my ($key) = @_; 537 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 538}
383 539
384sub lock_active($) { 540sub lock_active($) {
385 my ($key) = @_; 541 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 542}
389 543
390sub freeze_mainloop { 544sub freeze_mainloop {
391 tick_inhibit_inc; 545 tick_inhibit_inc;
392 546
393 Coro::guard \&tick_inhibit_dec; 547 &Guard::guard (\&tick_inhibit_dec);
394} 548}
395 549
396=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
397 551
398Like 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
399get spread over timer. 553get spread over time.
400 554
401=cut 555=cut
402 556
403sub periodic($$) { 557sub periodic($$) {
404 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
409} 563}
410 564
411=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
412 566
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
414This 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
415of 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.
416 574
417The 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
418used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
419 577
420Useful for short background jobs. 578Useful for short background jobs.
421 579
422=cut 580=cut
423 581
424our @SLOT_QUEUE; 582our @SLOT_QUEUE;
425our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
426 585
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
430 589
431 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
432 592
433 while () { 593 while () {
434 next_job: 594 next_job:
595
435 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 597
437 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 602 $job->[2]->send;
441 Coro::cede; 603 Coro::cede;
442 goto next_job; 604 goto next_job;
443 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 607 }
445 } 608 }
446 609
447 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
450 $signal->wait;
451 } else { 613 } else {
614 $busy = 0;
452 Coro::schedule; 615 Coro::schedule;
453 } 616 }
454 } 617 }
455}; 618};
456 619
457sub get_slot($;$$) { 620sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
459 622
460 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
461 624
462 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
463 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
464 628
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
493=cut 657=cut
494 658
495sub sync_job(&) { 659sub sync_job(&) {
496 my ($job) = @_; 660 my ($job) = @_;
497 661
498 if ($Coro::current == $Coro::main) { 662 if (in_main) {
499 my $time = EV::time; 663 my $time = AE::time;
500 664
501 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
503 667
504 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
505 669
506 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
507 671
508 my $busy = 1; 672 my $busy = 1;
509 my @res; 673 my @res;
510 674
511 (async { 675 (async {
512 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 677 @res = eval { $job->() };
514 warn $@ if $@; 678 error $@ if $@;
515 undef $busy; 679 undef $busy;
516 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
517 681
518 while ($busy) { 682 while ($busy) {
519 if (Coro::nready) { 683 if (Coro::nready) {
521 } else { 685 } else {
522 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
523 } 687 }
524 } 688 }
525 689
526 my $time = EV::time - $time; 690 my $time = AE::time - $time;
527 691
528 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
529 693
530 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
531 } else { 695 } else {
553 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
554 718
555 $coro 719 $coro
556} 720}
557 721
558=item fork_call { }, $args 722=item fork_call { }, @args
559 723
560Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 727never block itself or use any form of event handling.
564 728
565=cut 729=cut
566 730
731sub post_fork {
732 reset_signals;
733}
734
567sub fork_call(&@) { 735sub fork_call(&@) {
568 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
569 737
570 # 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,
571 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
573 741
574 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
575 reset_signals; 743 cf::post_fork;
576 &$cb 744 &$cb
577 }, @args; 745 } @args;
578 746
579 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 )
580} 759}
581 760
582=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
583 762
584=cut 763=cut
621within each server. 800within each server.
622 801
623=cut 802=cut
624 803
625sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
626 my ($name) = @_; 808 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
628 810
629 eval { 811 eval {
630 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
640} 822}
641 823
642our $DB; 824our $DB;
643 825
644sub db_init { 826sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
647 };
648} 828}
649 829
650sub db_get($$) { 830sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
652 832
653 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
654 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
655 837
656 $! ? () 838 $! ? ()
657 : $data 839 : $data
658 }
659} 840}
660 841
661sub db_put($$$) { 842sub db_put($$$) {
662 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 872
692 my @data; 873 my @data;
693 my $md5; 874 my $md5;
694 875
695 for (0 .. $#$src) { 876 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 878 }
699 879
700 # if processing is expensive, check 880 # if processing is expensive, check
701 # checksum first 881 # checksum first
702 if (1) { 882 if (1) {
719 899
720 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 901 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
723 903
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 905
726 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
729 909
739 919
740=cut 920=cut
741 921
742sub datalog($@) { 922sub datalog($@) {
743 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 925}
746 926
747=back 927=back
748 928
749=cut 929=cut
944 1124
945 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1127
948 } elsif (ref $type) { 1128 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
950 1130
951 } else { 1131 } else {
952 shift @arg; 1132 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
954 } 1134 }
955 } 1135 }
956} 1136}
957 1137
958sub _object_attach { 1138sub _object_attach {
968 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
969 } 1149 }
970 1150
971 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
972 } else { 1152 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1154 }
975 1155
976 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
977} 1157}
978 1158
1037 1217
1038 for (@$callbacks) { 1218 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1040 1220
1041 if ($@) { 1221 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1223 override;
1045 } 1224 }
1046 1225
1047 return 1 if $override; 1226 return 1 if $override;
1048 } 1227 }
1127 for (@$attach) { 1306 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1130 } 1309 }
1131 } else { 1310 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1312 }
1134 } 1313 }
1135} 1314}
1136 1315
1137cf::attachable->attach ( 1316cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1165 1344
1166 sync_job { 1345 sync_job {
1167 if (length $$rdata) { 1346 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1171 1351
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1359 aio_close $fh;
1177 1360
1178 if (@$objs) { 1361 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1363 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1370 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1372 }
1187 } else { 1373 } else {
1188 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1189 } 1375 }
1190 1376
1191 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1192 1378
1193 $filename =~ s%/[^/]+$%%; 1379 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1380 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1381 } else {
1196 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1197 } 1383 }
1198 } else { 1384 } else {
1199 aio_unlink $filename; 1385 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1201 } 1387 }
1225 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs}; 1412 $av = $st->{objs};
1227 } 1413 }
1228 1414
1229 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1232 1419
1233 ($data, $av) 1420 ($data, $av)
1234} 1421}
1235 1422
1236=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1293 1480
1294 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1295} 1482}
1296 1483
1484use File::Glob ();
1485
1297cf::player->attach ( 1486cf::player->attach (
1298 on_command => sub { 1487 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1300 1489
1301 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1302 or return; 1491 or return;
1303 1492
1311 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1312 1501
1313 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1314 1503
1315 if (ref $msg) { 1504 if (ref $msg) {
1316 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1317 "ARRAY" eq ref $msg
1318 ? @$msg
1319 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1320 1506
1321 my @reply; 1507 my @reply;
1322 1508
1323 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1324 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1326 1512
1327 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1328 if $reply; 1514 if $reply;
1329 1515
1330 } else { 1516 } else {
1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1332 } 1518 }
1333 1519
1334 cf::override; 1520 cf::override;
1335 }, 1521 },
1336); 1522);
1337 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
1338sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1339 cf::sync_job { 1553 cf::sync_job {
1340 my %todo; 1554 my %todo;
1341 1555
1342 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1343 next unless -r $path; 1557 next unless -r $path;
1361 1575
1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1364 1578
1365 $ext{source} = 1579 $ext{source} =
1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1367 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1368 . $source 1582 . $source
1369 . "\n};\n1"; 1583 . "\n};\n1";
1370 1584
1371 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1372 } 1586 }
1373 1587
1588 my $pass = 0;
1374 my %done; 1589 my %done;
1375 while (%todo) { 1590 while (%todo) {
1376 my $progress; 1591 my $progress;
1377 1592
1593 ++$pass;
1594
1595 ext:
1378 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1598 next ext
1381 unless exists $done{$_}; 1599 unless exists $done{$_};
1382 } 1600 }
1383 1601
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1603
1386 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 $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1617
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1619 if exists $v->{meta}{mandatory};
1394 1620
1395 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;
1396 } 1630 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1631 }
1402 1632
1403 skip: 1633 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 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 }
1406 } 1643 }
1407 }; 1644 };
1408} 1645}
1409 1646
1410############################################################################# 1647#############################################################################
1494 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1495 } 1732 }
1496 } 1733 }
1497} 1734}
1498 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
1499sub save($) { 1749sub save($) {
1500 my ($pl) = @_; 1750 my ($pl) = @_;
1501 1751
1502 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1503 1753
1508 1758
1509 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1511 1761
1512 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];
1513 1766
1514 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1768 cf::cede_to_tick;
1516} 1769}
1517 1770
1551 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1552 1805
1553 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1554 $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
1555 1808
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1557 $pl->deactivate; 1810 $pl->deactivate;
1811
1558 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;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1561 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1562 1817
1563 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1565 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1619 \@logins 1874 \@logins
1620} 1875}
1621 1876
1622=item $player->maps 1877=item $player->maps
1623 1878
1879=item cf::player::maps $login
1880
1624Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1625player. May block. 1882player. May block.
1626 1883
1627=cut 1884=cut
1628 1885
1690=cut 1947=cut
1691 1948
1692sub find_by_path($) { 1949sub find_by_path($) {
1693 my ($path) = @_; 1950 my ($path) = @_;
1694 1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1953
1695 my ($match, $specificity); 1954 my ($match, $specificity);
1696 1955
1697 for my $region (list) { 1956 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1958 ($match, $specificity) = ($region, $region->specificity)
1727sub generate_random_map { 1986sub generate_random_map {
1728 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1729 1988
1730 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
1731 1990
1732 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1992}
1747 1993
1748=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1749 1995
1750Register 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
1755 2001
1756sub register { 2002sub register {
1757 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 2004 my $pkg = caller;
1759 2005
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 2007
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 2009}
1765 2010
1766# also paths starting with '/' 2011# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 2013
1769sub thawer_merge { 2014sub thawer_merge {
1770 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1771 2016
1772 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1777} 2022}
1778 2023
1779sub normalise { 2024sub normalise {
1780 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1781 2026
1782 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1783 2028
1784 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1785 2030
1786 # map plan: 2031 # map plan:
1787 # 2032 #
1802 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 2048 $path = "$base/$path";
1804 } 2049 }
1805 2050
1806 for ($path) { 2051 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1810 } 2054 }
1811 2055
1812 $path 2056 $path
1826 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1827 return $self; 2071 return $self;
1828 } 2072 }
1829 } 2073 }
1830 2074
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 2076 ()
1833} 2077}
1834 2078
2079# may re-bless or do other evil things
1835sub init { 2080sub init {
1836 my ($self) = @_; 2081 my ($self) = @_;
1837 2082
1838 $self 2083 $self
1839} 2084}
1870 2115
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1873} 2118}
1874 2119
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 2120sub decay_objects {
1885 my ($self) = @_; 2121 my ($self) = @_;
1886 2122
1887 return if $self->{deny_reset}; 2123 return if $self->{deny_reset};
1888 2124
1913 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1914 2150
1915 1 2151 1
1916} 2152}
1917 2153
2154# used to laod the header of an original map
1918sub load_header_orig { 2155sub load_header_orig {
1919 my ($self) = @_; 2156 my ($self) = @_;
1920 2157
1921 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1922} 2159}
1923 2160
2161# used to laod the header of an instantiated map
1924sub load_header_temp { 2162sub load_header_temp {
1925 my ($self) = @_; 2163 my ($self) = @_;
1926 2164
1927 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1928} 2166}
1929 2167
2168# called after loading the header from an instantiated map
1930sub prepare_temp { 2169sub prepare_temp {
1931 my ($self) = @_; 2170 my ($self) = @_;
1932 2171
1933 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1934 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1935 # safety 2174 # safety
1936 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1937 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1938} 2177}
1939 2178
2179# called after loading the header from an original map
1940sub prepare_orig { 2180sub prepare_orig {
1941 my ($self) = @_; 2181 my ($self) = @_;
1942 2182
1943 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1944 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1968 2208
1969sub find; 2209sub find;
1970sub find { 2210sub find {
1971 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1972 2212
2213 cf::cede_to_tick;
2214
1973 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1974 2216
1975 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2219
1978 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
1983 or return; 2222 or return;
1984 2223
1985 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
1986 2225
1998 2237
1999 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2000 } 2239 }
2001} 2240}
2002 2241
2003sub pre_load { } 2242sub pre_load { }
2004sub post_load { } 2243#sub post_load { } # XS
2005 2244
2006sub load { 2245sub load {
2007 my ($self) = @_; 2246 my ($self) = @_;
2008 2247
2009 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2012 2251
2013 { 2252 {
2014 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2015 2254
2016 return unless $self->valid; 2255 return unless $self->valid;
2017 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2018
2019 $self->in_memory (cf::MAP_LOADING);
2020 2257
2021 $self->alloc; 2258 $self->alloc;
2022 2259
2023 $self->pre_load; 2260 $self->pre_load;
2024 cf::cede_to_tick; 2261 cf::cede_to_tick;
2025 2262
2263 if (exists $self->{load_path}) {
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2265 $f->skip_block;
2028 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2029 or return; 2267 or return;
2030 2268
2031 $self->post_load_original 2269 $self->post_load_original
2032 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2033 2271
2034 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2273 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2038 $self->clear_unique_items; 2276 $self->clear_unique_items;
2039 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2041 } 2280 }
2042 } 2281 }
2043 }
2044 2282
2045 $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);
2046 2290
2047 cf::cede_to_tick; 2291 cf::cede_to_tick;
2048 # now do the right thing for maps 2292 # now do the right thing for maps
2049 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2050 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2054 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2299 $self->decay_objects;
2056 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2057 $self->update_buttons; 2301 $self->update_buttons;
2058 cf::cede_to_tick; 2302 cf::cede_to_tick;
2059 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2060 cf::cede_to_tick;
2061 $self->activate;
2062 } 2304 }
2063 2305
2064 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2066
2067 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2308 }
2069 2309
2070 $self->post_load; 2310 $self->post_load;
2071}
2072 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
2073sub customise_for { 2318sub customise_for {
2074 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2075 2320
2076 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2322 if $self->per_player;
2080# if $self->per_party; 2325# if $self->per_party;
2081 2326
2082 $self 2327 $self
2083} 2328}
2084 2329
2085# find and load all maps in the 3x3 area around a map
2086sub load_neighbours {
2087 my ($map) = @_;
2088
2089 my @neigh; # diagonal neighbours
2090
2091 for (0 .. 3) {
2092 my $neigh = $map->tile_path ($_)
2093 or next;
2094 $neigh = find $neigh, $map
2095 or next;
2096 $neigh->load;
2097
2098 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 }
2102
2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
2105 my $neigh = find $path, $origin
2106 or next;
2107 $neigh->load;
2108 }
2109}
2110
2111sub find_sync { 2330sub find_sync {
2112 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2113 2332
2114 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
2115} 2338}
2116 2339
2117sub do_load_sync { 2340sub do_load_sync {
2118 my ($map) = @_; 2341 my ($map) = @_;
2119 2342
2343 # it's a bug to call this from the main context
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2122 2346
2123 cf::sync_job { $map->load }; 2347 $map->load;
2124} 2348}
2125 2349
2126our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2128 2352
2129sub find_async { 2353sub find_async {
2130 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2131 2355
2132 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2133 2357
2134 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2136 } 2360 }
2137 2361
2138 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2139 2363
2140 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2155 2379
2156 () 2380 ()
2157} 2381}
2158 2382
2383# common code, used by both ->save and ->swapout
2159sub save { 2384sub _save {
2160 my ($self) = @_; 2385 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2386
2164 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2165 2388
2166 return unless $self->dirty; 2389 return unless $self->dirty;
2167 2390
2187 } else { 2410 } else {
2188 $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);
2189 } 2412 }
2190} 2413}
2191 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2192sub swap_out { 2423sub swap_out {
2193 my ($self) = @_; 2424 my ($self) = @_;
2194 2425
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2200 return if $self->players; 2430 return if $self->players;
2201 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
2202 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2203 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
2204 $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};
2205 2482
2206 $self->deactivate; 2483 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2485 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2486
2254 $self->unlink_save; 2487 $self->unlink_save;
2255 $self->destroy; 2488 $self->destroy;
2256} 2489}
2257 2490
2265 2498
2266 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2267 2500
2268 $self->unlink_save; 2501 $self->unlink_save;
2269 2502
2270 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2508
2332 : normalise $_ 2565 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2567 ]
2335} 2568}
2336 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
2337=back 2602=back
2338 2603
2339=head3 cf::object 2604=head3 cf::object
2340 2605
2341=cut 2606=cut
2406 2671
2407our $SAY_CHANNEL = { 2672our $SAY_CHANNEL = {
2408 id => "say", 2673 id => "say",
2409 title => "Map", 2674 title => "Map",
2410 reply => "say ", 2675 reply => "say ",
2411 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.",
2412}; 2677};
2413 2678
2414our $CHAT_CHANNEL = { 2679our $CHAT_CHANNEL = {
2415 id => "chat", 2680 id => "chat",
2416 title => "Chat", 2681 title => "Chat",
2473 2738
2474Freezes 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}>).
2475 2740
2476The 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.
2477for 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,
2478though, 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
2479map. 2744map.
2480 2745
2481Will never block. 2746Will never block.
2482 2747
2483=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2505 my ($self) = @_; 2770 my ($self) = @_;
2506 2771
2507 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2508 2773
2774 ++$self->{_link_recursion};
2775
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2777
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2513 2780
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2782}
2516 2783
2517sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2519 2786
2536 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2538 2805
2539 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2542 2809
2543 $map->load; 2810 $map->load;
2544 $map->load_neighbours;
2545 2811
2546 return unless $self->contr->active; 2812 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2813
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2552} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2553 2821
2822}
2823
2554=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)]])
2555 2825
2556Moves 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
2557her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2558that 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
2559the 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
2566 2836
2567our $GOTOGEN; 2837our $GOTOGEN;
2568 2838
2569sub cf::object::player::goto { 2839sub cf::object::player::goto {
2570 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 }
2571 2847
2572 # 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
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2850
2575 $self->enter_link; 2851 $self->enter_link;
2595 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2596 } 2872 }
2597 } 2873 }
2598 2874
2599 my $map = eval { 2875 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2601 2877
2602 if ($map) { 2878 if ($map) {
2603 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2881 } else {
2606 $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);
2607 } 2883 }
2608 2884
2609 $map 2885 $map
2617 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2620 } 2896 }
2621 2897
2622 $done->() if $done; 2898 $done->($self) if $done;
2623 })->prio (1); 2899 })->prio (1);
2624} 2900}
2625 2901
2626=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2627 2903
2695 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2696 2972
2697 unless (eval { 2973 unless (eval {
2698 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2699 2975
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2709 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2710 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 }
2711 3002
2712 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2713 3004
2714 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
2720 $self->message ("Something went wrong deep within the deliantra server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2721 . "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. "
2722 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2723 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2724 3015
2725 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2726 $self->leave_link; 3017 $self->leave_link;
2727 } 3018 }
2728 })->prio (1); 3019 })->prio (1);
2729} 3020}
2730 3021
2742sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2743 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2744 3035
2745 utf8::encode $text; 3036 utf8::encode $text;
2746 $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);
2747} 3063}
2748 3064
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 3066
2751Send 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
2755 3071
2756=cut 3072=cut
2757 3073
2758# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2760 "c/identify" => { 3082 "c/identify" => {
2761 id => "infobox", 3083 id => "infobox",
2762 title => "Identify", 3084 title => "Identify",
2763 reply => undef, 3085 reply => undef,
2764 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2766 "c/examine" => { 3088 "c/examine" => {
2767 id => "infobox", 3089 id => "infobox",
2768 title => "Examine", 3090 title => "Examine",
2769 reply => undef, 3091 reply => undef,
2770 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",
2771 }, 3099 },
2772 "c/book" => { 3100 "c/book" => {
2773 id => "infobox", 3101 id => "infobox",
2774 title => "Book", 3102 title => "Book",
2775 reply => undef, 3103 reply => undef,
2791 id => "infobox", 3119 id => "infobox",
2792 title => "Body Parts", 3120 title => "Body Parts",
2793 reply => undef, 3121 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2795 }, 3123 },
3124 "c/statistics" => {
3125 id => "infobox",
3126 title => "Statistics",
3127 reply => undef,
3128 tooltip => "Shows your primary statistics",
3129 },
2796 "c/skills" => { 3130 "c/skills" => {
2797 id => "infobox", 3131 id => "infobox",
2798 title => "Skills", 3132 title => "Skills",
2799 reply => undef, 3133 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 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",
2801 }, 3159 },
2802 "c/uptime" => { 3160 "c/uptime" => {
2803 id => "infobox", 3161 id => "infobox",
2804 title => "Uptime", 3162 title => "Uptime",
2805 reply => undef, 3163 reply => undef,
2815 id => "party", 3173 id => "party",
2816 title => "Party", 3174 title => "Party",
2817 reply => "gsay ", 3175 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3176 tooltip => "Messages and chat related to your party",
2819 }, 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,
2820); 3186);
2821 3187
2822sub cf::client::send_msg { 3188sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3190
2829 3195
2830 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2833 3199
2834 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2838 3202
2839 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3208 }
2846 3209
2847 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2848 } 3211 }
2849 3212
2850 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2851 3214
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3215 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2856 3218
2857 my $pkt = "msg " 3219 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3220 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3222 );
2861 3223
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3224 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3225}
2899 3226
2900=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2901 3228
2902Sends an ext event to the client. 3229Sends an ext event to the client.
2905 3232
2906sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2908 3235
2909 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3241 }
2915} 3242}
2916 3243
2917=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2918 3245
2921=cut 3248=cut
2922 3249
2923sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2925 3252
2926 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 }
2933} 3256}
2934 3257
2935=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2936 3259
2937Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2992 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2993 3316
2994 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2995 3318
2996 if (ref $msg) { 3319 if (ref $msg) {
2997 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2998 "ARRAY" eq ref $msg
2999 ? @$msg
3000 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3001 3321
3002 my @reply; 3322 my @reply;
3003 3323
3004 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3005 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3007 3327
3008 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3009 if $reply; 3329 if $reply;
3010 3330
3011 } else { 3331 } else {
3012 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";
3013 } 3333 }
3014 3334
3015 cf::override; 3335 cf::override;
3016 }, 3336 },
3017); 3337);
3037 3357
3038 $coro 3358 $coro
3039} 3359}
3040 3360
3041cf::client->attach ( 3361cf::client->attach (
3042 on_destroy => sub { 3362 on_client_destroy => sub {
3043 my ($ns) = @_; 3363 my ($ns) = @_;
3044 3364
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3366 },
3047); 3367);
3063our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3064 3384
3065$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3066 3386
3067$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3070 sort time 3390 sort time
3071)); 3391));
3072 3392
3073# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3078 3398
3079 cf::object 3399 cf::object
3080 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
3081 insert remove name archname title slaying race decrease split 3401 insert remove name archname title slaying race decrease split
3402 value
3082 3403
3083 cf::object::player 3404 cf::object::player
3084 player 3405 player
3085 3406
3086 cf::player 3407 cf::player
3092=cut 3413=cut
3093 3414
3094for ( 3415for (
3095 ["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
3096 insert remove inv nrof name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3101) { 3422) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3425 for @funs;
3106} 3426}
3107 3427
3122 3442
3123 my $qcode = $code; 3443 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3126 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3127 local $_; 3450 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3451
3130 my $eval = 3452 my $eval =
3131 "do {\n" 3453 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3456 . $code
3135 . "\n}" 3457 . "\n}"
3136 ; 3458 ;
3137 3459
3460 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3469
3142 if ($@) { 3470 if ($@) {
3143 warn "$@"; 3471 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3146 } 3474 }
3147 3475
3148 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3149} 3477}
3150 3478
3164=cut 3492=cut
3165 3493
3166sub register_script_function { 3494sub register_script_function {
3167 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3168 3496
3169 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3171} 3499}
3172 3500
3173=back 3501=back
3174 3502
3175=cut 3503=cut
3176 3504
3177############################################################################# 3505#############################################################################
3178# the server's init and main functions 3506# the server's init and main functions
3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3179 3509
3180sub load_facedata($) { 3510sub load_facedata($) {
3181 my ($path) = @_; 3511 my ($path) = @_;
3182 3512
3183 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3184 # for this (global event?) 3514 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3516
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3518
3189 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3190 3520
3191 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3522
3197 $facedata->{version} == 2 3523 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3525
3200 # patch in the exptable 3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3529 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3532 };
3205 cf::cede_to_tick; 3533 cf::cede_to_tick;
3206 3534
3207 { 3535 {
3208 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3209 3537
3210 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3541
3213 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3217 3548
3218 cf::cede_to_tick; 3549 cf::cede_to_tick;
3219 } 3550 }
3220 3551
3221 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
3226 3557
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3558 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3559 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3561 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3562 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3563 }
3233 3564
3234 cf::cede_to_tick; 3565 cf::cede_to_tick;
3235 } 3566 }
3236 } 3567 }
3245 3576
3246 cf::anim::invalidate_all; # d'oh 3577 cf::anim::invalidate_all; # d'oh
3247 } 3578 }
3248 3579
3249 { 3580 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3253 3582
3254 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3587
3259 if ($info->{type} & 1) { 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3274 } else { 3592 } else {
3275 $RESOURCE{$name} = $info; 3593# $RESOURCE{$name} = $info; # unused
3276 } 3594 }
3277 3595
3278 cf::cede_to_tick; 3596 cf::cede_to_tick;
3279 } 3597 }
3280 } 3598 }
3281 3599
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3601
3284 1 3602 1
3285} 3603}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3604
3307register_exticmd fx_want => sub { 3605register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3606 my ($ns, $want) = @_;
3309 3607
3310 while (my ($k, $v) = each %$want) { 3608 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3647sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3648 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3649 or die "unable to load treasurelists\n";
3352} 3650}
3353 3651
3652sub reload_sound {
3653 trace "loading sound config from $DATADIR/sound\n";
3654
3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3656
3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3658 my $sound = $soundconf->{compat}[$_]
3659 or next;
3660
3661 my $face = cf::face::find "sound/$sound->[1]";
3662 cf::sound::set $sound->[0] => $face;
3663 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3664 }
3665
3666 while (my ($k, $v) = each %{$soundconf->{event}}) {
3667 my $face = cf::face::find "sound/$v";
3668 cf::sound::set $k => $face;
3669 }
3670}
3671
3354sub reload_resources { 3672sub reload_resources {
3355 warn "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3356 3674
3675 reload_exp_table;
3676 reload_materials;
3357 reload_facedata; 3677 reload_facedata;
3678 reload_sound;
3358 reload_archetypes; 3679 reload_archetypes;
3359 reload_regions; 3680 reload_regions;
3360 reload_treasures; 3681 reload_treasures;
3361 3682
3362 warn "finished reloading resource files\n"; 3683 trace "finished reloading resource files\n";
3363} 3684}
3364 3685
3365sub reload_config { 3686sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3687 trace "reloading config file...\n";
3367 or return;
3368 3688
3369 local $/; 3689 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3690 utf8::decode $config;
3691 *CFG = decode_yaml $config;
3371 3692
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3694
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3695 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3696 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3697
3377 if (exists $CFG{mlockall}) { 3698 if (exists $CFG{mlockall}) {
3400 3721
3401 seek $fh, 0, 0; 3722 seek $fh, 0, 0;
3402 print $fh $$; 3723 print $fh $$;
3403} 3724}
3404 3725
3726sub main_loop {
3727 trace "EV::loop starting\n";
3728 if (1) {
3729 EV::loop;
3730 }
3731 trace "EV::loop returned\n";
3732 goto &main_loop unless $REALLY_UNLOOP;
3733}
3734
3405sub main { 3735sub main {
3406 cf::init_globals; # initialise logging 3736 cf::init_globals; # initialise logging
3407 3737
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418 3742
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3744
3421 # we must not ever block the main coroutine 3745 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3746 local $Coro::idle = sub {
3428 }; 3752 };
3429 3753
3430 evthread_start IO::AIO::poll_fileno; 3754 evthread_start IO::AIO::poll_fileno;
3431 3755
3432 cf::sync_job { 3756 cf::sync_job {
3757 cf::incloader::init ();
3758
3759 cf::init_anim;
3760 cf::init_attackmess;
3761 cf::init_dynamic;
3762
3763 cf::load_settings;
3764
3433 reload_resources; 3765 reload_resources;
3434 reload_config; 3766 reload_config;
3435 db_init; 3767 db_init;
3436 3768
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3769 cf::init_uuid;
3440 cf::init_signals; 3770 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3771 cf::init_skills;
3443 3772
3444 cf::init_beforeplay; 3773 cf::init_beforeplay;
3445 3774
3446 atomic; 3775 atomic;
3448 load_extensions; 3777 load_extensions;
3449 3778
3450 utime time, time, $RUNTIMEFILE; 3779 utime time, time, $RUNTIMEFILE;
3451 3780
3452 # no (long-running) fork's whatsoever before this point(!) 3781 # no (long-running) fork's whatsoever before this point(!)
3782 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3783 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3784
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3785 cf::_post_init 0;
3456 }; 3786 };
3457 3787
3458 EV::loop; 3788 cf::object::thawer::errors_are_fatal 0;
3789 info "parse errors in files are no longer fatal from this point on.\n";
3790
3791 AE::postpone {
3792 undef &main; # free gobs of memory :)
3793 };
3794
3795 goto &main_loop;
3459} 3796}
3460 3797
3461############################################################################# 3798#############################################################################
3462# initialisation and cleanup 3799# initialisation and cleanup
3463 3800
3464# install some emergency cleanup handlers 3801# install some emergency cleanup handlers
3465BEGIN { 3802BEGIN {
3466 our %SIGWATCHER = (); 3803 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3804 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3805 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3806 cf::cleanup "SIG$signal";
3470 }; 3807 };
3471 } 3808 }
3472} 3809}
3473 3810
3474sub write_runtime_sync { 3811sub write_runtime_sync {
3812 my $t0 = AE::time;
3813
3475 # first touch the runtime file to show we are still running: 3814 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3815 # the fsync below can take a very very long time.
3477 3816
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3817 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3818
3480 my $guard = cf::lock_acquire "write_runtime"; 3819 my $guard = cf::lock_acquire "write_runtime";
3481 3820
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3821 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3822 or return;
3484 3823
3485 my $value = $cf::RUNTIME + 90 + 10; 3824 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3825 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3826 # 60 allows for the watchdog to kill the server.
3500 or return; 3839 or return;
3501 3840
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3841 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3842 and return;
3504 3843
3505 warn "runtime file written.\n"; 3844 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3845
3507 1 3846 1
3508} 3847}
3509 3848
3510our $uuid_lock; 3849our $uuid_lock;
3522 or return; 3861 or return;
3523 3862
3524 my $value = uuid_seq uuid_cur; 3863 my $value = uuid_seq uuid_cur;
3525 3864
3526 unless ($value) { 3865 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n"; 3866 info "cowardly refusing to write zero uuid value!\n";
3528 return; 3867 return;
3529 } 3868 }
3530 3869
3531 my $value = uuid_str $value + $uuid_skip; 3870 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0; 3871 $uuid_skip = 0;
3542 or return; 3881 or return;
3543 3882
3544 aio_rename "$uuid~", $uuid 3883 aio_rename "$uuid~", $uuid
3545 and return; 3884 and return;
3546 3885
3547 warn "uuid file written ($value).\n"; 3886 trace "uuid file written ($value).\n";
3548 3887
3549 1 3888 1
3550 3889
3551} 3890}
3552 3891
3558} 3897}
3559 3898
3560sub emergency_save() { 3899sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3900 my $freeze_guard = cf::freeze_mainloop;
3562 3901
3563 warn "enter emergency perl save\n"; 3902 info "emergency_perl_save: enter\n";
3903
3904 # this is a trade-off: we want to be very quick here, so
3905 # save all maps without fsync, and later call a global sync
3906 # (which in turn might be very very slow)
3907 local $USE_FSYNC = 0;
3564 3908
3565 cf::sync_job { 3909 cf::sync_job {
3910 cf::write_runtime_sync; # external watchdog should not bark
3911
3566 # use a peculiar iteration method to avoid tripping on perl 3912 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3913 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3914 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3915 info "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3916 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3917 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3918 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3919 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3920 $pl->save;
3575 } 3921 }
3576 warn "end emergency player save\n"; 3922 info "emergency_perl_save: end player save\n";
3577 3923
3578 warn "begin emergency map save\n"; 3924 cf::write_runtime_sync; # external watchdog should not bark
3925
3926 info "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3927 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3928 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3929 $map->valid or next;
3582 $map->save; 3930 $map->save;
3583 } 3931 }
3584 warn "end emergency map save\n"; 3932 info "emergency_perl_save: end map save\n";
3585 3933
3586 warn "begin emergency database checkpoint\n"; 3934 cf::write_runtime_sync; # external watchdog should not bark
3935
3936 info "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3937 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3938 info "emergency_perl_save: end database checkpoint\n";
3589 3939
3590 warn "begin write uuid\n"; 3940 info "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3941 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3942 info "emergency_perl_save: end write uuid\n";
3943
3944 cf::write_runtime_sync; # external watchdog should not bark
3945
3946 trace "emergency_perl_save: syncing database to disk";
3947 BDB::db_env_txn_checkpoint $DB_ENV;
3948
3949 info "emergency_perl_save: starting sync\n";
3950 IO::AIO::aio_sync sub {
3951 info "emergency_perl_save: finished sync\n";
3952 };
3953
3954 cf::write_runtime_sync; # external watchdog should not bark
3955
3956 trace "emergency_perl_save: flushing outstanding aio requests";
3957 while (IO::AIO::nreqs || BDB::nreqs) {
3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3959 }
3960
3961 cf::write_runtime_sync; # external watchdog should not bark
3593 }; 3962 };
3594 3963
3595 warn "leave emergency perl save\n"; 3964 info "emergency_perl_save: leave\n";
3596} 3965}
3597 3966
3598sub post_cleanup { 3967sub post_cleanup {
3599 my ($make_core) = @_; 3968 my ($make_core) = @_;
3600 3969
3970 IO::AIO::flush;
3971
3601 warn Carp::longmess "post_cleanup backtrace" 3972 error Carp::longmess "post_cleanup backtrace"
3602 if $make_core; 3973 if $make_core;
3603 3974
3604 my $fh = pidfile; 3975 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$; 3976 unlink $PIDFILE if <$fh> == $$;
3606} 3977}
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3997 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 3998 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 3999 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4000# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 4001 }
3631 warn "cleared package $pkg\n";#d#
3632} 4002}
3633 4003
3634sub do_reload_perl() { 4004sub do_reload_perl() {
3635 # can/must only be called in main 4005 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 4006 unless (in_main) {
3637 warn "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3638 return; 4008 return;
3639 } 4009 }
3640 4010
3641 return if $RELOAD++; 4011 return if $RELOAD++;
3642 4012
4013 my $t1 = AE::time;
4014
3643 while ($RELOAD) { 4015 while ($RELOAD) {
3644 warn "reloading..."; 4016 cf::get_slot 0.1, -1, "reload_perl";
4017 info "perl_reload: reloading...";
3645 4018
3646 warn "entering sync_job"; 4019 trace "perl_reload: entering sync_job";
3647 4020
3648 cf::sync_job { 4021 cf::sync_job {
3649 cf::write_runtime_sync; # external watchdog should not bark
3650 cf::emergency_save; 4022 #cf::emergency_save;
3651 cf::write_runtime_sync; # external watchdog should not bark
3652 4023
3653 warn "syncing database to disk";
3654 BDB::db_env_txn_checkpoint $DB_ENV;
3655
3656 # if anything goes wrong in here, we should simply crash as we already saved
3657
3658 warn "flushing outstanding aio requests";
3659 while (IO::AIO::nreqs || BDB::nreqs) {
3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3661 }
3662
3663 warn "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3664 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3665 %EXT_CORO = (); 4026 %EXT_CORO = ();
3666 4027
3667 warn "removing commands"; 4028 trace "perl_reload: removing commands";
3668 %COMMAND = (); 4029 %COMMAND = ();
3669 4030
3670 warn "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3671 %EXTCMD = (); 4032 %EXTCMD = ();
3672 %EXTICMD = (); 4033 %EXTICMD = ();
3673 4034
3674 warn "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3675 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3676 warn "... unloading $pkg"; 4037 trace "... unloading $pkg";
3677 4038
3678 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3679 eval { 4040 eval {
3680 $cb->($pkg); 4041 $cb->($pkg);
3681 1 4042 1
3682 } or warn "$pkg unloaded, but with errors: $@"; 4043 } or error "$pkg unloaded, but with errors: $@";
3683 } 4044 }
3684 4045
3685 warn "... clearing $pkg"; 4046 trace "... clearing $pkg";
3686 clear_package $pkg; 4047 clear_package $pkg;
3687 } 4048 }
3688 4049
3689 warn "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692 4053
3693 warn "... unloading $k"; 4054 trace "... unloading $k";
3694 delete $INC{$k}; 4055 delete $INC{$k};
3695 4056
3696 $k =~ s/\.pm$//; 4057 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g; 4058 $k =~ s/\//::/g;
3698 4059
3701 } 4062 }
3702 4063
3703 clear_package $k; 4064 clear_package $k;
3704 } 4065 }
3705 4066
3706 warn "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3707 clear_package "safe::$_" 4068 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4069 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 4070
3710 warn "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 4074
3714 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3715 # and global variables created in xs 4076 # and global variables created in xs
3716 #clear_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3717 4078
3718 warn "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3719 4080
3720 warn "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3721 require cf; 4082 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4083 cf::_connect_to_perl_1;
3723 4084
3724 warn "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3725 cf::reload_config; 4086 cf::reload_config;
3726 4087
3727 warn "loading extensions"; 4088 trace "perl_reload: loading extensions";
3728 cf::load_extensions; 4089 cf::load_extensions;
3729 4090
4091 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3733 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
4098 }
3736 4099
3737 warn "running post_load"; 4100 cf::_post_init 1;
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739 4101
3740 warn "leaving sync_job"; 4102 trace "perl_reload: leaving sync_job";
3741 4103
3742 1 4104 1
3743 } or do { 4105 } or do {
3744 warn $@; 4106 error $@;
3745 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
3746 }; 4108 };
3747 4109
3748 warn "reloaded";
3749 --$RELOAD; 4110 --$RELOAD;
3750 } 4111 }
4112
4113 $t1 = AE::time - $t1;
4114 info "perl_reload: completed in ${t1}s\n";
3751}; 4115};
3752 4116
3753our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3754 4118
3755sub reload_perl() { 4119sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 4120 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 4121 # coro crashes during coro_state_free->destroy here.
3758 4122
4123 $RELOAD_WATCHER ||= cf::async {
4124 Coro::AIO::aio_wait cache_extensions;
4125
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4126 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 4127 do_reload_perl;
3761 undef $RELOAD_WATCHER; 4128 undef $RELOAD_WATCHER;
4129 };
3762 }; 4130 };
3763} 4131}
3764 4132
3765register_command "reload" => sub { 4133register_command "reload" => sub {
3766 my ($who, $arg) = @_; 4134 my ($who, $arg) = @_;
3772 reload_perl; 4140 reload_perl;
3773 }; 4141 };
3774 } 4142 }
3775}; 4143};
3776 4144
3777unshift @INC, $LIBDIR; 4145#############################################################################
3778 4146
3779my $bug_warning = 0; 4147my $bug_warning = 0;
3780 4148
3781our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN;
3783
3784sub wait_for_tick { 4149sub wait_for_tick() {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3786 4151
3787 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
3788 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait;
3790} 4153}
3791 4154
3792sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3794 4157
3795 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 4160 $signal->wait;
3798} 4161}
3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3803 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
3804 return; 4167 return;
3805 } 4168 }
3806 4169
3807 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4171
4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4173
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4176 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4177 $Coro::current->{desc} = "runtime saver";
3813 write_runtime_sync 4178 write_runtime_sync
3814 or warn "ERROR: unable to write runtime file: $!"; 4179 or error "ERROR: unable to write runtime file: $!";
3815 }; 4180 };
3816 } 4181 }
3817 4182
3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3819 $sig->send; 4184 $sig->send;
3820 } 4185 }
3821 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
3822 $sig->send;
3823 }
3824 4187
3825 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3827 4190
3828 if (0) { 4191 if (0) {
3829 if ($NEXT_TICK) { 4192 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK; 4193 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4194 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d# 4195 debug "jitter $JITTER\n";#d#
3833 } 4196 }
3834 } 4197 }
3835} 4198}
3836 4199
3837{ 4200{
3838 # configure BDB 4201 # configure BDB
3839 4202
3840 BDB::min_parallel 8; 4203 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
3843 4206
3844 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
3883 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
3884 undef $AnyEvent::AIO::WATCHER; 4247 undef $AnyEvent::AIO::WATCHER;
3885} 4248}
3886 4249
3887my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
3888 4252
3889sub _log_backtrace { 4253sub _log_backtrace {
3890 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
3891 4255
3892 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
3893 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3894 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
3895 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
3896 ++$_log_backtrace; 4264 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg; 4265 my $perl_bt = Carp::longmess $msg;
3898 async { 4266 async {
3899 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
3900 4268
3920 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
3921 --$_log_backtrace; 4289 --$_log_backtrace;
3922 }; 4290 };
3923 } else { 4291 } else {
3924 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3926 } 4294 }
3927} 4295}
3928 4296
3929# load additional modules 4297# load additional modules
3930use cf::pod; 4298require "cf/$_.pm" for @EXTRA_MODULES;
4299cf::_connect_to_perl_2;
3931 4300
3932END { cf::emergency_save } 4301END { cf::emergency_save }
3933 4302
39341 43031
3935 4304

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines