ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 2011 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
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
95our $DATADIR = datadir; 99our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
98our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
99our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
100our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
102our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
103our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 112
108our %RESOURCE; 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;
109 120
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 123our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 129our $DB_ENV;
119 130
120our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
121 132
122our %CFG; 133our %CFG;
123 134
124our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
126our $NOW; 138our $NOW;
127 139
128our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
129our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
130our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
139 151
140our @POST_INIT; 152our @POST_INIT;
141 153
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
144 159
145binmode STDOUT; 160binmode STDOUT;
146binmode STDERR; 161binmode STDERR;
147 162
148# read virtual server time, if available 163# read virtual server time, if available
159 174
160our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
161 176
162sub cf::map::normalise; 177sub cf::map::normalise;
163 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
164############################################################################# 183#############################################################################
165 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
166=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
167 197
168=over 4 198=over 4
169 199
170=item $cf::UPTIME 200=item $cf::UPTIME
171 201
172The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
173 218
174=item $cf::RUNTIME 219=item $cf::RUNTIME
175 220
176The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
177every server tick. 222every server tick.
183Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
184directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
185unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
186database environment. 231database environment.
187 232
188=item $cf::NOW
189
190The time of the last (current) server tick.
191
192=item $cf::TICK
193
194The interval between server ticks, in seconds.
195
196=item $cf::LOADAVG 233=item $cf::LOADAVG
197 234
198The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
199(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
200objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
209from wherever your confdir points to. 246from wherever your confdir points to.
210 247
211=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
212 249
213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
214returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
215per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
216 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
217=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
218 272
219This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
220C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
221that call. 275that call.
222 276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
223=back 283=back
224 284
225=cut 285=cut
226 286
227BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
228 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
229 my $msg = join "", @_; 294 my $msg = join "", @_;
230 295
231 $msg .= "\n" 296 $msg .= "\n"
232 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
233 298
234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
235 300
236 LOG llevError, $msg; 301 LOG llevWarn, $msg;
237 }; 302};
238}
239 303
240$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
242 306
243 if ($Coro::current == $Coro::main) {#d# 307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 311 return;#d#
246 }#d# 312 }#d#
247 313
248 # kill coroutine otherwise 314 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 315 Coro::terminate
251}; 316};
252
253$SIG{__DIE__} = sub { }; #d#?
254 317
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
272)) { 335)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 337}
275 338
276$EV::DIED = sub { 339$EV::DIED = sub {
277 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
278}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
279 347
280############################################################################# 348#############################################################################
281 349
282=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
283 351
304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
305 $d 373 $d
306 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
307} 375}
308 376
377=item $scalar = 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
309=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
310 392
311Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
312 394
313=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
319our $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
320 402
321sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
322sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
323 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
324=item cf::post_init { BLOCK } 437=item cf::post_init { BLOCK }
325 438
326Execute the given codeblock, I<after> all extensions have been (re-)loaded, 439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again. 440but I<before> the server starts ticking again.
328 441
329The cdoeblock will have a single boolean argument to indicate whether this 442The codeblock will have a single boolean argument to indicate whether this
330is a reload or not. 443is a reload or not.
331 444
332=cut 445=cut
333 446
334sub post_init(&) { 447sub post_init(&) {
335 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 }
336} 466}
337 467
338=item cf::lock_wait $string 468=item cf::lock_wait $string
339 469
340Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
379} 509}
380 510
381=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
382 512
383Like 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
384get spread over timer. 514get spread over time.
385 515
386=cut 516=cut
387 517
388sub periodic($$) { 518sub periodic($$) {
389 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
393 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
394} 524}
395 525
396=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
397 527
398Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
399This 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
400of 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.
401 535
402The 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
403used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
404 538
405Useful for short background jobs. 539Useful for short background jobs.
406 540
407=cut 541=cut
408 542
409our @SLOT_QUEUE; 543our @SLOT_QUEUE;
410our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
411 546
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
415 550
416 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
417 553
418 while () { 554 while () {
419 next_job: 555 next_job:
556
420 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 558
422 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 563 $job->[2]->send;
426 Coro::cede; 564 Coro::cede;
427 goto next_job; 565 goto next_job;
428 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 568 }
430 } 569 }
431 570
432 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
433 # 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
434 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
435 $signal->wait;
436 } else { 574 } else {
575 $busy = 0;
437 Coro::schedule; 576 Coro::schedule;
438 } 577 }
439 } 578 }
440}; 579};
441 580
442sub get_slot($;$$) { 581sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 582 return if tick_inhibit || $Coro::current == $Coro::main;
444 583
445 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
446 585
447 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
448 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
449 589
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
478=cut 618=cut
479 619
480sub sync_job(&) { 620sub sync_job(&) {
481 my ($job) = @_; 621 my ($job) = @_;
482 622
483 if ($Coro::current == $Coro::main) { 623 if (in_main) {
484 my $time = EV::time; 624 my $time = AE::time;
485 625
486 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
488 628
489 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
490 630
491 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
492 632
493 my $busy = 1; 633 my $busy = 1;
494 my @res; 634 my @res;
495 635
496 (async { 636 (async {
497 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
498 @res = eval { $job->() }; 638 @res = eval { $job->() };
499 warn $@ if $@; 639 error $@ if $@;
500 undef $busy; 640 undef $busy;
501 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
502 642
503 while ($busy) { 643 while ($busy) {
504 if (Coro::nready) { 644 if (Coro::nready) {
506 } else { 646 } else {
507 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
508 } 648 }
509 } 649 }
510 650
511 my $time = EV::time - $time; 651 my $time = AE::time - $time;
512 652
513 $TICK_START += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
514 654
515 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
516 } else { 656 } else {
538 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
539 679
540 $coro 680 $coro
541} 681}
542 682
543=item fork_call { }, $args 683=item fork_call { }, @args
544 684
545Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
546process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
547Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
548never block itself or use any form of event handling. 688never block itself or use any form of event handling.
549 689
550=cut 690=cut
551 691
692sub post_fork {
693 reset_signals;
694}
695
552sub fork_call(&@) { 696sub fork_call(&@) {
553 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
554 698
555 # 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,
556 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
557 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
558 702
559 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
560 reset_signals; 704 cf::post_fork;
561 &$cb 705 &$cb
562 }, @args; 706 } @args;
563 707
564 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 )
565} 720}
566 721
567=item $coin = coin_from_name $name 722=item $coin = coin_from_name $name
568 723
569=cut 724=cut
606within each server. 761within each server.
607 762
608=cut 763=cut
609 764
610sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
611 my ($name) = @_; 769 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
613 771
614 eval { 772 eval {
615 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
625} 783}
626 784
627our $DB; 785our $DB;
628 786
629sub db_init { 787sub db_init {
630 cf::sync_job {
631 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
632 };
633} 789}
634 790
635sub db_get($$) { 791sub db_get($$) {
636 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
637 793
638 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
639 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
640 798
641 $! ? () 799 $! ? ()
642 : $data 800 : $data
643 }
644} 801}
645 802
646sub db_put($$$) { 803sub db_put($$$) {
647 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
648 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
676 833
677 my @data; 834 my @data;
678 my $md5; 835 my $md5;
679 836
680 for (0 .. $#$src) { 837 for (0 .. $#$src) {
681 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
682 or Carp::croak "$src->[$_]: $!";
683 } 839 }
684 840
685 # if processing is expensive, check 841 # if processing is expensive, check
686 # checksum first 842 # checksum first
687 if (1) { 843 if (1) {
704 860
705 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
706 my $data = $process->(\@data); 862 my $data = $process->(\@data);
707 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
708 864
709 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
710 866
711 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
712 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
713 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
714 870
724 880
725=cut 881=cut
726 882
727sub datalog($@) { 883sub datalog($@) {
728 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
729 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
730} 886}
731 887
732=back 888=back
733 889
734=cut 890=cut
929 1085
930 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
931 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
932 1088
933 } elsif (ref $type) { 1089 } elsif (ref $type) {
934 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
935 1091
936 } else { 1092 } else {
937 shift @arg; 1093 shift @arg;
938 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
939 } 1095 }
940 } 1096 }
941} 1097}
942 1098
943sub _object_attach { 1099sub _object_attach {
953 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
954 } 1110 }
955 1111
956 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
957 } else { 1113 } else {
958 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
959 } 1115 }
960 1116
961 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
962} 1118}
963 1119
1022 1178
1023 for (@$callbacks) { 1179 for (@$callbacks) {
1024 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
1025 1181
1026 if ($@) { 1182 if ($@) {
1027 warn "$@";
1028 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1029 override; 1184 override;
1030 } 1185 }
1031 1186
1032 return 1 if $override; 1187 return 1 if $override;
1033 } 1188 }
1112 for (@$attach) { 1267 for (@$attach) {
1113 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1114 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1115 } 1270 }
1116 } else { 1271 } else {
1117 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1118 } 1273 }
1119 } 1274 }
1120} 1275}
1121 1276
1122cf::attachable->attach ( 1277cf::attachable->attach (
1149 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1150 1305
1151 sync_job { 1306 sync_job {
1152 if (length $$rdata) { 1307 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1154 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1155 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1156 1312
1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1158 aio_chmod $fh, SAVE_MODE; 1314 aio_chmod $fh, SAVE_MODE;
1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1160 if ($cf::USE_FSYNC) { 1316 if ($cf::USE_FSYNC) {
1182 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1183 1339
1184 $filename =~ s%/[^/]+$%%; 1340 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC; 1341 aio_pathsync $filename if $cf::USE_FSYNC;
1186 } else { 1342 } else {
1187 warn "unable to save objects: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1188 } 1344 }
1189 } else { 1345 } else {
1190 aio_unlink $filename; 1346 aio_unlink $filename;
1191 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1192 } 1348 }
1216 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs}; 1373 $av = $st->{objs};
1218 } 1374 }
1219 1375
1220 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1221 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1222 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1223 1380
1224 ($data, $av) 1381 ($data, $av)
1225} 1382}
1226 1383
1227=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1286} 1443}
1287 1444
1288use File::Glob (); 1445use File::Glob ();
1289 1446
1290cf::player->attach ( 1447cf::player->attach (
1291 on_command => sub { 1448 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1293 1450
1294 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1295 or return; 1452 or return;
1296 1453
1319 1476
1320 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1321 if $reply; 1478 if $reply;
1322 1479
1323 } else { 1480 } else {
1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1325 } 1482 }
1326 1483
1327 cf::override; 1484 cf::override;
1328 }, 1485 },
1329); 1486);
1340 1497
1341 $grp 1498 $grp
1342} 1499}
1343 1500
1344sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1345 cf::sync_job { 1504 cf::sync_job {
1346 my %todo; 1505 my %todo;
1347 1506
1348 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1349 next unless -r $path; 1508 next unless -r $path;
1367 1526
1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1370 1529
1371 $ext{source} = 1530 $ext{source} =
1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1373 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1374 . $source 1533 . $source
1375 . "\n};\n1"; 1534 . "\n};\n1";
1376 1535
1377 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1378 } 1537 }
1379 1538
1539 my $pass = 0;
1380 my %done; 1540 my %done;
1381 while (%todo) { 1541 while (%todo) {
1382 my $progress; 1542 my $progress;
1383 1543
1544 ++$pass;
1545
1546 ext:
1384 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1549 next ext
1387 unless exists $done{$_}; 1550 unless exists $done{$_};
1388 } 1551 }
1389 1552
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1554
1392 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1559
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1561 if exists $v->{meta}{mandatory};
1400 1562
1401 warn $msg; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1564 delete $todo{$k};
1565 } else {
1566 $done{$k} = delete $todo{$k};
1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1402 } 1572 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1573 }
1408 1574
1409 skip: 1575 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 unless $progress; 1577
1578 while (my ($k, $v) = each %todo) {
1579 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1580 if exists $v->{meta}{mandatory};
1581 }
1582
1583 last;
1584 }
1412 } 1585 }
1413 }; 1586 };
1414} 1587}
1415 1588
1416############################################################################# 1589#############################################################################
1500 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1501 } 1674 }
1502 } 1675 }
1503} 1676}
1504 1677
1678cf::player->attach (
1679 on_load => sub {
1680 my ($pl, $path) = @_;
1681
1682 # restore slots saved in save, below
1683 my $slots = delete $pl->{_slots};
1684
1685 $pl->ob->current_weapon ($slots->[0]);
1686 $pl->combat_ob ($slots->[1]);
1687 $pl->ranged_ob ($slots->[2]);
1688 },
1689);
1690
1505sub save($) { 1691sub save($) {
1506 my ($pl) = @_; 1692 my ($pl) = @_;
1507 1693
1508 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1509 1695
1514 1700
1515 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1702 $pl->{last_save} = $cf::RUNTIME;
1517 1703
1518 cf::get_slot 0.01; 1704 cf::get_slot 0.01;
1705
1706 # save slots, to be restored later
1707 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1519 1708
1520 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1710 cf::cede_to_tick;
1522} 1711}
1523 1712
1557 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1558 1747
1559 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1749 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1561 1750
1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1563 $pl->deactivate; 1752 $pl->deactivate;
1753
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1566 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1567 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1568 1759
1569 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1570 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1571 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1625 \@logins 1816 \@logins
1626} 1817}
1627 1818
1628=item $player->maps 1819=item $player->maps
1629 1820
1821=item cf::player::maps $login
1822
1630Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1631player. May block. 1824player. May block.
1632 1825
1633=cut 1826=cut
1634 1827
1696=cut 1889=cut
1697 1890
1698sub find_by_path($) { 1891sub find_by_path($) {
1699 my ($path) = @_; 1892 my ($path) = @_;
1700 1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1895
1701 my ($match, $specificity); 1896 my ($match, $specificity);
1702 1897
1703 for my $region (list) { 1898 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1705 ($match, $specificity) = ($region, $region->specificity) 1900 ($match, $specificity) = ($region, $region->specificity)
1733sub generate_random_map { 1928sub generate_random_map {
1734 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1735 1930
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737 1932
1738 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1748 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1749 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1750 (cf::region::find $rmp->{region}), $rmp->{custom}
1751 )
1752} 1934}
1753 1935
1754=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1755 1937
1756Register a handler for the map path matching the given regex at the 1938Register a handler for the map path matching the given regex at the
1761 1943
1762sub register { 1944sub register {
1763 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1764 my $pkg = caller; 1946 my $pkg = caller;
1765 1947
1766 no strict;
1767 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1768 1949
1769 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1770} 1951}
1771 1952
1772# also paths starting with '/' 1953# also paths starting with '/'
1773$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1774 1955
1775sub thawer_merge { 1956sub thawer_merge {
1776 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1777 1958
1778 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1783} 1964}
1784 1965
1785sub normalise { 1966sub normalise {
1786 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1787 1968
1788 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1789 1970
1790 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1791 1972
1792 # map plan: 1973 # map plan:
1793 # 1974 #
1808 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1809 $path = "$base/$path"; 1990 $path = "$base/$path";
1810 } 1991 }
1811 1992
1812 for ($path) { 1993 for ($path) {
1813 redo if s{//}{/};
1814 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1815 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1816 } 1996 }
1817 1997
1818 $path 1998 $path
1832 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1833 return $self; 2013 return $self;
1834 } 2014 }
1835 } 2015 }
1836 2016
1837 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1838 () 2018 ()
1839} 2019}
1840 2020
2021# may re-bless or do other evil things
1841sub init { 2022sub init {
1842 my ($self) = @_; 2023 my ($self) = @_;
1843 2024
1844 $self 2025 $self
1845} 2026}
1910 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1911 2092
1912 1 2093 1
1913} 2094}
1914 2095
2096# used to laod the header of an original map
1915sub load_header_orig { 2097sub load_header_orig {
1916 my ($self) = @_; 2098 my ($self) = @_;
1917 2099
1918 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1919} 2101}
1920 2102
2103# used to laod the header of an instantiated map
1921sub load_header_temp { 2104sub load_header_temp {
1922 my ($self) = @_; 2105 my ($self) = @_;
1923 2106
1924 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1925} 2108}
1926 2109
2110# called after loading the header from an instantiated map
1927sub prepare_temp { 2111sub prepare_temp {
1928 my ($self) = @_; 2112 my ($self) = @_;
1929 2113
1930 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1932 # safety 2116 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2119}
1936 2120
2121# called after loading the header from an original map
1937sub prepare_orig { 2122sub prepare_orig {
1938 my ($self) = @_; 2123 my ($self) = @_;
1939 2124
1940 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1965 2150
1966sub find; 2151sub find;
1967sub find { 2152sub find {
1968 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1969 2154
2155 cf::cede_to_tick;
2156
1970 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1971 2158
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 my $guard2 = cf::lock_acquire "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2161
1975 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1992 2179
1993 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1994 } 2181 }
1995} 2182}
1996 2183
1997sub pre_load { } 2184sub pre_load { }
1998sub post_load { } 2185#sub post_load { } # XS
1999 2186
2000sub load { 2187sub load {
2001 my ($self) = @_; 2188 my ($self) = @_;
2002 2189
2003 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2006 2193
2007 { 2194 {
2008 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2009 2196
2010 return unless $self->valid; 2197 return unless $self->valid;
2011 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2012
2013 $self->in_memory (cf::MAP_LOADING);
2014 2199
2015 $self->alloc; 2200 $self->alloc;
2016 2201
2017 $self->pre_load; 2202 $self->pre_load;
2018 cf::cede_to_tick; 2203 cf::cede_to_tick;
2019 2204
2205 if (exists $self->{load_path}) {
2020 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block; 2207 $f->skip_block;
2022 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2023 or return; 2209 or return;
2024 2210
2025 $self->post_load_original 2211 $self->post_load_original
2026 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2027 2213
2028 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2029 utf8::encode $uniq; 2215 utf8::encode $uniq;
2030 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2032 $self->clear_unique_items; 2218 $self->clear_unique_items;
2033 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2035 } 2222 }
2036 } 2223 }
2037 }
2038 2224
2039 $f->resolve_delayed_derefs; 2225 $f->resolve_delayed_derefs;
2226 } else {
2227 $self->post_load_original
2228 if delete $self->{load_original};
2229 }
2230
2231 $self->state (cf::MAP_INACTIVE);
2040 2232
2041 cf::cede_to_tick; 2233 cf::cede_to_tick;
2042 # now do the right thing for maps 2234 # now do the right thing for maps
2043 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2044 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2048 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2049 $self->decay_objects; 2241 $self->decay_objects;
2050 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2051 $self->update_buttons; 2243 $self->update_buttons;
2052 cf::cede_to_tick; 2244 cf::cede_to_tick;
2053 $self->activate; 2245 #$self->activate; # no longer activate maps automatically
2054 } 2246 }
2055 2247
2056 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2057 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2058
2059 $self->in_memory (cf::MAP_ACTIVE);
2060 } 2250 }
2061 2251
2062 $self->post_load; 2252 $self->post_load;
2063}
2064 2253
2254 1
2255}
2256
2257# customize the map for a given player, i.e.
2258# return the _real_ map. used by e.g. per-player
2259# maps to change the path to ~playername/mappath
2065sub customise_for { 2260sub customise_for {
2066 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2067 2262
2068 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2264 if $self->per_player;
2072# if $self->per_party; 2267# if $self->per_party;
2073 2268
2074 $self 2269 $self
2075} 2270}
2076 2271
2077# find and load all maps in the 3x3 area around a map
2078sub load_neighbours {
2079 my ($map) = @_;
2080
2081 my @neigh; # diagonal neighbours
2082
2083 for (0 .. 3) {
2084 my $neigh = $map->tile_path ($_)
2085 or next;
2086 $neigh = find $neigh, $map
2087 or next;
2088 $neigh->load;
2089
2090 push @neigh,
2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2093 }
2094
2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
2097 my $neigh = find $path, $origin
2098 or next;
2099 $neigh->load;
2100 }
2101}
2102
2103sub find_sync { 2272sub find_sync {
2104 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2105 2274
2106 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2107} 2280}
2108 2281
2109sub do_load_sync { 2282sub do_load_sync {
2110 my ($map) = @_; 2283 my ($map) = @_;
2111 2284
2285 # it's a bug to call this from the main context
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2114 2288
2115 cf::sync_job { $map->load }; 2289 $map->load;
2116} 2290}
2117 2291
2118our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2119our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2120 2294
2121sub find_async { 2295sub find_async {
2122 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2123 2297
2124 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2125 2299
2126 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2301 return $map if !$load || $map->linkable;
2128 } 2302 }
2129 2303
2130 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2131 2305
2132 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2146 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2147 2321
2148 () 2322 ()
2149} 2323}
2150 2324
2325# common code, used by both ->save and ->swapout
2151sub save { 2326sub _save {
2152 my ($self) = @_; 2327 my ($self) = @_;
2153
2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
2155 2328
2156 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2157 2330
2158 return unless $self->dirty; 2331 return unless $self->dirty;
2159 2332
2179 } else { 2352 } else {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2181 } 2354 }
2182} 2355}
2183 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2184sub swap_out { 2365sub swap_out {
2185 my ($self) = @_; 2366 my ($self) = @_;
2186 2367
2187 # save first because save cedes
2188 $self->save;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2192 return if $self->players; 2372 return if $self->players;
2193 return if $self->in_memory != cf::MAP_ACTIVE; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2194 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2195 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2196 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2197 2424
2198 $self->deactivate; 2425 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->clear; 2427 $self->clear;
2201}
2202
2203sub reset_at {
2204 my ($self) = @_;
2205
2206 # TODO: safety, remove and allow resettable per-player maps
2207 return 1e99 if $self->{deny_reset};
2208
2209 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2210 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2211
2212 $time + $to
2213}
2214
2215sub should_reset {
2216 my ($self) = @_;
2217
2218 $self->reset_at <= $cf::RUNTIME
2219}
2220
2221sub reset {
2222 my ($self) = @_;
2223
2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225
2226 return if $self->players;
2227
2228 warn "resetting map ", $self->path;
2229
2230 $self->in_memory (cf::MAP_SWAPPED);
2231
2232 # need to save uniques path
2233 unless ($self->{deny_save}) {
2234 my $uniq = $self->uniq_path; utf8::encode $uniq;
2235
2236 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2237 if $uniq;
2238 }
2239
2240 delete $cf::MAP{$self->path};
2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2244 $self->clear;
2245 2428
2246 $self->unlink_save; 2429 $self->unlink_save;
2247 $self->destroy; 2430 $self->destroy;
2248} 2431}
2249 2432
2257 2440
2258 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2259 2442
2260 $self->unlink_save; 2443 $self->unlink_save;
2261 2444
2262 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2263 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2264 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2265 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2267 2450
2324 : normalise $_ 2507 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2509 ]
2327} 2510}
2328 2511
2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2543
2329=back 2544=back
2330 2545
2331=head3 cf::object 2546=head3 cf::object
2332 2547
2333=cut 2548=cut
2465 2680
2466Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2467 2682
2468The player should be reasonably safe there for short amounts of time (e.g. 2683The player should be reasonably safe there for short amounts of time (e.g.
2469for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link 2685though, as the player cannot control the character while it is on the link
2471map. 2686map.
2472 2687
2473Will never block. 2688Will never block.
2474 2689
2475=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2496sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2497 my ($self) = @_; 2712 my ($self) = @_;
2498 2713
2499 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2500 2715
2716 ++$self->{_link_recursion};
2717
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2719
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2505 2722
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2724}
2508 2725
2509sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2511 2728
2528 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2530 2747
2531 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2534 2751
2535 $map->load; 2752 $map->load;
2536 $map->load_neighbours;
2537 2753
2538 return unless $self->contr->active; 2754 return unless $self->contr->active;
2539 2755
2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2541 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2542 2758 # entering was successful
2759 delete $self->{_link_recursion};
2543 # only activate afterwards, to support waiting in hooks 2760 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive; 2761 $self->activate_recursive;
2545} 2762 }
2546 2763
2764}
2765
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2548 2767
2549Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2550her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2551that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2552the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
2559 2778
2560our $GOTOGEN; 2779our $GOTOGEN;
2561 2780
2562sub cf::object::player::goto { 2781sub cf::object::player::goto {
2563 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2564 2789
2565 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2567 2792
2568 $self->enter_link; 2793 $self->enter_link;
2588 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2589 } 2814 }
2590 } 2815 }
2591 2816
2592 my $map = eval { 2817 my $map = eval {
2593 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2594 2819
2595 if ($map) { 2820 if ($map) {
2596 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2597 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2598 } else { 2823 } else {
2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2600 } 2825 }
2601 2826
2602 $map 2827 $map
2610 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2611 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2612 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2613 } 2838 }
2614 2839
2615 $done->() if $done; 2840 $done->($self) if $done;
2616 })->prio (1); 2841 })->prio (1);
2617} 2842}
2618 2843
2619=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2620 2845
2688 $Coro::current->{desc} = "enter_exit"; 2913 $Coro::current->{desc} = "enter_exit";
2689 2914
2690 unless (eval { 2915 unless (eval {
2691 $self->deactivate_recursive; # just to be sure 2916 $self->deactivate_recursive; # just to be sure
2692 2917
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2702 my $x = $exit->stats->hp; 2919 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp; 2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2704 2944
2705 $self->goto ($map, $x, $y); 2945 $self->goto ($map, $x, $y);
2706 2946
2707 # if exit is damned, update players death & WoR home-position 2947 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y) 2948 $self->contr->savebed ($map, $x, $y)
2713 $self->message ("Something went wrong deep within the deliantra server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2957
2718 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 2959 $self->leave_link;
2720 } 2960 }
2721 })->prio (1); 2961 })->prio (1);
2722} 2962}
2723 2963
2735sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2736 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2737 2977
2738 utf8::encode $text; 2978 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2740} 3005}
2741 3006
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3008
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2748 3013
2749=cut 3014=cut
2750 3015
2751# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2753 "c/identify" => { 3024 "c/identify" => {
2754 id => "infobox", 3025 id => "infobox",
2755 title => "Identify", 3026 title => "Identify",
2756 reply => undef, 3027 reply => undef,
2757 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2759 "c/examine" => { 3030 "c/examine" => {
2760 id => "infobox", 3031 id => "infobox",
2761 title => "Examine", 3032 title => "Examine",
2762 reply => undef, 3033 reply => undef,
2763 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3041 },
2765 "c/book" => { 3042 "c/book" => {
2766 id => "infobox", 3043 id => "infobox",
2767 title => "Book", 3044 title => "Book",
2768 reply => undef, 3045 reply => undef,
2884 my $pkt = "msg " 3161 my $pkt = "msg "
2885 . $self->{json_coder}->encode ( 3162 . $self->{json_coder}->encode (
2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2887 ); 3164 );
2888 3165
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if (8192 < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt); 3166 $self->send_big_packet ($pkt);
2900} 3167}
2901 3168
2902=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2903 3170
2904Sends an ext event to the client. 3171Sends an ext event to the client.
2907 3174
2908sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2910 3177
2911 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3183 }
2917} 3184}
2918 3185
2919=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2920 3187
2924 3191
2925sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2927 3194
2928 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3198 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3201 }
2935} 3202}
2936 3203
2937=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2938 3205
3009 3276
3010 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3278 if $reply;
3012 3279
3013 } else { 3280 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3282 }
3016 3283
3017 cf::override; 3284 cf::override;
3018 }, 3285 },
3019); 3286);
3039 3306
3040 $coro 3307 $coro
3041} 3308}
3042 3309
3043cf::client->attach ( 3310cf::client->attach (
3044 on_destroy => sub { 3311 on_client_destroy => sub {
3045 my ($ns) = @_; 3312 my ($ns) = @_;
3046 3313
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3315 },
3049); 3316);
3065our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3066 3333
3067$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3068 3335
3069$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3072 sort time 3339 sort time
3073)); 3340));
3074 3341
3075# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3100 decrease split destroy change_exp value msg lore send_msg)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3101 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3102 ["cf::player" => qw(peaceful send_msg)], 3369 ["cf::player" => qw(peaceful send_msg)],
3103 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3104) { 3371) {
3105 no strict 'refs';
3106 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3108 for @funs; 3374 for @funs;
3109} 3375}
3110 3376
3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3128 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3129 3395
3130 %vars = (_dummy => 0) unless %vars; 3396 %vars = (_dummy => 0) unless %vars;
3131 3397
3398 my @res;
3132 local $_; 3399 local $_;
3133 local @safe::cf::_safe_eval_args = values %vars;
3134 3400
3135 my $eval = 3401 my $eval =
3136 "do {\n" 3402 "do {\n"
3137 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3138 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3139 . $code 3405 . $code
3140 . "\n}" 3406 . "\n}"
3141 ; 3407 ;
3142 3408
3409 if ($CFG{safe_eval}) {
3143 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3144 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3145 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3146 3418
3147 if ($@) { 3419 if ($@) {
3148 warn "$@"; 3420 warn "$@",
3149 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3150 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3151 } 3423 }
3152 3424
3153 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3154} 3426}
3155 3427
3169=cut 3441=cut
3170 3442
3171sub register_script_function { 3443sub register_script_function {
3172 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3173 3445
3174 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3175 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3176} 3448}
3177 3449
3178=back 3450=back
3179 3451
3180=cut 3452=cut
3189 # for this (global event?) 3461 # for this (global event?)
3190 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3191 3463
3192 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3193 3465
3194 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3195 3467
3196 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3197 0 < aio_load $path, $facedata
3198 or die "$path: $!";
3199
3200 $facedata = Coro::Storable::thaw $facedata;
3201 3469
3202 $facedata->{version} == 2 3470 $facedata->{version} == 2
3203 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3204 3472
3205 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3206 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3207 type => FT_RSRC, 3476 type => FT_RSRC,
3208 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3209 }; 3479 };
3210 cf::cede_to_tick; 3480 cf::cede_to_tick;
3211 3481
3212 { 3482 {
3213 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3215 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3216 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3217 3487
3218 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3219 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3220 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3221 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3222 3493
3223 cf::cede_to_tick; 3494 cf::cede_to_tick;
3224 } 3495 }
3225 3496
3226 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3231 3502
3232 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3233 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3234 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3235 } else { 3506 } else {
3236 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3237 } 3508 }
3238 3509
3239 cf::cede_to_tick; 3510 cf::cede_to_tick;
3240 } 3511 }
3241 } 3512 }
3250 3521
3251 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3252 } 3523 }
3253 3524
3254 { 3525 {
3255 # TODO: for gcfclient pleasure, we should give resources
3256 # that gcfclient doesn't grok a >10000 face index.
3257 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3258 3527
3259 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3260 if (defined $info->{type}) { 3529 if (defined $info->{type}) {
3261 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3262 my $data;
3263 3531
3264 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3265 # prepend meta info
3266
3267 my $meta = $enc->encode ({
3268 name => $name,
3269 %{ $info->{meta} || {} },
3270 });
3271
3272 $data = pack "(w/a*)*", $meta, $info->{data};
3273 } else {
3274 $data = $info->{data};
3275 }
3276
3277 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3278 cf::face::set_type $idx, $info->{type}; 3533 cf::face::set_type $idx, $info->{type};
3279 } else { 3534 } else {
3280 $RESOURCE{$name} = $info; 3535 $RESOURCE{$name} = $info; # unused
3281 } 3536 }
3282 3537
3283 cf::cede_to_tick; 3538 cf::cede_to_tick;
3284 } 3539 }
3285 } 3540 }
3286 3541
3287 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3288 3543
3289 1 3544 1
3290} 3545}
3291
3292cf::global->attach (on_resource_update => sub {
3293 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3294 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3295
3296 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3297 my $sound = $soundconf->{compat}[$_]
3298 or next;
3299
3300 my $face = cf::face::find "sound/$sound->[1]";
3301 cf::sound::set $sound->[0] => $face;
3302 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3303 }
3304
3305 while (my ($k, $v) = each %{$soundconf->{event}}) {
3306 my $face = cf::face::find "sound/$v";
3307 cf::sound::set $k => $face;
3308 }
3309 }
3310});
3311 3546
3312register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3313 my ($ns, $want) = @_; 3548 my ($ns, $want) = @_;
3314 3549
3315 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3354sub reload_treasures { 3589sub reload_treasures {
3355 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3356 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3357} 3592}
3358 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3359sub reload_resources { 3614sub reload_resources {
3360 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3361 3616
3617 reload_exp_table;
3618 reload_materials;
3362 reload_facedata; 3619 reload_facedata;
3620 reload_sound;
3363 reload_archetypes; 3621 reload_archetypes;
3364 reload_regions; 3622 reload_regions;
3365 reload_treasures; 3623 reload_treasures;
3366 3624
3367 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3368} 3626}
3369 3627
3370sub reload_config { 3628sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3372 or return;
3373 3630
3374 local $/; 3631 my $config = load_file "$CONFDIR/config";
3375 *CFG = YAML::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3376 3634
3377 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3378 3636
3379 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3380 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3381 3639
3382 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3406 seek $fh, 0, 0; 3664 seek $fh, 0, 0;
3407 print $fh $$; 3665 print $fh $$;
3408} 3666}
3409 3667
3410sub main_loop { 3668sub main_loop {
3411 warn "EV::loop starting\n"; 3669 trace "EV::loop starting\n";
3412 if (1) { 3670 if (1) {
3413 EV::loop; 3671 EV::loop;
3414 } 3672 }
3415 warn "EV::loop returned\n"; 3673 trace "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP; 3674 goto &main_loop unless $REALLY_UNLOOP;
3417} 3675}
3418 3676
3419sub main { 3677sub main {
3420 cf::init_globals; # initialise logging 3678 cf::init_globals; # initialise logging
3421 3679
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431 3684
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433 3686
3434 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3435 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3441 }; 3694 };
3442 3695
3443 evthread_start IO::AIO::poll_fileno; 3696 evthread_start IO::AIO::poll_fileno;
3444 3697
3445 cf::sync_job { 3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3446 reload_resources; 3707 reload_resources;
3447 reload_config; 3708 reload_config;
3448 db_init; 3709 db_init;
3449 3710
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid; 3711 cf::init_uuid;
3453 cf::init_signals; 3712 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills; 3713 cf::init_skills;
3456 3714
3457 cf::init_beforeplay; 3715 cf::init_beforeplay;
3458 3716
3459 atomic; 3717 atomic;
3464 3722
3465 # no (long-running) fork's whatsoever before this point(!) 3723 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX (); 3724 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468 3726
3469 (pop @POST_INIT)->(0) while @POST_INIT; 3727 cf::_post_init 0;
3470 }; 3728 };
3471 3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 AE::postpone {
3734 undef &main; # free gobs of memory :)
3735 };
3736
3472 main_loop; 3737 goto &main_loop;
3473} 3738}
3474 3739
3475############################################################################# 3740#############################################################################
3476# initialisation and cleanup 3741# initialisation and cleanup
3477 3742
3478# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3479BEGIN { 3744BEGIN {
3480 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3481 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3482 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3483 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3484 }; 3749 };
3485 } 3750 }
3486} 3751}
3487 3752
3488sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3489 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3490 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3491 3758
3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3493 3760
3494 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3495 3762
3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3497 or return; 3764 or return;
3498 3765
3499 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3500 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3501 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3514 or return; 3781 or return;
3515 3782
3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3517 and return; 3784 and return;
3518 3785
3519 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3520 3787
3521 1 3788 1
3522} 3789}
3523 3790
3524our $uuid_lock; 3791our $uuid_lock;
3536 or return; 3803 or return;
3537 3804
3538 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3539 3806
3540 unless ($value) { 3807 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3542 return; 3809 return;
3543 } 3810 }
3544 3811
3545 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0; 3813 $uuid_skip = 0;
3556 or return; 3823 or return;
3557 3824
3558 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3559 and return; 3826 and return;
3560 3827
3561 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3562 3829
3563 1 3830 1
3564 3831
3565} 3832}
3566 3833
3572} 3839}
3573 3840
3574sub emergency_save() { 3841sub emergency_save() {
3575 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3576 3843
3577 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3578 3850
3579 cf::sync_job { 3851 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584 3853
3585 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3586 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3587 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3588 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3589 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3590 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3591 $pl->valid or next; 3860 $pl->valid or next;
3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3593 $pl->save; 3862 $pl->save;
3594 } 3863 }
3595 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3596 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3597 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3598 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3599 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3600 $map->valid or next; 3871 $map->valid or next;
3601 $map->save; 3872 $map->save;
3602 } 3873 }
3603 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3604 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3605 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3606 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3607 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3608 3881
3609 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1; 3883 write_uuid_sync 1;
3611 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3612 }; 3904 };
3613 3905
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3619 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3620} 3907}
3621 3908
3622sub post_cleanup { 3909sub post_cleanup {
3623 my ($make_core) = @_; 3910 my ($make_core) = @_;
3624 3911
3912 IO::AIO::flush;
3913
3625 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3626 if $make_core; 3915 if $make_core;
3627 3916
3628 my $fh = pidfile; 3917 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3630} 3919}
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 } 3943 }
3655 warn "cleared package $pkg\n";#d#
3656} 3944}
3657 3945
3658sub do_reload_perl() { 3946sub do_reload_perl() {
3659 # can/must only be called in main 3947 # can/must only be called in main
3660 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3661 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3662 return; 3950 return;
3663 } 3951 }
3664 3952
3665 return if $RELOAD++; 3953 return if $RELOAD++;
3666 3954
3667 my $t1 = EV::time; 3955 my $t1 = AE::time;
3668 3956
3669 while ($RELOAD) { 3957 while ($RELOAD) {
3670 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3671 3960
3672 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3673 3962
3674 cf::sync_job { 3963 cf::sync_job {
3675 cf::write_runtime_sync; # external watchdog should not bark
3676 cf::emergency_save; 3964 #cf::emergency_save;
3677 cf::write_runtime_sync; # external watchdog should not bark
3678 3965
3679 warn "syncing database to disk";
3680 BDB::db_env_txn_checkpoint $DB_ENV;
3681
3682 # if anything goes wrong in here, we should simply crash as we already saved
3683
3684 warn "flushing outstanding aio requests";
3685 while (IO::AIO::nreqs || BDB::nreqs) {
3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3687 }
3688
3689 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3690 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3691 %EXT_CORO = (); 3968 %EXT_CORO = ();
3692 3969
3693 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3694 %COMMAND = (); 3971 %COMMAND = ();
3695 3972
3696 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3697 %EXTCMD = (); 3974 %EXTCMD = ();
3698 %EXTICMD = (); 3975 %EXTICMD = ();
3699 3976
3700 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3701 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3702 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3703 3980
3704 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3705 eval { 3982 eval {
3706 $cb->($pkg); 3983 $cb->($pkg);
3707 1 3984 1
3708 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3709 } 3986 }
3710 3987
3711 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3712 clear_package $pkg; 3989 clear_package $pkg;
3713 } 3990 }
3714 3991
3715 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718 3995
3719 warn "... unloading $k"; 3996 trace "... unloading $k";
3720 delete $INC{$k}; 3997 delete $INC{$k};
3721 3998
3722 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3724 4001
3727 } 4004 }
3728 4005
3729 clear_package $k; 4006 clear_package $k;
3730 } 4007 }
3731 4008
3732 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3733 clear_package "safe::$_" 4010 clear_package "safe::$_"
3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3735 4012
3736 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3737 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3739 4016
3740 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3741 # and global variables created in xs 4018 # and global variables created in xs
3742 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3743 4020
3744 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3745 4022
3746 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3747 require cf; 4024 require cf;
3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3749 4026
3750 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3751 cf::reload_config; 4028 cf::reload_config;
3752 4029
3753 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3754 cf::load_extensions; 4031 cf::load_extensions;
3755 4032
3756 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3757 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3758 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3759 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3760 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3761 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3762 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3763 } 4040 }
3764 4041
3765 warn "running post_init jobs"; 4042 cf::_post_init 1;
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767 4043
3768 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3769 4045
3770 1 4046 1
3771 } or do { 4047 } or do {
3772 warn $@; 4048 error $@;
3773 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3774 }; 4050 };
3775 4051
3776 warn "reloaded";
3777 --$RELOAD; 4052 --$RELOAD;
3778 } 4053 }
3779 4054
3780 $t1 = EV::time - $t1; 4055 $t1 = AE::time - $t1;
3781 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3782}; 4057};
3783 4058
3784our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3785 4060
3786sub reload_perl() { 4061sub reload_perl() {
3788 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3789 4064
3790 $RELOAD_WATCHER ||= cf::async { 4065 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions; 4066 Coro::AIO::aio_wait cache_extensions;
3792 4067
3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3794 do_reload_perl; 4069 do_reload_perl;
3795 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3796 }; 4071 };
3797 }; 4072 };
3798} 4073}
3807 reload_perl; 4082 reload_perl;
3808 }; 4083 };
3809 } 4084 }
3810}; 4085};
3811 4086
3812unshift @INC, $LIBDIR; 4087#############################################################################
3813 4088
3814my $bug_warning = 0; 4089my $bug_warning = 0;
3815 4090
3816our @WAIT_FOR_TICK;
3817our @WAIT_FOR_TICK_BEGIN;
3818
3819sub wait_for_tick { 4091sub wait_for_tick() {
3820 return if tick_inhibit || $Coro::current == $Coro::main; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3821 4093
3822 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
3823 push @WAIT_FOR_TICK, $signal;
3824 $signal->wait;
3825} 4095}
3826 4096
3827sub wait_for_tick_begin { 4097sub wait_for_tick_begin() {
3828 return if tick_inhibit || $Coro::current == $Coro::main; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3829 4099
3830 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
3831 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
3832 $signal->wait; 4102 $signal->wait;
3833} 4103}
3837 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4107 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3838 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
3839 return; 4109 return;
3840 } 4110 }
3841 4111
3842 cf::server_tick; # one server iteration 4112 cf::one_tick; # one server iteration
4113
4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3843 4115
3844 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3846 Coro::async_pool { 4118 Coro::async_pool {
3847 $Coro::current->{desc} = "runtime saver"; 4119 $Coro::current->{desc} = "runtime saver";
3848 write_runtime_sync 4120 write_runtime_sync
3849 or warn "ERROR: unable to write runtime file: $!"; 4121 or error "ERROR: unable to write runtime file: $!";
3850 }; 4122 };
3851 } 4123 }
3852 4124
3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3854 $sig->send; 4126 $sig->send;
3855 } 4127 }
3856 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
3857 $sig->send;
3858 }
3859 4129
3860 $LOAD = ($NOW - $TICK_START) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
3861 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3862 4132
3863 if (0) { 4133 if (0) {
3864 if ($NEXT_TICK) { 4134 if ($NEXT_TICK) {
3865 my $jitter = $TICK_START - $NEXT_TICK; 4135 my $jitter = $TICK_START - $NEXT_TICK;
3866 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4136 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3867 warn "jitter $JITTER\n";#d# 4137 debug "jitter $JITTER\n";#d#
3868 } 4138 }
3869 } 4139 }
3870} 4140}
3871 4141
3872{ 4142{
3873 # configure BDB 4143 # configure BDB
3874 4144
3875 BDB::min_parallel 8; 4145 BDB::min_parallel 16;
3876 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
3877 $AnyEvent::BDB::WATCHER->priority (1); 4147 #$AnyEvent::BDB::WATCHER->priority (1);
3878 4148
3879 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
3880 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4152 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3917 IO::AIO::min_parallel 8; 4187 IO::AIO::min_parallel 8;
3918 IO::AIO::max_poll_time $TICK * 0.1; 4188 IO::AIO::max_poll_time $TICK * 0.1;
3919 undef $AnyEvent::AIO::WATCHER; 4189 undef $AnyEvent::AIO::WATCHER;
3920} 4190}
3921 4191
3922my $_log_backtrace; 4192our $_log_backtrace;
4193our $_log_backtrace_last;
3923 4194
3924sub _log_backtrace { 4195sub _log_backtrace {
3925 my ($msg, @addr) = @_; 4196 my ($msg, @addr) = @_;
3926 4197
3927 $msg =~ s/\n//; 4198 $msg =~ s/\n$//;
3928 4199
4200 if ($_log_backtrace_last eq $msg) {
4201 LOG llevInfo, "[ABT] $msg\n";
4202 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3929 # limit the # of concurrent backtraces 4203 # limit the # of concurrent backtraces
3930 if ($_log_backtrace < 2) { 4204 } elsif ($_log_backtrace < 2) {
4205 $_log_backtrace_last = $msg;
3931 ++$_log_backtrace; 4206 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg; 4207 my $perl_bt = Carp::longmess $msg;
3933 async { 4208 async {
3934 $Coro::current->{desc} = "abt $msg"; 4209 $Coro::current->{desc} = "abt $msg";
3935 4210
3955 LOG llevInfo, "[ABT] $_\n" for @bt; 4230 LOG llevInfo, "[ABT] $_\n" for @bt;
3956 --$_log_backtrace; 4231 --$_log_backtrace;
3957 }; 4232 };
3958 } else { 4233 } else {
3959 LOG llevInfo, "[ABT] $msg\n"; 4234 LOG llevInfo, "[ABT] $msg\n";
3960 LOG llevInfo, "[ABT] [suppressed]\n"; 4235 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3961 } 4236 }
3962} 4237}
3963 4238
3964# load additional modules 4239# load additional modules
3965require "cf/$_.pm" for @EXTRA_MODULES; 4240require "cf/$_.pm" for @EXTRA_MODULES;
4241cf::_connect_to_perl_2;
3966 4242
3967END { cf::emergency_save } 4243END { cf::emergency_save }
3968 4244
39691 42451
3970 4246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines