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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 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 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
92our @EVENT; 93our @EVENT;
93our @REFLECT; # set by XS 94our @REFLECT; # set by XS
94our %REFLECT; # set by us 95our %REFLECT; # set by us
95 96
96our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
97our $DATADIR = datadir; 99our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
101our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 112
110our %RESOURCE; 113our %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;
111 120
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 123our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 129our $DB_ENV;
121 130
122our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 132
124our %CFG; 133our %CFG;
125 134
126our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
128our $NOW; 138our $NOW;
129 139
130our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
141 151
142our @POST_INIT; 152our @POST_INIT;
143 153
144our $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)
145our $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;
146 159
147binmode STDOUT; 160binmode STDOUT;
148binmode STDERR; 161binmode STDERR;
149 162
150# read virtual server time, if available 163# read virtual server time, if available
161 174
162our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
163 176
164sub cf::map::normalise; 177sub cf::map::normalise;
165 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
166############################################################################# 183#############################################################################
167 184
168%REFLECT = (); 185%REFLECT = ();
169for (@REFLECT) { 186for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 188 $REFLECT{$reflect->{class}} = $reflect;
172} 189}
173 190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
174############################################################################# 194#############################################################################
175 195
176=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
177 197
178=over 4 198=over 4
179 199
180=item $cf::UPTIME 200=item $cf::UPTIME
181 201
182The 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.
183 218
184=item $cf::RUNTIME 219=item $cf::RUNTIME
185 220
186The 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
187every server tick. 222every server tick.
193Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
194directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
195unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
196database environment. 231database environment.
197 232
198=item $cf::NOW
199
200The time of the last (current) server tick.
201
202=item $cf::TICK
203
204The interval between server ticks, in seconds.
205
206=item $cf::LOADAVG 233=item $cf::LOADAVG
207 234
208The 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
209(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
210objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
219from wherever your confdir points to. 246from wherever your confdir points to.
220 247
221=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
222 249
223These 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
224returns 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
225per 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.
226 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
227=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
228 272
229This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
230C<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
231that call. 275that call.
232 276
233=item %cf::REFLECT 277=item %cf::REFLECT
234 278
235Contains, for each (C++) class name, a hash reference with information 279Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 280about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 281metadata, which is useful for introspection.
238 282
239=back 283=back
240 284
241=cut 285=cut
286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
242 292
243$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
244 my $msg = join "", @_; 294 my $msg = join "", @_;
245 295
246 $msg .= "\n" 296 $msg .= "\n"
247 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
248 298
249 $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;
250 300
251 LOG llevError, $msg; 301 LOG llevWarn, $msg;
252}; 302};
253 303
254$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
255 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
256 306
257 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
258 308
259 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
260 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
261 return;#d# 311 return;#d#
262 }#d# 312 }#d#
263 313
264 # kill coroutine otherwise 314 # kill coroutine otherwise
265 Coro::terminate 315 Coro::terminate
285)) { 335)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 337}
288 338
289$EV::DIED = sub { 339$EV::DIED = sub {
290 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
291}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
292 347
293############################################################################# 348#############################################################################
294 349
295=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
296 351
317 $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;
318 $d 373 $d
319 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
320} 375}
321 376
377=item $scalar = 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
322=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
323 392
324Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
325 394
326=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
333 402
334sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
335sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
336 405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
337=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
338 438
339Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
341 441
342The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
343is a reload or not. 443is a reload or not.
344 444
345=cut 445=cut
346 446
347sub post_init(&) { 447sub post_init(&) {
348 push @POST_INIT, shift; 448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
349} 466}
350 467
351=item cf::lock_wait $string 468=item cf::lock_wait $string
352 469
353Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
392} 509}
393 510
394=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
395 512
396Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
397get spread over timer. 514get spread over time.
398 515
399=cut 516=cut
400 517
401sub periodic($$) { 518sub periodic($$) {
402 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
406 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
407} 524}
408 525
409=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
410 527
411Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
412This call blocks and returns only when you have at least C<$time> seconds 529(default: 0): This call blocks and returns only when you have at least
413of cpu time till the next tick. The slot is only valid till the next cede. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
414 535
415The optional C<$name> can be used to identify the job to run. It might be 536The optional C<$name> can be used to identify the job to run. It might be
416used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
417 538
418Useful for short background jobs. 539Useful for short background jobs.
419 540
420=cut 541=cut
421 542
422our @SLOT_QUEUE; 543our @SLOT_QUEUE;
423our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
424 546
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
428 550
429 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
430 553
431 while () { 554 while () {
432 next_job: 555 next_job:
556
433 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 558
435 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 563 $job->[2]->send;
439 Coro::cede; 564 Coro::cede;
440 goto next_job; 565 goto next_job;
441 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 568 }
443 } 569 }
444 570
445 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
446 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
447 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
448 $signal->wait;
449 } else { 574 } else {
575 $busy = 0;
450 Coro::schedule; 576 Coro::schedule;
451 } 577 }
452 } 578 }
453}; 579};
454 580
455sub get_slot($;$$) { 581sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
457 583
458 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
459 585
460 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
461 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
462 589
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
491=cut 618=cut
492 619
493sub sync_job(&) { 620sub sync_job(&) {
494 my ($job) = @_; 621 my ($job) = @_;
495 622
496 if ($Coro::current == $Coro::main) { 623 if (in_main) {
497 my $time = EV::time; 624 my $time = AE::time;
498 625
499 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
501 628
502 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
503 630
504 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
505 632
506 my $busy = 1; 633 my $busy = 1;
507 my @res; 634 my @res;
508 635
509 (async { 636 (async {
510 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
511 @res = eval { $job->() }; 638 @res = eval { $job->() };
512 warn $@ if $@; 639 error $@ if $@;
513 undef $busy; 640 undef $busy;
514 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
515 642
516 while ($busy) { 643 while ($busy) {
517 if (Coro::nready) { 644 if (Coro::nready) {
519 } else { 646 } else {
520 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
521 } 648 }
522 } 649 }
523 650
524 my $time = EV::time - $time; 651 my $time = AE::time - $time;
525 652
526 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
527 654
528 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
529 } else { 656 } else {
551 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
552 679
553 $coro 680 $coro
554} 681}
555 682
556=item fork_call { }, $args 683=item fork_call { }, @args
557 684
558Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
559process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
560Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
561never block itself or use any form of event handling. 688never block itself or use any form of event handling.
562 689
563=cut 690=cut
564 691
692sub post_fork {
693 reset_signals;
694}
695
565sub fork_call(&@) { 696sub fork_call(&@) {
566 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
567 698
568 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
569 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
570 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
571 702
572 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
573 reset_signals; 704 cf::post_fork;
574 &$cb 705 &$cb
575 }, @args; 706 } @args;
576 707
577 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
578} 720}
579 721
580=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
581 723
582=cut 724=cut
619within each server. 761within each server.
620 762
621=cut 763=cut
622 764
623sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
624 my ($name) = @_; 769 my ($name) = @_;
625 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
626 771
627 eval { 772 eval {
628 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
638} 783}
639 784
640our $DB; 785our $DB;
641 786
642sub db_init { 787sub db_init {
643 cf::sync_job {
644 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
645 };
646} 789}
647 790
648sub db_get($$) { 791sub db_get($$) {
649 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
650 793
651 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
652 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
653 798
654 $! ? () 799 $! ? ()
655 : $data 800 : $data
656 }
657} 801}
658 802
659sub db_put($$$) { 803sub db_put($$$) {
660 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
661 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
689 833
690 my @data; 834 my @data;
691 my $md5; 835 my $md5;
692 836
693 for (0 .. $#$src) { 837 for (0 .. $#$src) {
694 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
695 or Carp::croak "$src->[$_]: $!";
696 } 839 }
697 840
698 # if processing is expensive, check 841 # if processing is expensive, check
699 # checksum first 842 # checksum first
700 if (1) { 843 if (1) {
717 860
718 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
719 my $data = $process->(\@data); 862 my $data = $process->(\@data);
720 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
721 864
722 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
723 866
724 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
725 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
726 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
727 870
737 880
738=cut 881=cut
739 882
740sub datalog($@) { 883sub datalog($@) {
741 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
742 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
743} 886}
744 887
745=back 888=back
746 889
747=cut 890=cut
942 1085
943 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
944 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
945 1088
946 } elsif (ref $type) { 1089 } elsif (ref $type) {
947 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
948 1091
949 } else { 1092 } else {
950 shift @arg; 1093 shift @arg;
951 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
952 } 1095 }
953 } 1096 }
954} 1097}
955 1098
956sub _object_attach { 1099sub _object_attach {
966 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
967 } 1110 }
968 1111
969 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
970 } else { 1113 } else {
971 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
972 } 1115 }
973 1116
974 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
975} 1118}
976 1119
1035 1178
1036 for (@$callbacks) { 1179 for (@$callbacks) {
1037 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1038 1181
1039 if ($@) { 1182 if ($@) {
1040 warn "$@";
1041 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1042 override; 1184 override;
1043 } 1185 }
1044 1186
1045 return 1 if $override; 1187 return 1 if $override;
1046 } 1188 }
1125 for (@$attach) { 1267 for (@$attach) {
1126 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1127 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1128 } 1270 }
1129 } else { 1271 } else {
1130 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1131 } 1273 }
1132 } 1274 }
1133} 1275}
1134 1276
1135cf::attachable->attach ( 1277cf::attachable->attach (
1162 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1163 1305
1164 sync_job { 1306 sync_job {
1165 if (length $$rdata) { 1307 if (length $$rdata) {
1166 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1167 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1168 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1169 1312
1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1171 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1173 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1195 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1196 1339
1197 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1199 } else { 1342 } else {
1200 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1201 } 1344 }
1202 } else { 1345 } else {
1203 aio_unlink $filename; 1346 aio_unlink $filename;
1204 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1205 } 1348 }
1229 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1230 $av = $st->{objs}; 1373 $av = $st->{objs};
1231 } 1374 }
1232 1375
1233 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1234 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1235 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1236 1380
1237 ($data, $av) 1381 ($data, $av)
1238} 1382}
1239 1383
1240=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1299} 1443}
1300 1444
1301use File::Glob (); 1445use File::Glob ();
1302 1446
1303cf::player->attach ( 1447cf::player->attach (
1304 on_command => sub { 1448 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1306 1450
1307 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1308 or return; 1452 or return;
1309 1453
1317 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1318 1462
1319 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1320 1464
1321 if (ref $msg) { 1465 if (ref $msg) {
1322 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1323 "ARRAY" eq ref $msg
1324 ? @$msg
1325 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1326 1467
1327 my @reply; 1468 my @reply;
1328 1469
1329 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1330 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1332 1473
1333 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1334 if $reply; 1475 if $reply;
1335 1476
1336 } else { 1477 } else {
1337 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1338 } 1479 }
1339 1480
1340 cf::override; 1481 cf::override;
1341 }, 1482 },
1342); 1483);
1353 1494
1354 $grp 1495 $grp
1355} 1496}
1356 1497
1357sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1358 cf::sync_job { 1501 cf::sync_job {
1359 my %todo; 1502 my %todo;
1360 1503
1361 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1362 next unless -r $path; 1505 next unless -r $path;
1380 1523
1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1383 1526
1384 $ext{source} = 1527 $ext{source} =
1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1386 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1387 . $source 1530 . $source
1388 . "\n};\n1"; 1531 . "\n};\n1";
1389 1532
1390 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1391 } 1534 }
1392 1535
1536 my $pass = 0;
1393 my %done; 1537 my %done;
1394 while (%todo) { 1538 while (%todo) {
1395 my $progress; 1539 my $progress;
1396 1540
1541 ++$pass;
1542
1543 ext:
1397 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1546 next ext
1400 unless exists $done{$_}; 1547 unless exists $done{$_};
1401 } 1548 }
1402 1549
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1551
1405 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1556
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1558 if exists $v->{meta}{mandatory};
1413 1559
1414 warn $msg; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1561 delete $todo{$k};
1562 } else {
1563 $done{$k} = delete $todo{$k};
1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1415 } 1569 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1570 }
1421 1571
1422 skip: 1572 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1425 } 1582 }
1426 }; 1583 };
1427} 1584}
1428 1585
1429############################################################################# 1586#############################################################################
1513 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1514 } 1671 }
1515 } 1672 }
1516} 1673}
1517 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1518sub save($) { 1688sub save($) {
1519 my ($pl) = @_; 1689 my ($pl) = @_;
1520 1690
1521 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1522 1692
1527 1697
1528 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1530 1700
1531 cf::get_slot 0.01; 1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1532 1705
1533 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1707 cf::cede_to_tick;
1535} 1708}
1536 1709
1570 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1571 1744
1572 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1573 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1574 1747
1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1576 $pl->deactivate; 1749 $pl->deactivate;
1750
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1579 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1580 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1581 1756
1582 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1583 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1584 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1638 \@logins 1813 \@logins
1639} 1814}
1640 1815
1641=item $player->maps 1816=item $player->maps
1642 1817
1818=item cf::player::maps $login
1819
1643Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1644player. May block. 1821player. May block.
1645 1822
1646=cut 1823=cut
1647 1824
1709=cut 1886=cut
1710 1887
1711sub find_by_path($) { 1888sub find_by_path($) {
1712 my ($path) = @_; 1889 my ($path) = @_;
1713 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1714 my ($match, $specificity); 1893 my ($match, $specificity);
1715 1894
1716 for my $region (list) { 1895 for my $region (list) {
1717 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1718 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1746sub generate_random_map { 1925sub generate_random_map {
1747 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1748 1927
1749 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1750 1929
1751 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1760 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1761 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1762 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1763 (cf::region::find $rmp->{region}), $rmp->{custom}
1764 )
1765} 1931}
1766 1932
1767=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1768 1934
1769Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1774 1940
1775sub register { 1941sub register {
1776 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1777 my $pkg = caller; 1943 my $pkg = caller;
1778 1944
1779 no strict;
1780 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1781 1946
1782 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1783} 1948}
1784 1949
1785# also paths starting with '/' 1950# also paths starting with '/'
1786$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1787 1952
1788sub thawer_merge { 1953sub thawer_merge {
1789 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1790 1955
1791 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1796} 1961}
1797 1962
1798sub normalise { 1963sub normalise {
1799 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1800 1965
1801 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1802 1967
1803 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1804 1969
1805 # map plan: 1970 # map plan:
1806 # 1971 #
1821 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1822 $path = "$base/$path"; 1987 $path = "$base/$path";
1823 } 1988 }
1824 1989
1825 for ($path) { 1990 for ($path) {
1826 redo if s{//}{/};
1827 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1828 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1829 } 1993 }
1830 1994
1831 $path 1995 $path
1845 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1846 return $self; 2010 return $self;
1847 } 2011 }
1848 } 2012 }
1849 2013
1850 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1851 () 2015 ()
1852} 2016}
1853 2017
2018# may re-bless or do other evil things
1854sub init { 2019sub init {
1855 my ($self) = @_; 2020 my ($self) = @_;
1856 2021
1857 $self 2022 $self
1858} 2023}
1923 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1924 2089
1925 1 2090 1
1926} 2091}
1927 2092
2093# used to laod the header of an original map
1928sub load_header_orig { 2094sub load_header_orig {
1929 my ($self) = @_; 2095 my ($self) = @_;
1930 2096
1931 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1932} 2098}
1933 2099
2100# used to laod the header of an instantiated map
1934sub load_header_temp { 2101sub load_header_temp {
1935 my ($self) = @_; 2102 my ($self) = @_;
1936 2103
1937 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1938} 2105}
1939 2106
2107# called after loading the header from an instantiated map
1940sub prepare_temp { 2108sub prepare_temp {
1941 my ($self) = @_; 2109 my ($self) = @_;
1942 2110
1943 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1944 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1945 # safety 2113 # safety
1946 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1947 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1948} 2116}
1949 2117
2118# called after loading the header from an original map
1950sub prepare_orig { 2119sub prepare_orig {
1951 my ($self) = @_; 2120 my ($self) = @_;
1952 2121
1953 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1954 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1978 2147
1979sub find; 2148sub find;
1980sub find { 2149sub find {
1981 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1982 2151
2152 cf::cede_to_tick;
2153
1983 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1984 2155
1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 my $guard2 = cf::lock_acquire "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2158
1988 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
2005 2176
2006 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
2007 } 2178 }
2008} 2179}
2009 2180
2010sub pre_load { } 2181sub pre_load { }
2011sub post_load { } 2182#sub post_load { } # XS
2012 2183
2013sub load { 2184sub load {
2014 my ($self) = @_; 2185 my ($self) = @_;
2015 2186
2016 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
2019 2190
2020 { 2191 {
2021 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
2022 2193
2023 return unless $self->valid; 2194 return unless $self->valid;
2024 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
2025
2026 $self->in_memory (cf::MAP_LOADING);
2027 2196
2028 $self->alloc; 2197 $self->alloc;
2029 2198
2030 $self->pre_load; 2199 $self->pre_load;
2031 cf::cede_to_tick; 2200 cf::cede_to_tick;
2032 2201
2202 if (exists $self->{load_path}) {
2033 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2034 $f->skip_block; 2204 $f->skip_block;
2035 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
2036 or return; 2206 or return;
2037 2207
2038 $self->post_load_original 2208 $self->post_load_original
2039 if delete $self->{load_original}; 2209 if delete $self->{load_original};
2040 2210
2041 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
2042 utf8::encode $uniq; 2212 utf8::encode $uniq;
2043 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
2044 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
2045 $self->clear_unique_items; 2215 $self->clear_unique_items;
2046 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
2047 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
2048 } 2219 }
2049 } 2220 }
2050 }
2051 2221
2052 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2053 2229
2054 cf::cede_to_tick; 2230 cf::cede_to_tick;
2055 # now do the right thing for maps 2231 # now do the right thing for maps
2056 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
2057 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
2061 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
2062 $self->decay_objects; 2238 $self->decay_objects;
2063 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
2064 $self->update_buttons; 2240 $self->update_buttons;
2065 cf::cede_to_tick; 2241 cf::cede_to_tick;
2066 $self->activate; 2242 #$self->activate; # no longer activate maps automatically
2067 } 2243 }
2068 2244
2069 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2070 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2071
2072 $self->in_memory (cf::MAP_ACTIVE);
2073 } 2247 }
2074 2248
2075 $self->post_load; 2249 $self->post_load;
2076}
2077 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2078sub customise_for { 2257sub customise_for {
2079 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2080 2259
2081 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2261 if $self->per_player;
2085# if $self->per_party; 2264# if $self->per_party;
2086 2265
2087 $self 2266 $self
2088} 2267}
2089 2268
2090# find and load all maps in the 3x3 area around a map
2091sub load_neighbours {
2092 my ($map) = @_;
2093
2094 my @neigh; # diagonal neighbours
2095
2096 for (0 .. 3) {
2097 my $neigh = $map->tile_path ($_)
2098 or next;
2099 $neigh = find $neigh, $map
2100 or next;
2101 $neigh->load;
2102
2103 push @neigh,
2104 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2105 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2106 }
2107
2108 for (grep defined $_->[0], @neigh) {
2109 my ($path, $origin) = @$_;
2110 my $neigh = find $path, $origin
2111 or next;
2112 $neigh->load;
2113 }
2114}
2115
2116sub find_sync { 2269sub find_sync {
2117 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2118 2271
2119 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2120} 2277}
2121 2278
2122sub do_load_sync { 2279sub do_load_sync {
2123 my ($map) = @_; 2280 my ($map) = @_;
2124 2281
2282 # it's a bug to call this from the main context
2125 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2126 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2127 2285
2128 cf::sync_job { $map->load }; 2286 $map->load;
2129} 2287}
2130 2288
2131our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2132our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2133 2291
2134sub find_async { 2292sub find_async {
2135 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2136 2294
2137 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2138 2296
2139 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2140 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2298 return $map if !$load || $map->linkable;
2141 } 2299 }
2142 2300
2143 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2144 2302
2145 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2159 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2160 2318
2161 () 2319 ()
2162} 2320}
2163 2321
2322# common code, used by both ->save and ->swapout
2164sub save { 2323sub _save {
2165 my ($self) = @_; 2324 my ($self) = @_;
2166
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168 2325
2169 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2170 2327
2171 return unless $self->dirty; 2328 return unless $self->dirty;
2172 2329
2192 } else { 2349 } else {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2194 } 2351 }
2195} 2352}
2196 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2197sub swap_out { 2362sub swap_out {
2198 my ($self) = @_; 2363 my ($self) = @_;
2199 2364
2200 # save first because save cedes
2201 $self->save;
2202
2203 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2205 return if $self->players; 2369 return if $self->players;
2206 return if $self->in_memory != cf::MAP_ACTIVE; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2207 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2208 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2209 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2210 2421
2211 $self->deactivate; 2422 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->clear; 2424 $self->clear;
2214}
2215
2216sub reset_at {
2217 my ($self) = @_;
2218
2219 # TODO: safety, remove and allow resettable per-player maps
2220 return 1e99 if $self->{deny_reset};
2221
2222 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2223 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2224
2225 $time + $to
2226}
2227
2228sub should_reset {
2229 my ($self) = @_;
2230
2231 $self->reset_at <= $cf::RUNTIME
2232}
2233
2234sub reset {
2235 my ($self) = @_;
2236
2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2238
2239 return if $self->players;
2240
2241 warn "resetting map ", $self->path, "\n";
2242
2243 $self->in_memory (cf::MAP_SWAPPED);
2244
2245 # need to save uniques path
2246 unless ($self->{deny_save}) {
2247 my $uniq = $self->uniq_path; utf8::encode $uniq;
2248
2249 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2250 if $uniq;
2251 }
2252
2253 delete $cf::MAP{$self->path};
2254
2255 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear;
2258 2425
2259 $self->unlink_save; 2426 $self->unlink_save;
2260 $self->destroy; 2427 $self->destroy;
2261} 2428}
2262 2429
2270 2437
2271 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2272 2439
2273 $self->unlink_save; 2440 $self->unlink_save;
2274 2441
2275 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2276 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2277 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2278 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2279 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2280 2447
2337 : normalise $_ 2504 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2506 ]
2340} 2507}
2341 2508
2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2540
2342=back 2541=back
2343 2542
2344=head3 cf::object 2543=head3 cf::object
2345 2544
2346=cut 2545=cut
2478 2677
2479Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2480 2679
2481The player should be reasonably safe there for short amounts of time (e.g. 2680The player should be reasonably safe there for short amounts of time (e.g.
2482for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2483though, as the palyer cannot control the character while it is on the link 2682though, as the player cannot control the character while it is on the link
2484map. 2683map.
2485 2684
2486Will never block. 2685Will never block.
2487 2686
2488=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2509sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2510 my ($self) = @_; 2709 my ($self) = @_;
2511 2710
2512 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2513 2712
2713 ++$self->{_link_recursion};
2714
2514 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2515 2716
2516 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2517 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2518 2719
2519 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2520} 2721}
2521 2722
2522sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2523 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2524 2725
2541 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2543 2744
2544 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2547 2748
2548 $map->load; 2749 $map->load;
2549 $map->load_neighbours;
2550 2750
2551 return unless $self->contr->active; 2751 return unless $self->contr->active;
2552 2752
2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2554 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2555 2755 # entering was successful
2756 delete $self->{_link_recursion};
2556 # only activate afterwards, to support waiting in hooks 2757 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive; 2758 $self->activate_recursive;
2558} 2759 }
2559 2760
2761}
2762
2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2561 2764
2562Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2563her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2564that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2565the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2572 2775
2573our $GOTOGEN; 2776our $GOTOGEN;
2574 2777
2575sub cf::object::player::goto { 2778sub cf::object::player::goto {
2576 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2577 2786
2578 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2579 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2580 2789
2581 $self->enter_link; 2790 $self->enter_link;
2601 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2602 } 2811 }
2603 } 2812 }
2604 2813
2605 my $map = eval { 2814 my $map = eval {
2606 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2607 2816
2608 if ($map) { 2817 if ($map) {
2609 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2610 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2611 } else { 2820 } else {
2612 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2613 } 2822 }
2614 2823
2615 $map 2824 $map
2623 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2624 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2625 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2626 } 2835 }
2627 2836
2628 $done->() if $done; 2837 $done->($self) if $done;
2629 })->prio (1); 2838 })->prio (1);
2630} 2839}
2631 2840
2632=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2633 2842
2701 $Coro::current->{desc} = "enter_exit"; 2910 $Coro::current->{desc} = "enter_exit";
2702 2911
2703 unless (eval { 2912 unless (eval {
2704 $self->deactivate_recursive; # just to be sure 2913 $self->deactivate_recursive; # just to be sure
2705 2914
2706 # random map handling
2707 {
2708 my $guard = cf::lock_acquire "exit_prepare:$exit";
2709
2710 prepare_random_map $exit
2711 if $exit->slaying eq "/!";
2712 }
2713
2714 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2715 my $x = $exit->stats->hp; 2916 my $x = $exit->stats->hp;
2716 my $y = $exit->stats->sp; 2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2717 2941
2718 $self->goto ($map, $x, $y); 2942 $self->goto ($map, $x, $y);
2719 2943
2720 # if exit is damned, update players death & WoR home-position 2944 # if exit is damned, update players death & WoR home-position
2721 $self->contr->savebed ($map, $x, $y) 2945 $self->contr->savebed ($map, $x, $y)
2726 $self->message ("Something went wrong deep within the deliantra server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2727 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2728 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2729 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2730 2954
2731 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2732 $self->leave_link; 2956 $self->leave_link;
2733 } 2957 }
2734 })->prio (1); 2958 })->prio (1);
2735} 2959}
2736 2960
2748sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2749 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2750 2974
2751 utf8::encode $text; 2975 utf8::encode $text;
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2753} 3002}
2754 3003
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 3005
2757Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2761 3010
2762=cut 3011=cut
2763 3012
2764# non-persistent channels (usually the info channel) 3013# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2766 "c/identify" => { 3021 "c/identify" => {
2767 id => "infobox", 3022 id => "infobox",
2768 title => "Identify", 3023 title => "Identify",
2769 reply => undef, 3024 reply => undef,
2770 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2772 "c/examine" => { 3027 "c/examine" => {
2773 id => "infobox", 3028 id => "infobox",
2774 title => "Examine", 3029 title => "Examine",
2775 reply => undef, 3030 reply => undef,
2776 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 3038 },
2778 "c/book" => { 3039 "c/book" => {
2779 id => "infobox", 3040 id => "infobox",
2780 title => "Book", 3041 title => "Book",
2781 reply => undef, 3042 reply => undef,
2897 my $pkt = "msg " 3158 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3159 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3161 );
2901 3162
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3163 $self->send_big_packet ($pkt);
2913} 3164}
2914 3165
2915=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2916 3167
2917Sends an ext event to the client. 3168Sends an ext event to the client.
2920 3171
2921sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2923 3174
2924 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3180 }
2930} 3181}
2931 3182
2932=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2933 3184
2936=cut 3187=cut
2937 3188
2938sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2940 3191
2941 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 }
2948} 3195}
2949 3196
2950=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2951 3198
2952Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
3007 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
3008 3255
3009 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3010 3257
3011 if (ref $msg) { 3258 if (ref $msg) {
3012 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3013 "ARRAY" eq ref $msg
3014 ? @$msg
3015 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3016 3260
3017 my @reply; 3261 my @reply;
3018 3262
3019 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
3020 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
3022 3266
3023 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
3024 if $reply; 3268 if $reply;
3025 3269
3026 } else { 3270 } else {
3027 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3028 } 3272 }
3029 3273
3030 cf::override; 3274 cf::override;
3031 }, 3275 },
3032); 3276);
3052 3296
3053 $coro 3297 $coro
3054} 3298}
3055 3299
3056cf::client->attach ( 3300cf::client->attach (
3057 on_destroy => sub { 3301 on_client_destroy => sub {
3058 my ($ns) = @_; 3302 my ($ns) = @_;
3059 3303
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3305 },
3062); 3306);
3078our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
3079 3323
3080$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
3081 3325
3082$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
3085 sort time 3329 sort time
3086)); 3330));
3087 3331
3088# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
3113 decrease split destroy change_exp value msg lore send_msg)], 3357 decrease split destroy change_exp value msg lore send_msg)],
3114 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
3115 ["cf::player" => qw(peaceful send_msg)], 3359 ["cf::player" => qw(peaceful send_msg)],
3116 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
3117) { 3361) {
3118 no strict 'refs';
3119 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3121 for @funs; 3364 for @funs;
3122} 3365}
3123 3366
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
3142 3385
3143 %vars = (_dummy => 0) unless %vars; 3386 %vars = (_dummy => 0) unless %vars;
3144 3387
3388 my @res;
3145 local $_; 3389 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3390
3148 my $eval = 3391 my $eval =
3149 "do {\n" 3392 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3395 . $code
3153 . "\n}" 3396 . "\n}"
3154 ; 3397 ;
3155 3398
3399 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
3159 3408
3160 if ($@) { 3409 if ($@) {
3161 warn "$@"; 3410 warn "$@",
3162 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
3164 } 3413 }
3165 3414
3166 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3167} 3416}
3168 3417
3182=cut 3431=cut
3183 3432
3184sub register_script_function { 3433sub register_script_function {
3185 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3186 3435
3187 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3189} 3438}
3190 3439
3191=back 3440=back
3192 3441
3193=cut 3442=cut
3202 # for this (global event?) 3451 # for this (global event?)
3203 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3204 3453
3205 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3206 3455
3207 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3208 3457
3209 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3210 0 < aio_load $path, $facedata
3211 or die "$path: $!";
3212
3213 $facedata = Coro::Storable::thaw $facedata;
3214 3459
3215 $facedata->{version} == 2 3460 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3462
3218 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3466 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3469 };
3223 cf::cede_to_tick; 3470 cf::cede_to_tick;
3224 3471
3225 { 3472 {
3226 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3228 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3477
3231 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3235 3483
3236 cf::cede_to_tick; 3484 cf::cede_to_tick;
3237 } 3485 }
3238 3486
3239 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3244 3492
3245 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3246 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3247 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3248 } else { 3496 } else {
3249 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3250 } 3498 }
3251 3499
3252 cf::cede_to_tick; 3500 cf::cede_to_tick;
3253 } 3501 }
3254 } 3502 }
3263 3511
3264 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3265 } 3513 }
3266 3514
3267 { 3515 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3271 3517
3272 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3519 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3521
3277 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3523 cf::face::set_type $idx, $info->{type};
3292 } else { 3524 } else {
3293 $RESOURCE{$name} = $info; 3525 $RESOURCE{$name} = $info; # unused
3294 } 3526 }
3295 3527
3296 cf::cede_to_tick; 3528 cf::cede_to_tick;
3297 } 3529 }
3298 } 3530 }
3299 3531
3300 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3301 3533
3302 1 3534 1
3303} 3535}
3304
3305cf::global->attach (on_resource_update => sub {
3306 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3307 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3308
3309 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3310 my $sound = $soundconf->{compat}[$_]
3311 or next;
3312
3313 my $face = cf::face::find "sound/$sound->[1]";
3314 cf::sound::set $sound->[0] => $face;
3315 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3316 }
3317
3318 while (my ($k, $v) = each %{$soundconf->{event}}) {
3319 my $face = cf::face::find "sound/$v";
3320 cf::sound::set $k => $face;
3321 }
3322 }
3323});
3324 3536
3325register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3326 my ($ns, $want) = @_; 3538 my ($ns, $want) = @_;
3327 3539
3328 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3367sub reload_treasures { 3579sub reload_treasures {
3368 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3369 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3370} 3582}
3371 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3372sub reload_resources { 3604sub reload_resources {
3373 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3374 3606
3607 reload_exp_table;
3608 reload_materials;
3375 reload_facedata; 3609 reload_facedata;
3610 reload_sound;
3376 reload_archetypes; 3611 reload_archetypes;
3377 reload_regions; 3612 reload_regions;
3378 reload_treasures; 3613 reload_treasures;
3379 3614
3380 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3381} 3616}
3382 3617
3383sub reload_config { 3618sub reload_config {
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3385 or return;
3386 3620
3387 local $/; 3621 my $config = load_file "$CONFDIR/config";
3388 *CFG = YAML::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3389 3624
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3391 3626
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3394 3629
3395 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3419 seek $fh, 0, 0; 3654 seek $fh, 0, 0;
3420 print $fh $$; 3655 print $fh $$;
3421} 3656}
3422 3657
3423sub main_loop { 3658sub main_loop {
3424 warn "EV::loop starting\n"; 3659 trace "EV::loop starting\n";
3425 if (1) { 3660 if (1) {
3426 EV::loop; 3661 EV::loop;
3427 } 3662 }
3428 warn "EV::loop returned\n"; 3663 trace "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP; 3664 goto &main_loop unless $REALLY_UNLOOP;
3430} 3665}
3431 3666
3432sub main { 3667sub main {
3433 cf::init_globals; # initialise logging 3668 cf::init_globals; # initialise logging
3434 3669
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444 3674
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3446 3676
3447 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3448 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3454 }; 3684 };
3455 3685
3456 evthread_start IO::AIO::poll_fileno; 3686 evthread_start IO::AIO::poll_fileno;
3457 3687
3458 cf::sync_job { 3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3459 reload_resources; 3697 reload_resources;
3460 reload_config; 3698 reload_config;
3461 db_init; 3699 db_init;
3462 3700
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3701 cf::init_uuid;
3466 cf::init_signals; 3702 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3703 cf::init_skills;
3469 3704
3470 cf::init_beforeplay; 3705 cf::init_beforeplay;
3471 3706
3472 atomic; 3707 atomic;
3477 3712
3478 # no (long-running) fork's whatsoever before this point(!) 3713 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX (); 3714 use POSIX ();
3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3481 3716
3482 (pop @POST_INIT)->(0) while @POST_INIT; 3717 cf::_post_init 0;
3483 }; 3718 };
3484 3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3485 main_loop; 3727 goto &main_loop;
3486} 3728}
3487 3729
3488############################################################################# 3730#############################################################################
3489# initialisation and cleanup 3731# initialisation and cleanup
3490 3732
3491# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3492BEGIN { 3734BEGIN {
3493 our %SIGWATCHER = (); 3735 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3497 }; 3739 };
3498 } 3740 }
3499} 3741}
3500 3742
3501sub write_runtime_sync { 3743sub write_runtime_sync {
3744 my $t0 = AE::time;
3745
3502 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3504 3748
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 3750
3507 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3508 3752
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 3754 or return;
3511 3755
3512 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3527 or return; 3771 or return;
3528 3772
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 3774 and return;
3531 3775
3532 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 3777
3534 1 3778 1
3535} 3779}
3536 3780
3537our $uuid_lock; 3781our $uuid_lock;
3549 or return; 3793 or return;
3550 3794
3551 my $value = uuid_seq uuid_cur; 3795 my $value = uuid_seq uuid_cur;
3552 3796
3553 unless ($value) { 3797 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n"; 3798 info "cowardly refusing to write zero uuid value!\n";
3555 return; 3799 return;
3556 } 3800 }
3557 3801
3558 my $value = uuid_str $value + $uuid_skip; 3802 my $value = uuid_str $value + $uuid_skip;
3559 $uuid_skip = 0; 3803 $uuid_skip = 0;
3569 or return; 3813 or return;
3570 3814
3571 aio_rename "$uuid~", $uuid 3815 aio_rename "$uuid~", $uuid
3572 and return; 3816 and return;
3573 3817
3574 warn "uuid file written ($value).\n"; 3818 trace "uuid file written ($value).\n";
3575 3819
3576 1 3820 1
3577 3821
3578} 3822}
3579 3823
3585} 3829}
3586 3830
3587sub emergency_save() { 3831sub emergency_save() {
3588 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3589 3833
3590 warn "emergency_perl_save: enter\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3591 3840
3592 cf::sync_job { 3841 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so 3842 cf::write_runtime_sync; # external watchdog should not bark
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597 3843
3598 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3599 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3600 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3601 warn "emergency_perl_save: begin player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3602 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3603 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3604 $pl->valid or next; 3850 $pl->valid or next;
3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3606 $pl->save; 3852 $pl->save;
3607 } 3853 }
3608 warn "emergency_perl_save: end player save\n"; 3854 info "emergency_perl_save: end player save\n";
3609 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3610 warn "emergency_perl_save: begin map save\n"; 3858 info "emergency_perl_save: begin map save\n";
3611 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3612 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3613 $map->valid or next; 3861 $map->valid or next;
3614 $map->save; 3862 $map->save;
3615 } 3863 }
3616 warn "emergency_perl_save: end map save\n"; 3864 info "emergency_perl_save: end map save\n";
3617 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3618 warn "emergency_perl_save: begin database checkpoint\n"; 3868 info "emergency_perl_save: begin database checkpoint\n";
3619 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3620 warn "emergency_perl_save: end database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3621 3871
3622 warn "emergency_perl_save: begin write uuid\n"; 3872 info "emergency_perl_save: begin write uuid\n";
3623 write_uuid_sync 1; 3873 write_uuid_sync 1;
3624 warn "emergency_perl_save: end write uuid\n"; 3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3625 }; 3894 };
3626 3895
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3632 warn "emergency_perl_save: leave\n"; 3896 info "emergency_perl_save: leave\n";
3633} 3897}
3634 3898
3635sub post_cleanup { 3899sub post_cleanup {
3636 my ($make_core) = @_; 3900 my ($make_core) = @_;
3637 3901
3902 IO::AIO::flush;
3903
3638 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3639 if $make_core; 3905 if $make_core;
3640 3906
3641 my $fh = pidfile; 3907 my $fh = pidfile;
3642 unlink $PIDFILE if <$fh> == $$; 3908 unlink $PIDFILE if <$fh> == $$;
3643} 3909}
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) { 3930 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"}; 3931 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 } 3933 }
3668 warn "cleared package $pkg\n";#d#
3669} 3934}
3670 3935
3671sub do_reload_perl() { 3936sub do_reload_perl() {
3672 # can/must only be called in main 3937 # can/must only be called in main
3673 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3674 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3675 return; 3940 return;
3676 } 3941 }
3677 3942
3678 return if $RELOAD++; 3943 return if $RELOAD++;
3679 3944
3680 my $t1 = EV::time; 3945 my $t1 = AE::time;
3681 3946
3682 while ($RELOAD) { 3947 while ($RELOAD) {
3683 warn "reloading..."; 3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3684 3950
3685 warn "entering sync_job"; 3951 trace "perl_reload: entering sync_job";
3686 3952
3687 cf::sync_job { 3953 cf::sync_job {
3688 cf::write_runtime_sync; # external watchdog should not bark
3689 cf::emergency_save; 3954 #cf::emergency_save;
3690 cf::write_runtime_sync; # external watchdog should not bark
3691 3955
3692 warn "syncing database to disk";
3693 BDB::db_env_txn_checkpoint $DB_ENV;
3694
3695 # if anything goes wrong in here, we should simply crash as we already saved
3696
3697 warn "flushing outstanding aio requests";
3698 while (IO::AIO::nreqs || BDB::nreqs) {
3699 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3700 }
3701
3702 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3703 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3704 %EXT_CORO = (); 3958 %EXT_CORO = ();
3705 3959
3706 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3707 %COMMAND = (); 3961 %COMMAND = ();
3708 3962
3709 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3710 %EXTCMD = (); 3964 %EXTCMD = ();
3711 %EXTICMD = (); 3965 %EXTICMD = ();
3712 3966
3713 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3714 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3715 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3716 3970
3717 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3718 eval { 3972 eval {
3719 $cb->($pkg); 3973 $cb->($pkg);
3720 1 3974 1
3721 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3722 } 3976 }
3723 3977
3724 warn "... clearing $pkg"; 3978 trace "... clearing $pkg";
3725 clear_package $pkg; 3979 clear_package $pkg;
3726 } 3980 }
3727 3981
3728 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3729 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3730 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3731 3985
3732 warn "... unloading $k"; 3986 trace "... unloading $k";
3733 delete $INC{$k}; 3987 delete $INC{$k};
3734 3988
3735 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3736 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3737 3991
3740 } 3994 }
3741 3995
3742 clear_package $k; 3996 clear_package $k;
3743 } 3997 }
3744 3998
3745 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3746 clear_package "safe::$_" 4000 clear_package "safe::$_"
3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3748 4002
3749 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3750 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3752 4006
3753 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3754 # and global variables created in xs 4008 # and global variables created in xs
3755 #clear_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3756 4010
3757 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3758 4012
3759 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3760 require cf; 4014 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3762 4016
3763 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3764 cf::reload_config; 4018 cf::reload_config;
3765 4019
3766 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3767 cf::load_extensions; 4021 cf::load_extensions;
3768 4022
3769 if ($REATTACH_ON_RELOAD) { 4023 if ($REATTACH_ON_RELOAD) {
3770 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3771 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3772 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3773 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3774 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3775 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
3776 } 4030 }
3777 4031
3778 warn "running post_init jobs"; 4032 cf::_post_init 1;
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780 4033
3781 warn "leaving sync_job"; 4034 trace "perl_reload: leaving sync_job";
3782 4035
3783 1 4036 1
3784 } or do { 4037 } or do {
3785 warn $@; 4038 error $@;
3786 cf::cleanup "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3787 }; 4040 };
3788 4041
3789 warn "reloaded";
3790 --$RELOAD; 4042 --$RELOAD;
3791 } 4043 }
3792 4044
3793 $t1 = EV::time - $t1; 4045 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 4046 info "perl_reload: completed in ${t1}s\n";
3795}; 4047};
3796 4048
3797our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3798 4050
3799sub reload_perl() { 4051sub reload_perl() {
3801 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3802 4054
3803 $RELOAD_WATCHER ||= cf::async { 4055 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 4056 Coro::AIO::aio_wait cache_extensions;
3805 4057
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 4059 do_reload_perl;
3808 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3809 }; 4061 };
3810 }; 4062 };
3811} 4063}
3820 reload_perl; 4072 reload_perl;
3821 }; 4073 };
3822 } 4074 }
3823}; 4075};
3824 4076
3825unshift @INC, $LIBDIR; 4077#############################################################################
3826 4078
3827my $bug_warning = 0; 4079my $bug_warning = 0;
3828 4080
3829our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN;
3831
3832sub wait_for_tick { 4081sub wait_for_tick() {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3834 4083
3835 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3836 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait;
3838} 4085}
3839 4086
3840sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3842 4089
3843 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 4092 $signal->wait;
3846} 4093}
3850 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3851 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3852 return; 4099 return;
3853 } 4100 }
3854 4101
3855 cf::server_tick; # one server iteration 4102 cf::one_tick; # one server iteration
4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3856 4105
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 4108 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3861 write_runtime_sync 4110 write_runtime_sync
3862 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3863 }; 4112 };
3864 } 4113 }
3865 4114
3866 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3867 $sig->send; 4116 $sig->send;
3868 } 4117 }
3869 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3870 $sig->send;
3871 }
3872 4119
3873 $LOAD = ($NOW - $TICK_START) / $TICK; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3874 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3875 4122
3876 if (0) { 4123 if (0) {
3877 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3878 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3879 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3880 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3881 } 4128 }
3882 } 4129 }
3883} 4130}
3884 4131
3885{ 4132{
3886 # configure BDB 4133 # configure BDB
3887 4134
3888 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3891 4138
3892 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3894 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3895 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3930 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3931 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3932 undef $AnyEvent::AIO::WATCHER; 4179 undef $AnyEvent::AIO::WATCHER;
3933} 4180}
3934 4181
3935my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3936 4184
3937sub _log_backtrace { 4185sub _log_backtrace {
3938 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3939 4187
3940 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3941 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3942 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3943 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3944 ++$_log_backtrace; 4196 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg; 4197 my $perl_bt = Carp::longmess $msg;
3946 async { 4198 async {
3947 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3948 4200
3968 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3969 --$_log_backtrace; 4221 --$_log_backtrace;
3970 }; 4222 };
3971 } else { 4223 } else {
3972 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3973 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3974 } 4226 }
3975} 4227}
3976 4228
3977# load additional modules 4229# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3979 4232
3980END { cf::emergency_save } 4233END { cf::emergency_save }
3981 4234
39821 42351
3983 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines