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.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.588 by root, Thu Nov 1 13:02:52 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 ();
36
37use Guard (); 35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 60use Fcntl;
58use YAML (); 61use YAML::XS ();
59use IO::AIO (); 62use IO::AIO ();
60use Time::HiRes; 63use Time::HiRes;
61use Compress::LZF; 64use Compress::LZF;
62use Digest::MD5 (); 65use Digest::MD5 ();
63 66
76 79
77# strictly for debugging 80# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 82
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
81 86
82our %COMMAND = (); 87our %COMMAND = ();
83our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
84 89
85our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
88our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
90 95
91our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
93 100
94our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
95our $DATADIR = datadir; 103our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
99our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 116
108our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
109 124
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 127our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 133our $DB_ENV;
119 134
120our @EXTRA_MODULES = qw(pod mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 136
122our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
123 139
124our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
126our $NOW; 143our $NOW;
127 144
128our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
139 156
140our @POST_INIT; 157our @POST_INIT;
141 158
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
144 164
145binmode STDOUT; 165binmode STDOUT;
146binmode STDERR; 166binmode STDERR;
147 167
148# read virtual server time, if available 168# read virtual server time, if available
159 179
160our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
161 181
162sub cf::map::normalise; 182sub cf::map::normalise;
163 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
164############################################################################# 188#############################################################################
165 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
166=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
167 202
168=over 4 203=over 4
169 204
170=item $cf::UPTIME 205=item $cf::UPTIME
171 206
172The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
173 223
174=item $cf::RUNTIME 224=item $cf::RUNTIME
175 225
176The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 227every server tick.
183Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
186database environment. 236database environment.
187 237
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 238=item $cf::LOADAVG
197 239
198The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
199(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 251from wherever your confdir points to.
210 252
211=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
212 254
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
275
217=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
218 277
219This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 280that call.
222 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
223=back 288=back
224 289
225=cut 290=cut
226 291
227BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
298$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 299 my $msg = join "", @_;
230 300
231 $msg .= "\n" 301 $msg .= "\n"
232 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
233 303
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 305
236 LOG llevError, $msg; 306 LOG llevWarn, $msg;
237 }; 307};
238}
239 308
240$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
242 311
243 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 316 return;#d#
246 }#d# 317 }#d#
247 318
248 # kill coroutine otherwise 319 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 320 Coro::terminate
251}; 321};
252
253$SIG{__DIE__} = sub { }; #d#?
254 322
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 340)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 342}
275 343
276$EV::DIED = sub { 344$EV::DIED = sub {
277 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
278}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
279 352
280############################################################################# 353#############################################################################
281 354
282=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
283 356
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 378 $d
306 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
307} 380}
308 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
309=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
310 435
311Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
312 437
313=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
320 445
321sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
323 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
324=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
325 481
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
328 484
329The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 486is a reload or not.
331 487
332=cut 488=cut
333 489
334sub post_init(&) { 490sub post_init(&) {
335 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
336} 509}
337 510
338=item cf::lock_wait $string 511=item cf::lock_wait $string
339 512
340Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
379} 552}
380 553
381=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
382 555
383Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer. 557get spread over time.
385 558
386=cut 559=cut
387 560
388sub periodic($$) { 561sub periodic($$) {
389 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
394} 567}
395 568
396=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
397 570
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
399This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
400of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
401 578
402The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
403used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
404 581
405Useful for short background jobs. 582Useful for short background jobs.
406 583
407=cut 584=cut
408 585
409our @SLOT_QUEUE; 586our @SLOT_QUEUE;
410our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
411 589
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
415 593
416 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
417 596
418 while () { 597 while () {
419 next_job: 598 next_job:
599
420 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 601
422 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 606 $job->[2]->send;
426 Coro::cede; 607 Coro::cede;
427 goto next_job; 608 goto next_job;
428 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 611 }
430 } 612 }
431 613
432 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
433 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
434 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
435 $signal->wait;
436 } else { 617 } else {
618 $busy = 0;
437 Coro::schedule; 619 Coro::schedule;
438 } 620 }
439 } 621 }
440}; 622};
441 623
442sub get_slot($;$$) { 624sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
444 626
445 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
446 628
447 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
448 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
449 632
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
478=cut 661=cut
479 662
480sub sync_job(&) { 663sub sync_job(&) {
481 my ($job) = @_; 664 my ($job) = @_;
482 665
483 if ($Coro::current == $Coro::main) { 666 if (in_main) {
484 my $time = EV::time; 667 my $time = AE::time;
485 668
486 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
488 671
489 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
490 673
491 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
492 675
493 my $busy = 1; 676 my $busy = 1;
494 my @res; 677 my @res;
495 678
496 (async { 679 (async {
497 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 681 @res = eval { $job->() };
499 warn $@ if $@; 682 error $@ if $@;
500 undef $busy; 683 undef $busy;
501 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
502 685
503 while ($busy) { 686 while ($busy) {
504 if (Coro::nready) { 687 if (Coro::nready) {
506 } else { 689 } else {
507 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
508 } 691 }
509 } 692 }
510 693
511 my $time = EV::time - $time; 694 my $time = AE::time - $time;
512 695
513 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
514 697
515 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
516 } else { 699 } else {
538 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
539 722
540 $coro 723 $coro
541} 724}
542 725
543=item fork_call { }, $args 726=item fork_call { }, @args
544 727
545Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 731never block itself or use any form of event handling.
549 732
550=cut 733=cut
551 734
735sub post_fork {
736 reset_signals;
737}
738
552sub fork_call(&@) { 739sub fork_call(&@) {
553 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
554 741
555 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
556 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
558 745
559 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
560 reset_signals; 747 cf::post_fork;
561 &$cb 748 &$cb
562 }, @args; 749 } @args;
563 750
564 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
565} 763}
566 764
567=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
568 766
569=cut 767=cut
606within each server. 804within each server.
607 805
608=cut 806=cut
609 807
610sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
611 my ($name) = @_; 812 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
613 814
614 eval { 815 eval {
615 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
625} 826}
626 827
627our $DB; 828our $DB;
628 829
629sub db_init { 830sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
632 };
633} 832}
634 833
635sub db_get($$) { 834sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
637 836
638 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
639 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
640 841
641 $! ? () 842 $! ? ()
642 : $data 843 : $data
643 }
644} 844}
645 845
646sub db_put($$$) { 846sub db_put($$$) {
647 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 876
677 my @data; 877 my @data;
678 my $md5; 878 my $md5;
679 879
680 for (0 .. $#$src) { 880 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 882 }
684 883
685 # if processing is expensive, check 884 # if processing is expensive, check
686 # checksum first 885 # checksum first
687 if (1) { 886 if (1) {
704 903
705 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 905 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
708 907
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 909
711 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
714 913
724 923
725=cut 924=cut
726 925
727sub datalog($@) { 926sub datalog($@) {
728 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 929}
731 930
732=back 931=back
733 932
734=cut 933=cut
929 1128
930 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1131
933 } elsif (ref $type) { 1132 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
935 1134
936 } else { 1135 } else {
937 shift @arg; 1136 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
939 } 1138 }
940 } 1139 }
941} 1140}
942 1141
943sub _object_attach { 1142sub _object_attach {
953 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
954 } 1153 }
955 1154
956 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
957 } else { 1156 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1158 }
960 1159
961 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
962} 1161}
963 1162
1022 1221
1023 for (@$callbacks) { 1222 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1025 1224
1026 if ($@) { 1225 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1227 override;
1030 } 1228 }
1031 1229
1032 return 1 if $override; 1230 return 1 if $override;
1033 } 1231 }
1112 for (@$attach) { 1310 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1115 } 1313 }
1116 } else { 1314 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1316 }
1119 } 1317 }
1120} 1318}
1121 1319
1122cf::attachable->attach ( 1320cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1150 1348
1151 sync_job { 1349 sync_job {
1152 if (length $$rdata) { 1350 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1156 1355
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1183 1382
1184 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1385 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1188 } 1387 }
1189 } else { 1388 } else {
1190 aio_unlink $filename; 1389 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1192 } 1391 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1416 $av = $st->{objs};
1218 } 1417 }
1219 1418
1220 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1223 1423
1224 ($data, $av) 1424 ($data, $av)
1225} 1425}
1226 1426
1227=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1286} 1486}
1287 1487
1288use File::Glob (); 1488use File::Glob ();
1289 1489
1290cf::player->attach ( 1490cf::player->attach (
1291 on_command => sub { 1491 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1293 1493
1294 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1295 or return; 1495 or return;
1296 1496
1304 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1305 1505
1306 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1307 1507
1308 if (ref $msg) { 1508 if (ref $msg) {
1309 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1310 "ARRAY" eq ref $msg
1311 ? @$msg
1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1313 1510
1314 my @reply; 1511 my @reply;
1315 1512
1316 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1317 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1319 1516
1320 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1518 if $reply;
1322 1519
1323 } else { 1520 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1522 }
1326 1523
1327 cf::override; 1524 cf::override;
1328 }, 1525 },
1329); 1526);
1339 }; 1536 };
1340 1537
1341 $grp 1538 $grp
1342} 1539}
1343 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1344sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1345 cf::sync_job { 1557 cf::sync_job {
1346 my %todo; 1558 my %todo;
1347 1559
1348 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1561 next unless -r $path;
1367 1579
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1582
1371 $ext{source} = 1583 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1374 . $source 1586 . $source
1375 . "\n};\n1"; 1587 . "\n};\n1";
1376 1588
1377 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1378 } 1590 }
1379 1591
1592 my $pass = 0;
1380 my %done; 1593 my %done;
1381 while (%todo) { 1594 while (%todo) {
1382 my $progress; 1595 my $progress;
1383 1596
1597 ++$pass;
1598
1599 ext:
1384 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1602 next ext
1387 unless exists $done{$_}; 1603 unless exists $done{$_};
1388 } 1604 }
1389 1605
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1607
1392 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1621
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1623 if exists $v->{meta}{mandatory};
1400 1624
1401 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1402 } 1634 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1635 }
1408 1636
1409 skip: 1637 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1412 } 1647 }
1413 }; 1648 };
1414} 1649}
1415 1650
1416############################################################################# 1651#############################################################################
1500 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1501 } 1736 }
1502 } 1737 }
1503} 1738}
1504 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1505sub save($) { 1753sub save($) {
1506 my ($pl) = @_; 1754 my ($pl) = @_;
1507 1755
1508 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1509 1757
1514 1762
1515 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1517 1765
1518 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1770
1520 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1772 cf::cede_to_tick;
1522} 1773}
1523 1774
1557 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1558 1809
1559 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1812
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1814 $pl->deactivate;
1815
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1567 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1568 1821
1569 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1625 \@logins 1878 \@logins
1626} 1879}
1627 1880
1628=item $player->maps 1881=item $player->maps
1629 1882
1883=item cf::player::maps $login
1884
1630Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1631player. May block. 1886player. May block.
1632 1887
1633=cut 1888=cut
1634 1889
1696=cut 1951=cut
1697 1952
1698sub find_by_path($) { 1953sub find_by_path($) {
1699 my ($path) = @_; 1954 my ($path) = @_;
1700 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1701 my ($match, $specificity); 1958 my ($match, $specificity);
1702 1959
1703 for my $region (list) { 1960 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1733sub generate_random_map { 1990sub generate_random_map {
1734 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1735 1992
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1994
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 1996}
1753 1997
1754=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1755 1999
1756Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
1761 2005
1762sub register { 2006sub register {
1763 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 2008 my $pkg = caller;
1765 2009
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 2011
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 2013}
1771 2014
1772# also paths starting with '/' 2015# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 2017
1775sub thawer_merge { 2018sub thawer_merge {
1776 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1777 2020
1778 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1783} 2026}
1784 2027
1785sub normalise { 2028sub normalise {
1786 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1787 2030
1788 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1789 2032
1790 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1791 2034
1792 # map plan: 2035 # map plan:
1793 # 2036 #
1808 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 2052 $path = "$base/$path";
1810 } 2053 }
1811 2054
1812 for ($path) { 2055 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1816 } 2058 }
1817 2059
1818 $path 2060 $path
1832 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1833 return $self; 2075 return $self;
1834 } 2076 }
1835 } 2077 }
1836 2078
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2080 ()
1839} 2081}
1840 2082
2083# may re-bless or do other evil things
1841sub init { 2084sub init {
1842 my ($self) = @_; 2085 my ($self) = @_;
1843 2086
1844 $self 2087 $self
1845} 2088}
1910 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1911 2154
1912 1 2155 1
1913} 2156}
1914 2157
2158# used to laod the header of an original map
1915sub load_header_orig { 2159sub load_header_orig {
1916 my ($self) = @_; 2160 my ($self) = @_;
1917 2161
1918 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1919} 2163}
1920 2164
2165# used to laod the header of an instantiated map
1921sub load_header_temp { 2166sub load_header_temp {
1922 my ($self) = @_; 2167 my ($self) = @_;
1923 2168
1924 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1925} 2170}
1926 2171
2172# called after loading the header from an instantiated map
1927sub prepare_temp { 2173sub prepare_temp {
1928 my ($self) = @_; 2174 my ($self) = @_;
1929 2175
1930 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1932 # safety 2178 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2181}
1936 2182
2183# called after loading the header from an original map
1937sub prepare_orig { 2184sub prepare_orig {
1938 my ($self) = @_; 2185 my ($self) = @_;
1939 2186
1940 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1965 2212
1966sub find; 2213sub find;
1967sub find { 2214sub find {
1968 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1969 2216
2217 cf::cede_to_tick;
2218
1970 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1971 2220
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2223
1975 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1992 2241
1993 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
1994 } 2243 }
1995} 2244}
1996 2245
1997sub pre_load { } 2246sub pre_load { }
1998sub post_load { } 2247#sub post_load { } # XS
1999 2248
2000sub load { 2249sub load {
2001 my ($self) = @_; 2250 my ($self) = @_;
2002 2251
2003 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2006 2255
2007 { 2256 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2009 2258
2010 return unless $self->valid; 2259 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2261
2015 $self->alloc; 2262 $self->alloc;
2016 2263
2017 $self->pre_load; 2264 $self->pre_load;
2018 cf::cede_to_tick; 2265 cf::cede_to_tick;
2019 2266
2267 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2269 $f->skip_block;
2022 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2023 or return; 2271 or return;
2024 2272
2025 $self->post_load_original 2273 $self->post_load_original
2026 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2027 2275
2028 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2277 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2280 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2035 } 2284 }
2036 } 2285 }
2037 }
2038 2286
2039 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2040 2294
2041 cf::cede_to_tick; 2295 cf::cede_to_tick;
2042 # now do the right thing for maps 2296 # now do the right thing for maps
2043 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2303 $self->decay_objects;
2050 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2051 $self->update_buttons; 2305 $self->update_buttons;
2052 cf::cede_to_tick; 2306 cf::cede_to_tick;
2053 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2054 } 2308 }
2055 2309
2056 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2312 }
2061 2313
2062 $self->post_load; 2314 $self->post_load;
2063}
2064 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2065sub customise_for { 2322sub customise_for {
2066 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2067 2324
2068 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2326 if $self->per_player;
2072# if $self->per_party; 2329# if $self->per_party;
2073 2330
2074 $self 2331 $self
2075} 2332}
2076 2333
2077# find and load all maps in the 3x3 area around a map
2078sub load_neighbours {
2079 my ($map) = @_;
2080
2081 my @neigh; # diagonal neighbours
2082
2083 for (0 .. 3) {
2084 my $neigh = $map->tile_path ($_)
2085 or next;
2086 $neigh = find $neigh, $map
2087 or next;
2088 $neigh->load;
2089
2090 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 }
2094
2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
2097 my $neigh = find $path, $origin
2098 or next;
2099 $neigh->load;
2100 }
2101}
2102
2103sub find_sync { 2334sub find_sync {
2104 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2105 2336
2106 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2107} 2342}
2108 2343
2109sub do_load_sync { 2344sub do_load_sync {
2110 my ($map) = @_; 2345 my ($map) = @_;
2111 2346
2347 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2114 2350
2115 cf::sync_job { $map->load }; 2351 $map->load;
2116} 2352}
2117 2353
2118our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2120 2356
2121sub find_async { 2357sub find_async {
2122 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2123 2359
2124 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2125 2361
2126 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2128 } 2364 }
2129 2365
2130 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2131 2367
2132 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2146 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2147 2383
2148 () 2384 ()
2149} 2385}
2150 2386
2387# common code, used by both ->save and ->swapout
2151sub save { 2388sub _save {
2152 my ($self) = @_; 2389 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2390
2156 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2157 2392
2158 return unless $self->dirty; 2393 return unless $self->dirty;
2159 2394
2179 } else { 2414 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2416 }
2182} 2417}
2183 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2184sub swap_out { 2427sub swap_out {
2185 my ($self) = @_; 2428 my ($self) = @_;
2186 2429
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2192 return if $self->players; 2434 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2194 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2195 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2196 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2197 2486
2198 $self->deactivate; 2487 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2489 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2490
2246 $self->unlink_save; 2491 $self->unlink_save;
2247 $self->destroy; 2492 $self->destroy;
2248} 2493}
2249 2494
2257 2502
2258 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2259 2504
2260 $self->unlink_save; 2505 $self->unlink_save;
2261 2506
2262 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2512
2324 : normalise $_ 2569 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2571 ]
2327} 2572}
2328 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2329=back 2606=back
2330 2607
2331=head3 cf::object 2608=head3 cf::object
2332 2609
2333=cut 2610=cut
2465 2742
2466Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2467 2744
2468The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2471map. 2748map.
2472 2749
2473Will never block. 2750Will never block.
2474 2751
2475=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2497 my ($self) = @_; 2774 my ($self) = @_;
2498 2775
2499 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2500 2777
2778 ++$self->{_link_recursion};
2779
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2781
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2505 2784
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2786}
2508 2787
2509sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2511 2790
2528 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2530 2809
2531 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2534 2813
2535 $map->load; 2814 $map->load;
2536 $map->load_neighbours;
2537 2815
2538 return unless $self->contr->active; 2816 return unless $self->contr->active;
2539 2817
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2542 2820 # entering was successful
2821 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2823 $self->activate_recursive;
2545} 2824 }
2546 2825
2826}
2827
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2829
2549Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
2559 2840
2560our $GOTOGEN; 2841our $GOTOGEN;
2561 2842
2562sub cf::object::player::goto { 2843sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2564 2851
2565 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2854
2568 $self->enter_link; 2855 $self->enter_link;
2588 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2589 } 2876 }
2590 } 2877 }
2591 2878
2592 my $map = eval { 2879 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2594 2881
2595 if ($map) { 2882 if ($map) {
2596 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2885 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2887 }
2601 2888
2602 $map 2889 $map
2610 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2613 } 2900 }
2614 2901
2615 $done->() if $done; 2902 $done->($self) if $done;
2616 })->prio (1); 2903 })->prio (1);
2617} 2904}
2618 2905
2619=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2620 2907
2688 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2689 2976
2690 unless (eval { 2977 unless (eval {
2691 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2692 2979
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2702 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2704 3006
2705 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2706 3008
2707 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2713 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2717 3019
2718 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 3021 $self->leave_link;
2720 } 3022 }
2721 })->prio (1); 3023 })->prio (1);
2722} 3024}
2723 3025
2735sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2737 3039
2738 utf8::encode $text; 3040 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2740} 3067}
2741 3068
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3070
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3075
2749=cut 3076=cut
2750 3077
2751# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2753 "c/identify" => { 3086 "c/identify" => {
2754 id => "infobox", 3087 id => "infobox",
2755 title => "Identify", 3088 title => "Identify",
2756 reply => undef, 3089 reply => undef,
2757 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2759 "c/examine" => { 3092 "c/examine" => {
2760 id => "infobox", 3093 id => "infobox",
2761 title => "Examine", 3094 title => "Examine",
2762 reply => undef, 3095 reply => undef,
2763 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3103 },
2765 "c/book" => { 3104 "c/book" => {
2766 id => "infobox", 3105 id => "infobox",
2767 title => "Book", 3106 title => "Book",
2768 reply => undef, 3107 reply => undef,
2884 my $pkt = "msg " 3223 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3226 );
2888 3227
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2900} 3229}
2901 3230
2902=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2903 3232
2904Sends an ext event to the client. 3233Sends an ext event to the client.
2907 3236
2908sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2910 3239
2911 if ($self->extcmd == 2) { 3240 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3242 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3243 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3245 }
2917} 3246}
2918 3247
2919=item $client->ext_reply ($msgid, @msg) 3248=item $client->ext_reply ($msgid, @msg)
2920 3249
2923=cut 3252=cut
2924 3253
2925sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
2927 3256
2928 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 }
2935} 3260}
2936 3261
2937=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
2938 3263
2939Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
2994 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
2995 3320
2996 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2997 3322
2998 if (ref $msg) { 3323 if (ref $msg) {
2999 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3000 "ARRAY" eq ref $msg
3001 ? @$msg
3002 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3003 3325
3004 my @reply; 3326 my @reply;
3005 3327
3006 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3007 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
3009 3331
3010 $ns->ext_reply ($reply, @reply) 3332 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3333 if $reply;
3012 3334
3013 } else { 3335 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3336 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3337 }
3016 3338
3017 cf::override; 3339 cf::override;
3018 }, 3340 },
3019); 3341);
3039 3361
3040 $coro 3362 $coro
3041} 3363}
3042 3364
3043cf::client->attach ( 3365cf::client->attach (
3044 on_destroy => sub { 3366 on_client_destroy => sub {
3045 my ($ns) = @_; 3367 my ($ns) = @_;
3046 3368
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3369 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3370 },
3049); 3371);
3065our $safe_hole = new Safe::Hole; 3387our $safe_hole = new Safe::Hole;
3066 3388
3067$SIG{FPE} = 'IGNORE'; 3389$SIG{FPE} = 'IGNORE';
3068 3390
3069$safe->permit_only (Opcode::opset qw( 3391$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3392 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3393 grepstart grepwhile mapstart mapwhile
3072 sort time 3394 sort time
3073)); 3395));
3074 3396
3075# here we export the classes and methods available to script code 3397# here we export the classes and methods available to script code
3100 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3101 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3102 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3103 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3104) { 3426) {
3105 no strict 'refs';
3106 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 for @funs; 3429 for @funs;
3109} 3430}
3110 3431
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3448 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3449 $qcode =~ s/\n/\\n/g;
3129 3450
3130 %vars = (_dummy => 0) unless %vars; 3451 %vars = (_dummy => 0) unless %vars;
3131 3452
3453 my @res;
3132 local $_; 3454 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3455
3135 my $eval = 3456 my $eval =
3136 "do {\n" 3457 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3458 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3459 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3460 . $code
3140 . "\n}" 3461 . "\n}"
3141 ; 3462 ;
3142 3463
3464 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3465 sub_generation_inc;
3466 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3467 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3468 sub_generation_inc;
3469 } else {
3470 local @cf::_safe_eval_args = values %vars;
3471 @res = wantarray ? eval eval : scalar eval $eval;
3472 }
3146 3473
3147 if ($@) { 3474 if ($@) {
3148 warn "$@"; 3475 warn "$@",
3149 warn "while executing safe code '$code'\n"; 3476 "while executing safe code '$code'\n",
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3477 "with arguments " . (join " ", %vars) . "\n";
3151 } 3478 }
3152 3479
3153 wantarray ? @res : $res[0] 3480 wantarray ? @res : $res[0]
3154} 3481}
3155 3482
3169=cut 3496=cut
3170 3497
3171sub register_script_function { 3498sub register_script_function {
3172 my ($fun, $cb) = @_; 3499 my ($fun, $cb) = @_;
3173 3500
3174 no strict 'refs'; 3501 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3502 *$fun = $safe_hole->wrap ($cb);
3176} 3503}
3177 3504
3178=back 3505=back
3179 3506
3180=cut 3507=cut
3181 3508
3182############################################################################# 3509#############################################################################
3183# the server's init and main functions 3510# the server's init and main functions
3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3184 3513
3185sub load_facedata($) { 3514sub load_facedata($) {
3186 my ($path) = @_; 3515 my ($path) = @_;
3187 3516
3188 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3189 # for this (global event?) 3518 # for this (global event?)
3190 %ext::player_env::MUSIC_FACE_CACHE = (); 3519 %ext::player_env::MUSIC_FACE_CACHE = ();
3191 3520
3192 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193 3522
3194 warn "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3195 3524
3196 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3197 0 < aio_load $path, $facedata
3198 or die "$path: $!";
3199
3200 $facedata = Coro::Storable::thaw $facedata;
3201 3526
3202 $facedata->{version} == 2 3527 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3529
3205 # patch in the exptable 3530 # patch in the exptable
3531 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3532 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3533 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3534 data => $exp_table,
3535 hash => (cf::face::mangle_chksum Digest::MD5::md5 $exp_table),
3209 }; 3536 };
3210 cf::cede_to_tick; 3537 cf::cede_to_tick;
3211 3538
3212 { 3539 {
3213 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3214 3541
3215 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3545
3218 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3222 3552
3223 cf::cede_to_tick; 3553 cf::cede_to_tick;
3224 } 3554 }
3225 3555
3226 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
3231 3561
3232 if (my $smooth = cf::face::find $info->{smooth}) { 3562 if (my $smooth = cf::face::find $info->{smooth}) {
3233 cf::face::set_smooth $idx, $smooth; 3563 cf::face::set_smooth $idx, $smooth;
3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3564 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235 } else { 3565 } else {
3236 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3566 error "smooth face '$info->{smooth}' not found for face '$face'";
3237 } 3567 }
3238 3568
3239 cf::cede_to_tick; 3569 cf::cede_to_tick;
3240 } 3570 }
3241 } 3571 }
3250 3580
3251 cf::anim::invalidate_all; # d'oh 3581 cf::anim::invalidate_all; # d'oh
3252 } 3582 }
3253 3583
3254 { 3584 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3258 3586
3259 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3591
3264 if ($info->{type} & 1) { 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3279 } else { 3596 } else {
3280 $RESOURCE{$name} = $info; 3597# $RESOURCE{$name} = $info; # unused
3281 } 3598 }
3282 3599
3283 cf::cede_to_tick; 3600 cf::cede_to_tick;
3284 } 3601 }
3285 } 3602 }
3286 3603
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3604 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288 3605
3289 1 3606 1
3290} 3607}
3291
3292cf::global->attach (on_resource_update => sub {
3293 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297 my $sound = $soundconf->{compat}[$_]
3298 or next;
3299
3300 my $face = cf::face::find "sound/$sound->[1]";
3301 cf::sound::set $sound->[0] => $face;
3302 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303 }
3304
3305 while (my ($k, $v) = each %{$soundconf->{event}}) {
3306 my $face = cf::face::find "sound/$v";
3307 cf::sound::set $k => $face;
3308 }
3309 }
3310});
3311 3608
3312register_exticmd fx_want => sub { 3609register_exticmd fx_want => sub {
3313 my ($ns, $want) = @_; 3610 my ($ns, $want) = @_;
3314 3611
3315 while (my ($k, $v) = each %$want) { 3612 while (my ($k, $v) = each %$want) {
3354sub reload_treasures { 3651sub reload_treasures {
3355 load_resource_file "$DATADIR/treasures" 3652 load_resource_file "$DATADIR/treasures"
3356 or die "unable to load treasurelists\n"; 3653 or die "unable to load treasurelists\n";
3357} 3654}
3358 3655
3656sub reload_sound {
3657 trace "loading sound config from $DATADIR/sound\n";
3658
3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3660
3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3662 my $sound = $soundconf->{compat}[$_]
3663 or next;
3664
3665 my $face = cf::face::find "sound/$sound->[1]";
3666 cf::sound::set $sound->[0] => $face;
3667 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3668 }
3669
3670 while (my ($k, $v) = each %{$soundconf->{event}}) {
3671 my $face = cf::face::find "sound/$v";
3672 cf::sound::set $k => $face;
3673 }
3674}
3675
3359sub reload_resources { 3676sub reload_resources {
3360 warn "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3361 3678
3679 reload_exp_table;
3680 reload_materials;
3362 reload_facedata; 3681 reload_facedata;
3682 reload_sound;
3363 reload_archetypes; 3683 reload_archetypes;
3364 reload_regions; 3684 reload_regions;
3365 reload_treasures; 3685 reload_treasures;
3366 3686
3367 warn "finished reloading resource files\n"; 3687 trace "finished reloading resource files\n";
3368} 3688}
3369 3689
3370sub reload_config { 3690sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3691 trace "reloading config file...\n";
3372 or return;
3373 3692
3374 local $/; 3693 my $config = load_file "$CONFDIR/config";
3375 *CFG = YAML::Load <$fh>; 3694 utf8::decode $config;
3695 *CFG = decode_yaml $config;
3376 3696
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3698
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3701
3382 if (exists $CFG{mlockall}) { 3702 if (exists $CFG{mlockall}) {
3406 seek $fh, 0, 0; 3726 seek $fh, 0, 0;
3407 print $fh $$; 3727 print $fh $$;
3408} 3728}
3409 3729
3410sub main_loop { 3730sub main_loop {
3411 warn "EV::loop starting\n"; 3731 trace "EV::loop starting\n";
3412 if (1) { 3732 if (1) {
3413 EV::loop; 3733 EV::loop;
3414 } 3734 }
3415 warn "EV::loop returned\n"; 3735 trace "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP; 3736 goto &main_loop unless $REALLY_UNLOOP;
3417} 3737}
3418 3738
3419sub main { 3739sub main {
3420 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3421 3741
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426 3746
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3748
3434 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3437 (async { 3752 (async {
3438 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3440 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3441 }; 3756 };
3442 3757
3443 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3444 3759
3445 cf::sync_job { 3760 cf::sync_job {
3761 cf::incloader::init ();
3762
3763 cf::init_anim;
3764 cf::init_attackmess;
3765 cf::init_dynamic;
3766
3767 cf::load_settings;
3768
3446 reload_resources; 3769 reload_resources;
3447 reload_config; 3770 reload_config;
3448 db_init; 3771 db_init;
3449 3772
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3773 cf::init_uuid;
3453 cf::init_signals; 3774 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3775 cf::init_skills;
3456 3776
3457 cf::init_beforeplay; 3777 cf::init_beforeplay;
3458 3778
3459 atomic; 3779 atomic;
3464 3784
3465 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX (); 3786 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3788
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3470 }; 3790 };
3471 3791
3792 cf::object::thawer::errors_are_fatal 0;
3793 info "parse errors in files are no longer fatal from this point on.\n";
3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3472 main_loop; 3799 goto &main_loop;
3473} 3800}
3474 3801
3475############################################################################# 3802#############################################################################
3476# initialisation and cleanup 3803# initialisation and cleanup
3477 3804
3478# install some emergency cleanup handlers 3805# install some emergency cleanup handlers
3479BEGIN { 3806BEGIN {
3480 our %SIGWATCHER = (); 3807 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3808 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3809 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3810 cf::cleanup "SIG$signal";
3484 }; 3811 };
3485 } 3812 }
3486} 3813}
3487 3814
3488sub write_runtime_sync { 3815sub write_runtime_sync {
3816 my $t0 = AE::time;
3817
3489 # first touch the runtime file to show we are still running: 3818 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3819 # the fsync below can take a very very long time.
3491 3820
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3821 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3822
3494 my $guard = cf::lock_acquire "write_runtime"; 3823 my $guard = cf::lock_acquire "write_runtime";
3495 3824
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3825 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3826 or return;
3498 3827
3499 my $value = $cf::RUNTIME + 90 + 10; 3828 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3829 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3830 # 60 allows for the watchdog to kill the server.
3514 or return; 3843 or return;
3515 3844
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3845 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3846 and return;
3518 3847
3519 warn "runtime file written.\n"; 3848 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3849
3521 1 3850 1
3522} 3851}
3523 3852
3524our $uuid_lock; 3853our $uuid_lock;
3536 or return; 3865 or return;
3537 3866
3538 my $value = uuid_seq uuid_cur; 3867 my $value = uuid_seq uuid_cur;
3539 3868
3540 unless ($value) { 3869 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n"; 3870 info "cowardly refusing to write zero uuid value!\n";
3542 return; 3871 return;
3543 } 3872 }
3544 3873
3545 my $value = uuid_str $value + $uuid_skip; 3874 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0; 3875 $uuid_skip = 0;
3556 or return; 3885 or return;
3557 3886
3558 aio_rename "$uuid~", $uuid 3887 aio_rename "$uuid~", $uuid
3559 and return; 3888 and return;
3560 3889
3561 warn "uuid file written ($value).\n"; 3890 trace "uuid file written ($value).\n";
3562 3891
3563 1 3892 1
3564 3893
3565} 3894}
3566 3895
3572} 3901}
3573 3902
3574sub emergency_save() { 3903sub emergency_save() {
3575 my $freeze_guard = cf::freeze_mainloop; 3904 my $freeze_guard = cf::freeze_mainloop;
3576 3905
3577 warn "emergency_perl_save: enter\n"; 3906 info "emergency_perl_save: enter\n";
3907
3908 # this is a trade-off: we want to be very quick here, so
3909 # save all maps without fsync, and later call a global sync
3910 # (which in turn might be very very slow)
3911 local $USE_FSYNC = 0;
3578 3912
3579 cf::sync_job { 3913 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so 3914 cf::write_runtime_sync; # external watchdog should not bark
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584 3915
3585 # use a peculiar iteration method to avoid tripping on perl 3916 # use a peculiar iteration method to avoid tripping on perl
3586 # refcount bugs in for. also avoids problems with players 3917 # refcount bugs in for. also avoids problems with players
3587 # and maps saved/destroyed asynchronously. 3918 # and maps saved/destroyed asynchronously.
3588 warn "emergency_perl_save: begin player save\n"; 3919 info "emergency_perl_save: begin player save\n";
3589 for my $login (keys %cf::PLAYER) { 3920 for my $login (keys %cf::PLAYER) {
3590 my $pl = $cf::PLAYER{$login} or next; 3921 my $pl = $cf::PLAYER{$login} or next;
3591 $pl->valid or next; 3922 $pl->valid or next;
3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3923 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593 $pl->save; 3924 $pl->save;
3594 } 3925 }
3595 warn "emergency_perl_save: end player save\n"; 3926 info "emergency_perl_save: end player save\n";
3596 3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3597 warn "emergency_perl_save: begin map save\n"; 3930 info "emergency_perl_save: begin map save\n";
3598 for my $path (keys %cf::MAP) { 3931 for my $path (keys %cf::MAP) {
3599 my $map = $cf::MAP{$path} or next; 3932 my $map = $cf::MAP{$path} or next;
3600 $map->valid or next; 3933 $map->valid or next;
3601 $map->save; 3934 $map->save;
3602 } 3935 }
3603 warn "emergency_perl_save: end map save\n"; 3936 info "emergency_perl_save: end map save\n";
3604 3937
3938 cf::write_runtime_sync; # external watchdog should not bark
3939
3605 warn "emergency_perl_save: begin database checkpoint\n"; 3940 info "emergency_perl_save: begin database checkpoint\n";
3606 BDB::db_env_txn_checkpoint $DB_ENV; 3941 BDB::db_env_txn_checkpoint $DB_ENV;
3607 warn "emergency_perl_save: end database checkpoint\n"; 3942 info "emergency_perl_save: end database checkpoint\n";
3608 3943
3609 warn "emergency_perl_save: begin write uuid\n"; 3944 info "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1; 3945 write_uuid_sync 1;
3611 warn "emergency_perl_save: end write uuid\n"; 3946 info "emergency_perl_save: end write uuid\n";
3947
3948 cf::write_runtime_sync; # external watchdog should not bark
3949
3950 trace "emergency_perl_save: syncing database to disk";
3951 BDB::db_env_txn_checkpoint $DB_ENV;
3952
3953 info "emergency_perl_save: starting sync\n";
3954 IO::AIO::aio_sync sub {
3955 info "emergency_perl_save: finished sync\n";
3956 };
3957
3958 cf::write_runtime_sync; # external watchdog should not bark
3959
3960 trace "emergency_perl_save: flushing outstanding aio requests";
3961 while (IO::AIO::nreqs || BDB::nreqs) {
3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3963 }
3964
3965 cf::write_runtime_sync; # external watchdog should not bark
3612 }; 3966 };
3613 3967
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3619 warn "emergency_perl_save: leave\n"; 3968 info "emergency_perl_save: leave\n";
3620} 3969}
3621 3970
3622sub post_cleanup { 3971sub post_cleanup {
3623 my ($make_core) = @_; 3972 my ($make_core) = @_;
3624 3973
3974 IO::AIO::flush;
3975
3625 warn Carp::longmess "post_cleanup backtrace" 3976 error Carp::longmess "post_cleanup backtrace"
3626 if $make_core; 3977 if $make_core;
3627 3978
3628 my $fh = pidfile; 3979 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$; 3980 unlink $PIDFILE if <$fh> == $$;
3630} 3981}
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4001 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 4002 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 4003 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4004# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 4005 }
3655 warn "cleared package $pkg\n";#d#
3656} 4006}
3657 4007
3658sub do_reload_perl() { 4008sub do_reload_perl() {
3659 # can/must only be called in main 4009 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 4010 unless (in_main) {
3661 warn "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3662 return; 4012 return;
3663 } 4013 }
3664 4014
3665 return if $RELOAD++; 4015 return if $RELOAD++;
3666 4016
3667 my $t1 = EV::time; 4017 my $t1 = AE::time;
3668 4018
3669 while ($RELOAD) { 4019 while ($RELOAD) {
3670 warn "reloading..."; 4020 cf::get_slot 0.1, -1, "reload_perl";
4021 info "perl_reload: reloading...";
3671 4022
3672 warn "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3673 4024
3674 cf::sync_job { 4025 cf::sync_job {
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 cf::emergency_save; 4026 #cf::emergency_save;
3677 cf::write_runtime_sync; # external watchdog should not bark
3678 4027
3679 warn "syncing database to disk";
3680 BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682 # if anything goes wrong in here, we should simply crash as we already saved
3683
3684 warn "flushing outstanding aio requests";
3685 while (IO::AIO::nreqs || BDB::nreqs) {
3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687 }
3688
3689 warn "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3690 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3691 %EXT_CORO = (); 4030 %EXT_CORO = ();
3692 4031
3693 warn "removing commands"; 4032 trace "perl_reload: removing commands";
3694 %COMMAND = (); 4033 %COMMAND = ();
3695 4034
3696 warn "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3697 %EXTCMD = (); 4036 %EXTCMD = ();
3698 %EXTICMD = (); 4037 %EXTICMD = ();
3699 4038
3700 warn "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3701 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3702 warn "... unloading $pkg"; 4041 trace "... unloading $pkg";
3703 4042
3704 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3705 eval { 4044 eval {
3706 $cb->($pkg); 4045 $cb->($pkg);
3707 1 4046 1
3708 } or warn "$pkg unloaded, but with errors: $@"; 4047 } or error "$pkg unloaded, but with errors: $@";
3709 } 4048 }
3710 4049
3711 warn "... clearing $pkg"; 4050 trace "... clearing $pkg";
3712 clear_package $pkg; 4051 clear_package $pkg;
3713 } 4052 }
3714 4053
3715 warn "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718 4057
3719 warn "... unloading $k"; 4058 trace "... unloading $k";
3720 delete $INC{$k}; 4059 delete $INC{$k};
3721 4060
3722 $k =~ s/\.pm$//; 4061 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g; 4062 $k =~ s/\//::/g;
3724 4063
3727 } 4066 }
3728 4067
3729 clear_package $k; 4068 clear_package $k;
3730 } 4069 }
3731 4070
3732 warn "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3733 clear_package "safe::$_" 4072 clear_package "safe::$_"
3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735 4074
3736 warn "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3737 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739 4078
3740 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3741 # and global variables created in xs 4080 # and global variables created in xs
3742 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3743 4082
3744 warn "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3745 4084
3746 warn "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3747 require cf; 4086 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4087 cf::_connect_to_perl_1;
3749 4088
3750 warn "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3751 cf::reload_config; 4090 cf::reload_config;
3752 4091
3753 warn "loading extensions"; 4092 trace "perl_reload: loading extensions";
3754 cf::load_extensions; 4093 cf::load_extensions;
3755 4094
3756 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3757 warn "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3758 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3759 warn "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3760 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3761 warn "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3762 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3763 } 4102 }
3764 4103
3765 warn "running post_init jobs"; 4104 cf::_post_init 1;
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767 4105
3768 warn "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3769 4107
3770 1 4108 1
3771 } or do { 4109 } or do {
3772 warn $@; 4110 error $@;
3773 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3774 }; 4112 };
3775 4113
3776 warn "reloaded";
3777 --$RELOAD; 4114 --$RELOAD;
3778 } 4115 }
3779 4116
3780 $t1 = EV::time - $t1; 4117 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3782}; 4119};
3783 4120
3784our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3785 4122
3786sub reload_perl() { 4123sub reload_perl() {
3788 # coro crashes during coro_state_free->destroy here. 4125 # coro crashes during coro_state_free->destroy here.
3789 4126
3790 $RELOAD_WATCHER ||= cf::async { 4127 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 4128 Coro::AIO::aio_wait cache_extensions;
3792 4129
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4130 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 4131 do_reload_perl;
3795 undef $RELOAD_WATCHER; 4132 undef $RELOAD_WATCHER;
3796 }; 4133 };
3797 }; 4134 };
3798} 4135}
3807 reload_perl; 4144 reload_perl;
3808 }; 4145 };
3809 } 4146 }
3810}; 4147};
3811 4148
3812unshift @INC, $LIBDIR; 4149#############################################################################
3813 4150
3814my $bug_warning = 0; 4151my $bug_warning = 0;
3815 4152
3816our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN;
3818
3819sub wait_for_tick { 4153sub wait_for_tick() {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3821 4155
3822 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
3823 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait;
3825} 4157}
3826 4158
3827sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3829 4161
3830 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 4164 $signal->wait;
3833} 4165}
3837 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3838 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
3839 return; 4171 return;
3840 } 4172 }
3841 4173
3842 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4175
4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 4177
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4180 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4181 $Coro::current->{desc} = "runtime saver";
3848 write_runtime_sync 4182 write_runtime_sync
3849 or warn "ERROR: unable to write runtime file: $!"; 4183 or error "ERROR: unable to write runtime file: $!";
3850 }; 4184 };
3851 } 4185 }
3852 4186
3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854 $sig->send; 4188 $sig->send;
3855 } 4189 }
3856 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
3857 $sig->send;
3858 }
3859 4191
3860 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
3861 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3862 4194
3863 if (0) { 4195 if (0) {
3864 if ($NEXT_TICK) { 4196 if ($NEXT_TICK) {
3865 my $jitter = $TICK_START - $NEXT_TICK; 4197 my $jitter = $TICK_START - $NEXT_TICK;
3866 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4198 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867 warn "jitter $JITTER\n";#d# 4199 debug "jitter $JITTER\n";#d#
3868 } 4200 }
3869 } 4201 }
3870} 4202}
3871 4203
3872{ 4204{
3873 # configure BDB 4205 # configure BDB
3874 4206
3875 BDB::min_parallel 8; 4207 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
3878 4210
3879 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3917 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
3918 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
3919 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
3920} 4252}
3921 4253
3922my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
3923 4256
3924sub _log_backtrace { 4257sub _log_backtrace {
3925 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
3926 4259
3927 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
3928 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3929 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
3930 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
3931 ++$_log_backtrace; 4268 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
3933 async { 4270 async {
3934 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
3935 4272
3955 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
3956 --$_log_backtrace; 4293 --$_log_backtrace;
3957 }; 4294 };
3958 } else { 4295 } else {
3959 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
3960 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3961 } 4298 }
3962} 4299}
3963 4300
3964# load additional modules 4301# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;
4303cf::_connect_to_perl_2;
3966 4304
3967END { cf::emergency_save } 4305END { cf::emergency_save }
3968 4306
39691 43071
3970 4308

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines