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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines