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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines