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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines