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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines