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.459 by root, Sat Dec 13 21:46:12 2008 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 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 "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
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %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;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
117our %CFG; 133our %CFG;
118 134
119our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 136our $RUNTIME;
121our $NOW; 137our $NOW;
132our $JITTER; # average jitter 148our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
134 150
135our @POST_INIT; 151our @POST_INIT;
136 152
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
138 155
139binmode STDOUT; 156binmode STDOUT;
140binmode STDERR; 157binmode STDERR;
141 158
142# read virtual server time, if available 159# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
147} 164}
148 165
166eval "sub TICK() { $TICK } 1" or die;
167
149mkdir $_ 168mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 170
152our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
153 172
154sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 189
156############################################################################# 190#############################################################################
157 191
158=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
159 193
201from wherever your confdir points to. 235from wherever your confdir points to.
202 236
203=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
204 238
205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
209=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
210 249
211This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 252that call.
214 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
215=back 260=back
216 261
217=cut 262=cut
218 263
219BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 271 my $msg = join "", @_;
222 272
223 $msg .= "\n" 273 $msg .= "\n"
224 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
225 275
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 277
228 LOG llevError, $msg; 278 LOG llevWarn, $msg;
229 }; 279};
230}
231 280
232$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
234 283
235 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 288 return;#d#
238 }#d# 289 }#d#
239 290
240 # kill coroutine otherwise 291 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 292 Coro::terminate
243}; 293};
244
245$SIG{__DIE__} = sub { }; #d#?
246 294
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 312)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 314}
267 315
268$EV::DIED = sub { 316$EV::DIED = sub {
269 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
270}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
271 324
272############################################################################# 325#############################################################################
273 326
274=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
275 328
296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
297 $d 350 $d
298 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
299} 352}
300 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
301=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
302 369
303Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
304 371
305=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312 379
313sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
315 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
316=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
317 415
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
320 418
321The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 420is a reload or not.
323 421
324=cut 422=cut
325 423
326sub post_init(&) { 424sub post_init(&) {
327 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
328} 443}
329 444
330=item cf::lock_wait $string 445=item cf::lock_wait $string
331 446
332Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
371} 486}
372 487
373=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
374 489
375Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 491get spread over time.
377 492
378=cut 493=cut
379 494
380sub periodic($$) { 495sub periodic($$) {
381 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
386} 501}
387 502
388=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
389 504
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
391This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
392of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
393 512
394The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
396 515
397Useful for short background jobs. 516Useful for short background jobs.
398 517
399=cut 518=cut
400 519
401our @SLOT_QUEUE; 520our @SLOT_QUEUE;
402our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
403 523
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
407 527
408 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
409 530
410 while () { 531 while () {
411 next_job: 532 next_job:
533
412 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 535
414 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 540 $job->[2]->send;
418 Coro::cede; 541 Coro::cede;
419 goto next_job; 542 goto next_job;
420 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 545 }
422 } 546 }
423 547
424 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 551 $signal->wait;
428 } else { 552 } else {
553 $busy = 0;
429 Coro::schedule; 554 Coro::schedule;
430 } 555 }
431 } 556 }
432}; 557};
433 558
434sub get_slot($;$$) { 559sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
436 561
437 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
438 563
439 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
440 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
441 567
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
470=cut 596=cut
471 597
472sub sync_job(&) { 598sub sync_job(&) {
473 my ($job) = @_; 599 my ($job) = @_;
474 600
475 if ($Coro::current == $Coro::main) { 601 if (in_main) {
476 my $time = EV::time; 602 my $time = AE::time;
477 603
478 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
480 606
481 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
482 608
483 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
484 610
485 my $busy = 1; 611 my $busy = 1;
486 my @res; 612 my @res;
487 613
488 (async { 614 (async {
489 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 616 @res = eval { $job->() };
491 warn $@ if $@; 617 error $@ if $@;
492 undef $busy; 618 undef $busy;
493 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
494 620
495 while ($busy) { 621 while ($busy) {
496 if (Coro::nready) { 622 if (Coro::nready) {
498 } else { 624 } else {
499 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
500 } 626 }
501 } 627 }
502 628
503 my $time = EV::time - $time; 629 my $time = AE::time - $time;
504 630
505 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
506 632
507 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
508 } else { 634 } else {
530 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
531 657
532 $coro 658 $coro
533} 659}
534 660
535=item fork_call { }, $args 661=item fork_call { }, @args
536 662
537Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 666never block itself or use any form of event handling.
541 667
542=cut 668=cut
543 669
670sub post_fork {
671 reset_signals;
672}
673
544sub fork_call(&@) { 674sub fork_call(&@) {
545 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
546 676
547 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
550 680
551 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
552 reset_signals; 682 cf::post_fork;
553 &$cb 683 &$cb
554 }, @args; 684 } @args;
555 685
556 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
557} 698}
558 699
559=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
560 701
561=cut 702=cut
598within each server. 739within each server.
599 740
600=cut 741=cut
601 742
602sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
603 my ($name) = @_; 747 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
605 749
606 eval { 750 eval {
607 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
617} 761}
618 762
619our $DB; 763our $DB;
620 764
621sub db_init { 765sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
624 };
625} 767}
626 768
627sub db_get($$) { 769sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
629 771
630 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
631 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
632 776
633 $! ? () 777 $! ? ()
634 : $data 778 : $data
635 }
636} 779}
637 780
638sub db_put($$$) { 781sub db_put($$$) {
639 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 811
669 my @data; 812 my @data;
670 my $md5; 813 my $md5;
671 814
672 for (0 .. $#$src) { 815 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 817 }
676 818
677 # if processing is expensive, check 819 # if processing is expensive, check
678 # checksum first 820 # checksum first
679 if (1) { 821 if (1) {
696 838
697 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 840 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
700 842
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 844
703 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
706 848
716 858
717=cut 859=cut
718 860
719sub datalog($@) { 861sub datalog($@) {
720 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 864}
723 865
724=back 866=back
725 867
726=cut 868=cut
921 1063
922 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1066
925 } elsif (ref $type) { 1067 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
927 1069
928 } else { 1070 } else {
929 shift @arg; 1071 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
931 } 1073 }
932 } 1074 }
933} 1075}
934 1076
935sub _object_attach { 1077sub _object_attach {
945 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
946 } 1088 }
947 1089
948 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
949 } else { 1091 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1093 }
952 1094
953 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
954} 1096}
955 1097
1014 1156
1015 for (@$callbacks) { 1157 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1017 1159
1018 if ($@) { 1160 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1162 override;
1022 } 1163 }
1023 1164
1024 return 1 if $override; 1165 return 1 if $override;
1025 } 1166 }
1104 for (@$attach) { 1245 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1107 } 1248 }
1108 } else { 1249 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1251 }
1111 } 1252 }
1112} 1253}
1113 1254
1114cf::attachable->attach ( 1255cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1142 1283
1143 sync_job { 1284 sync_job {
1144 if (length $$rdata) { 1285 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1148 1290
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1296 aio_fsync $fh;
1297 }
1153 aio_close $fh; 1298 aio_close $fh;
1154 1299
1155 if (@$objs) { 1300 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1307 aio_fsync $fh;
1308 }
1161 aio_close $fh; 1309 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1311 }
1164 } else { 1312 } else {
1165 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1169 1317
1170 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1320 } else {
1173 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1174 } 1322 }
1175 } else { 1323 } else {
1176 aio_unlink $filename; 1324 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1178 } 1326 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1351 $av = $st->{objs};
1204 } 1352 }
1205 1353
1206 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1209 1358
1210 ($data, $av) 1359 ($data, $av)
1211} 1360}
1212 1361
1213=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1272} 1421}
1273 1422
1274use File::Glob (); 1423use File::Glob ();
1275 1424
1276cf::player->attach ( 1425cf::player->attach (
1277 on_command => sub { 1426 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1279 1428
1280 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1281 or return; 1430 or return;
1282 1431
1305 1454
1306 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1456 if $reply;
1308 1457
1309 } else { 1458 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1460 }
1312 1461
1313 cf::override; 1462 cf::override;
1314 }, 1463 },
1315); 1464);
1316 1465
1317# "readahead" all extensions 1466# "readahead" all extensions
1318sub cache_extensions { 1467sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1468 my $grp = IO::AIO::aio_group;
1320 1469
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1471 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1473 }
1325 }; 1474 };
1326 1475
1327 $grp 1476 $grp
1328} 1477}
1329 1478
1330sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1331 cf::sync_job { 1482 cf::sync_job {
1332 my %todo; 1483 my %todo;
1333 1484
1334 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1486 next unless -r $path;
1353 1504
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1507
1357 $ext{source} = 1508 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1360 . $source 1511 . $source
1361 . "\n};\n1"; 1512 . "\n};\n1";
1362 1513
1363 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1364 } 1515 }
1365 1516
1517 my $pass = 0;
1366 my %done; 1518 my %done;
1367 while (%todo) { 1519 while (%todo) {
1368 my $progress; 1520 my $progress;
1369 1521
1522 ++$pass;
1523
1524 ext:
1370 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1527 next ext
1373 unless exists $done{$_}; 1528 unless exists $done{$_};
1374 } 1529 }
1375 1530
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1532
1378 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1537
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1539 if exists $v->{meta}{mandatory};
1386 1540
1387 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1388 } 1550 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1551 }
1394 1552
1395 skip: 1553 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1398 } 1563 }
1399 }; 1564 };
1400} 1565}
1401 1566
1402############################################################################# 1567#############################################################################
1486 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1487 } 1652 }
1488 } 1653 }
1489} 1654}
1490 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1491sub save($) { 1669sub save($) {
1492 my ($pl) = @_; 1670 my ($pl) = @_;
1493 1671
1494 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1495 1673
1500 1678
1501 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1503 1681
1504 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1686
1506 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1688 cf::cede_to_tick;
1508} 1689}
1509 1690
1543 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1544 1725
1545 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1728
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1730 $pl->deactivate;
1731
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1553 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1554 1737
1555 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1611 \@logins 1794 \@logins
1612} 1795}
1613 1796
1614=item $player->maps 1797=item $player->maps
1615 1798
1799=item cf::player::maps $login
1800
1616Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1617player. May block. 1802player. May block.
1618 1803
1619=cut 1804=cut
1620 1805
1682=cut 1867=cut
1683 1868
1684sub find_by_path($) { 1869sub find_by_path($) {
1685 my ($path) = @_; 1870 my ($path) = @_;
1686 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1687 my ($match, $specificity); 1874 my ($match, $specificity);
1688 1875
1689 for my $region (list) { 1876 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1906sub generate_random_map {
1720 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1721 1908
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1910
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 1912}
1739 1913
1740=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1741 1915
1742Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1747 1921
1748sub register { 1922sub register {
1749 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1924 my $pkg = caller;
1751 1925
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1927
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1929}
1757 1930
1758# also paths starting with '/' 1931# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1933
1761sub thawer_merge { 1934sub thawer_merge {
1762 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1763 1936
1764 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1769} 1942}
1770 1943
1771sub normalise { 1944sub normalise {
1772 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1773 1946
1774 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1775 1948
1776 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1777 1950
1778 # map plan: 1951 # map plan:
1779 # 1952 #
1794 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 1968 $path = "$base/$path";
1796 } 1969 }
1797 1970
1798 for ($path) { 1971 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1802 } 1974 }
1803 1975
1804 $path 1976 $path
1818 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1819 return $self; 1991 return $self;
1820 } 1992 }
1821 } 1993 }
1822 1994
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1996 ()
1825} 1997}
1826 1998
1999# may re-bless or do other evil things
1827sub init { 2000sub init {
1828 my ($self) = @_; 2001 my ($self) = @_;
1829 2002
1830 $self 2003 $self
1831} 2004}
1862 2035
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1865} 2038}
1866 2039
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 2040sub decay_objects {
1877 my ($self) = @_; 2041 my ($self) = @_;
1878 2042
1879 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1880 2044
1905 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1906 2070
1907 1 2071 1
1908} 2072}
1909 2073
2074# used to laod the header of an original map
1910sub load_header_orig { 2075sub load_header_orig {
1911 my ($self) = @_; 2076 my ($self) = @_;
1912 2077
1913 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1914} 2079}
1915 2080
2081# used to laod the header of an instantiated map
1916sub load_header_temp { 2082sub load_header_temp {
1917 my ($self) = @_; 2083 my ($self) = @_;
1918 2084
1919 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1920} 2086}
1921 2087
2088# called after loading the header from an instantiated map
1922sub prepare_temp { 2089sub prepare_temp {
1923 my ($self) = @_; 2090 my ($self) = @_;
1924 2091
1925 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1926 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1927 # safety 2094 # safety
1928 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1929 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1930} 2097}
1931 2098
2099# called after loading the header from an original map
1932sub prepare_orig { 2100sub prepare_orig {
1933 my ($self) = @_; 2101 my ($self) = @_;
1934 2102
1935 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1936 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1960 2128
1961sub find; 2129sub find;
1962sub find { 2130sub find {
1963 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1964 2132
2133 cf::cede_to_tick;
2134
1965 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1966 2136
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1969 2139
1970 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1987 2157
1988 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1989 } 2159 }
1990} 2160}
1991 2161
1992sub pre_load { } 2162sub pre_load { }
1993sub post_load { } 2163#sub post_load { } # XS
1994 2164
1995sub load { 2165sub load {
1996 my ($self) = @_; 2166 my ($self) = @_;
1997 2167
1998 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2003 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2004 2174
2005 return unless $self->valid; 2175 return unless $self->valid;
2006 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
2007 2177
2008 $self->in_memory (cf::MAP_LOADING);
2009
2010 $self->alloc; 2178 $self->alloc;
2011 2179
2012 $self->pre_load; 2180 $self->pre_load;
2013 cf::cede_to_tick; 2181 cf::cede_to_tick;
2014 2182
2183 if (exists $self->{load_path}) {
2015 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2016 $f->skip_block; 2185 $f->skip_block;
2017 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2018 or return; 2187 or return;
2019 2188
2020 $self->post_load_original 2189 $self->post_load_original
2021 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2022 2191
2023 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2024 utf8::encode $uniq; 2193 utf8::encode $uniq;
2025 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2026 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2027 $self->clear_unique_items; 2196 $self->clear_unique_items;
2028 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2029 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2030 } 2200 }
2031 } 2201 }
2032 }
2033 2202
2034 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->in_memory (cf::MAP_INACTIVE);
2035 2210
2036 cf::cede_to_tick; 2211 cf::cede_to_tick;
2037 # now do the right thing for maps 2212 # now do the right thing for maps
2038 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2039 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2043 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2219 $self->decay_objects;
2045 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2046 $self->update_buttons; 2221 $self->update_buttons;
2047 cf::cede_to_tick; 2222 cf::cede_to_tick;
2048 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2049 cf::cede_to_tick;
2050 $self->activate;
2051 } 2224 }
2052 2225
2053 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2055
2056 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2228 }
2058 2229
2059 $self->post_load; 2230 $self->post_load;
2060}
2061 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
2062sub customise_for { 2238sub customise_for {
2063 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
2064 2240
2065 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2242 if $self->per_player;
2082 or next; 2258 or next;
2083 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2084 or next; 2260 or next;
2085 $neigh->load; 2261 $neigh->load;
2086 2262
2263 # now find the diagonal neighbours
2087 push @neigh, 2264 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2267 }
2091 2268
2098} 2275}
2099 2276
2100sub find_sync { 2277sub find_sync {
2101 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2102 2279
2103 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2104} 2285}
2105 2286
2106sub do_load_sync { 2287sub do_load_sync {
2107 my ($map) = @_; 2288 my ($map) = @_;
2108 2289
2290 # it's a bug to call this from the main context
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2111 2293
2112 cf::sync_job { $map->load }; 2294 $map->load;
2113} 2295}
2114 2296
2115our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2117 2299
2118sub find_async { 2300sub find_async {
2119 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2120 2302
2121 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2122 2304
2123 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2125 } 2307 }
2126 2308
2127 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2128 2310
2129 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2143 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2144 2326
2145 () 2327 ()
2146} 2328}
2147 2329
2330# common code, used by both ->save and ->swapout
2148sub save { 2331sub _save {
2149 my ($self) = @_; 2332 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2333
2153 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2154 2335
2155 return unless $self->dirty; 2336 return unless $self->dirty;
2156 2337
2176 } else { 2357 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2359 }
2179} 2360}
2180 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2181sub swap_out { 2370sub swap_out {
2182 my ($self) = @_; 2371 my ($self) = @_;
2183 2372
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2189 return if $self->players; 2377 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save};
2192 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2194 2429
2195 $self->deactivate; 2430 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2432 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2433
2243 $self->unlink_save; 2434 $self->unlink_save;
2244 $self->destroy; 2435 $self->destroy;
2245} 2436}
2246 2437
2254 2445
2255 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2256 2447
2257 $self->unlink_save; 2448 $self->unlink_save;
2258 2449
2259 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2455
2321 : normalise $_ 2512 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2514 ]
2324} 2515}
2325 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2326=back 2549=back
2327 2550
2328=head3 cf::object 2551=head3 cf::object
2329 2552
2330=cut 2553=cut
2395 2618
2396our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2397 id => "say", 2620 id => "say",
2398 title => "Map", 2621 title => "Map",
2399 reply => "say ", 2622 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2624};
2402 2625
2403our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2404 id => "chat", 2627 id => "chat",
2405 title => "Chat", 2628 title => "Chat",
2462 2685
2463Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2464 2687
2465The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2468map. 2691map.
2469 2692
2470Will never block. 2693Will never block.
2471 2694
2472=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2494 my ($self) = @_; 2717 my ($self) = @_;
2495 2718
2496 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2497 2720
2721 ++$self->{_link_recursion};
2722
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2724
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2502 2727
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2729}
2505 2730
2506sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2508 2733
2525 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2527 2752
2528 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2531 2756
2532 $map->load; 2757 $map->load;
2533 $map->load_neighbours; 2758 $map->load_neighbours;
2534 2759
2535 return unless $self->contr->active; 2760 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2761
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2541} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2542 2769
2770}
2771
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2773
2545Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2555 2784
2556our $GOTOGEN; 2785our $GOTOGEN;
2557 2786
2558sub cf::object::player::goto { 2787sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2560 2795
2561 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2798
2564 $self->enter_link; 2799 $self->enter_link;
2584 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2585 } 2820 }
2586 } 2821 }
2587 2822
2588 my $map = eval { 2823 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2590 2825
2591 if ($map) { 2826 if ($map) {
2592 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2829 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2831 }
2597 2832
2598 $map 2833 $map
2606 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2609 } 2844 }
2610 2845
2611 $done->() if $done; 2846 $done->($self) if $done;
2612 })->prio (1); 2847 })->prio (1);
2613} 2848}
2614 2849
2615=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2616 2851
2684 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2685 2920
2686 unless (eval { 2921 unless (eval {
2687 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2688 2923
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2698 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2700 2950
2701 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2702 2952
2703 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
2709 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2713 2963
2714 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 2965 $self->leave_link;
2716 } 2966 }
2717 })->prio (1); 2967 })->prio (1);
2718} 2968}
2719 2969
2731sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2733 2983
2734 utf8::encode $text; 2984 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
2736} 3011}
2737 3012
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 3014
2740Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2744 3019
2745=cut 3020=cut
2746 3021
2747# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2749 "c/identify" => { 3030 "c/identify" => {
2750 id => "infobox", 3031 id => "infobox",
2751 title => "Identify", 3032 title => "Identify",
2752 reply => undef, 3033 reply => undef,
2753 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2755 "c/examine" => { 3036 "c/examine" => {
2756 id => "infobox", 3037 id => "infobox",
2757 title => "Examine", 3038 title => "Examine",
2758 reply => undef, 3039 reply => undef,
2759 tooltip => "Signs and other items you examined", 3040 tooltip => "Signs and other items you examined",
3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 3047 },
2761 "c/book" => { 3048 "c/book" => {
2762 id => "infobox", 3049 id => "infobox",
2763 title => "Book", 3050 title => "Book",
2764 reply => undef, 3051 reply => undef,
2780 id => "infobox", 3067 id => "infobox",
2781 title => "Body Parts", 3068 title => "Body Parts",
2782 reply => undef, 3069 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3070 tooltip => "Shows which body parts you posess and are available",
2784 }, 3071 },
3072 "c/statistics" => {
3073 id => "infobox",
3074 title => "Statistics",
3075 reply => undef,
3076 tooltip => "Shows your primary statistics",
3077 },
2785 "c/skills" => { 3078 "c/skills" => {
2786 id => "infobox", 3079 id => "infobox",
2787 title => "Skills", 3080 title => "Skills",
2788 reply => undef, 3081 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3082 tooltip => "Shows your experience per skill and item power",
3083 },
3084 "c/shopitems" => {
3085 id => "infobox",
3086 title => "Shop Items",
3087 reply => undef,
3088 tooltip => "Shows the items currently for sale in this shop",
3089 },
3090 "c/resistances" => {
3091 id => "infobox",
3092 title => "Resistances",
3093 reply => undef,
3094 tooltip => "Shows your resistances",
3095 },
3096 "c/pets" => {
3097 id => "infobox",
3098 title => "Pets",
3099 reply => undef,
3100 tooltip => "Shows information abotu your pets/a specific pet",
3101 },
3102 "c/perceiveself" => {
3103 id => "infobox",
3104 title => "Perceive Self",
3105 reply => undef,
3106 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3107 },
2791 "c/uptime" => { 3108 "c/uptime" => {
2792 id => "infobox", 3109 id => "infobox",
2793 title => "Uptime", 3110 title => "Uptime",
2794 reply => undef, 3111 reply => undef,
2804 id => "party", 3121 id => "party",
2805 title => "Party", 3122 title => "Party",
2806 reply => "gsay ", 3123 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3124 tooltip => "Messages and chat related to your party",
2808 }, 3125 },
3126 "c/death" => {
3127 id => "death",
3128 title => "Death",
3129 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death",
3131 },
3132 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL,
2809); 3134);
2810 3135
2811sub cf::client::send_msg { 3136sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3138
2818 3143
2819 # check predefined channels, for the benefit of C 3144 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3145 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3146 $channel = $CHANNEL{$channel};
2822 3147
2823 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2827 3150
2828 } elsif (ref $channel) { 3151 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3155 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3156 }
2835 3157
2836 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2837 } 3159 }
2838 3160
2839 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2840 3162
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3163 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3165 if $color & cf::NDI_DEF;
2845 3166
2846 my $pkt = "msg " 3167 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3168 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3170 );
2850 3171
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3172 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3173}
2888 3174
2889=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2890 3176
2891Sends an ext event to the client. 3177Sends an ext event to the client.
2894 3180
2895sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2897 3183
2898 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3189 }
2904} 3190}
2905 3191
2906=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2907 3193
2911 3197
2912sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2914 3200
2915 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3204 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3207 }
2922} 3208}
2923 3209
2924=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2925 3211
2996 3282
2997 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
2998 if $reply; 3284 if $reply;
2999 3285
3000 } else { 3286 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3288 }
3003 3289
3004 cf::override; 3290 cf::override;
3005 }, 3291 },
3006); 3292);
3026 3312
3027 $coro 3313 $coro
3028} 3314}
3029 3315
3030cf::client->attach ( 3316cf::client->attach (
3031 on_destroy => sub { 3317 on_client_destroy => sub {
3032 my ($ns) = @_; 3318 my ($ns) = @_;
3033 3319
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3321 },
3036); 3322);
3052our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3053 3339
3054$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3055 3341
3056$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3059 sort time 3345 sort time
3060)); 3346));
3061 3347
3062# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
3067 3353
3068 cf::object 3354 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3355 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3356 insert remove name archname title slaying race decrease split
3357 value
3071 3358
3072 cf::object::player 3359 cf::object::player
3073 player 3360 player
3074 3361
3075 cf::player 3362 cf::player
3081=cut 3368=cut
3082 3369
3083for ( 3370for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3372 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3090) { 3377) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3380 for @funs;
3095} 3381}
3096 3382
3111 3397
3112 my $qcode = $code; 3398 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3115 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
3116 local $_; 3405 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3406
3119 my $eval = 3407 my $eval =
3120 "do {\n" 3408 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3411 . $code
3124 . "\n}" 3412 . "\n}"
3125 ; 3413 ;
3126 3414
3415 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
3130 3424
3131 if ($@) { 3425 if ($@) {
3132 warn "$@"; 3426 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3135 } 3429 }
3136 3430
3137 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3138} 3432}
3139 3433
3153=cut 3447=cut
3154 3448
3155sub register_script_function { 3449sub register_script_function {
3156 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3157 3451
3158 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3160} 3454}
3161 3455
3162=back 3456=back
3163 3457
3164=cut 3458=cut
3173 # for this (global event?) 3467 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3175 3469
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3471
3178 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3179 3473
3180 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3181 0 < aio_load $path, $facedata
3182 or die "$path: $!";
3183
3184 $facedata = Coro::Storable::thaw $facedata;
3185 3475
3186 $facedata->{version} == 2 3476 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3478
3189 # patch in the exptable 3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3482 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3485 };
3194 cf::cede_to_tick; 3486 cf::cede_to_tick;
3195 3487
3196 { 3488 {
3197 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3199 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3493
3202 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3206 3499
3207 cf::cede_to_tick; 3500 cf::cede_to_tick;
3208 } 3501 }
3209 3502
3210 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3215 3508
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3512 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3514 }
3222 3515
3223 cf::cede_to_tick; 3516 cf::cede_to_tick;
3224 } 3517 }
3225 } 3518 }
3234 3527
3235 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3236 } 3529 }
3237 3530
3238 { 3531 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3242 3533
3243 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3537
3248 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3263 } else { 3540 } else {
3264 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3265 } 3542 }
3266 3543
3267 cf::cede_to_tick; 3544 cf::cede_to_tick;
3268 } 3545 }
3269 } 3546 }
3270 3547
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3549
3273 1 3550 1
3274} 3551}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3552
3296register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3298 3555
3299 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3338sub reload_treasures { 3595sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3341} 3598}
3342 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3343sub reload_resources { 3620sub reload_resources {
3344 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3345 3622
3623 reload_exp_table;
3624 reload_materials;
3346 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3347 reload_archetypes; 3627 reload_archetypes;
3348 reload_regions; 3628 reload_regions;
3349 reload_treasures; 3629 reload_treasures;
3350 3630
3351 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3352} 3632}
3353 3633
3354sub reload_config { 3634sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3356 or return;
3357 3636
3358 local $/; 3637 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3360 3640
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3642
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3645
3366 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3389 3669
3390 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3391 print $fh $$; 3671 print $fh $$;
3392} 3672}
3393 3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
3394sub main { 3683sub main {
3395 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3396 3685
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407 3690
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3692
3410 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3417 }; 3700 };
3418 3701
3419 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3420 3703
3421 cf::sync_job { 3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3422 reload_resources; 3713 reload_resources;
3423 reload_config; 3714 reload_config;
3424 db_init; 3715 db_init;
3425 3716
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3717 cf::init_uuid;
3429 cf::init_signals; 3718 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3719 cf::init_skills;
3432 3720
3433 cf::init_beforeplay; 3721 cf::init_beforeplay;
3434 3722
3435 atomic; 3723 atomic;
3437 load_extensions; 3725 load_extensions;
3438 3726
3439 utime time, time, $RUNTIMEFILE; 3727 utime time, time, $RUNTIMEFILE;
3440 3728
3441 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3732
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3445 }; 3734 };
3446 3735
3447 EV::loop; 3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
3448} 3745}
3449 3746
3450############################################################################# 3747#############################################################################
3451# initialisation and cleanup 3748# initialisation and cleanup
3452 3749
3453# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3454BEGIN { 3751BEGIN {
3455 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3459 }; 3756 };
3460 } 3757 }
3461} 3758}
3462 3759
3463sub write_runtime_sync { 3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3464 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3466 3765
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3767
3469 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3470 3769
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3771 or return;
3473 3772
3474 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3489 or return; 3788 or return;
3490 3789
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3791 and return;
3493 3792
3494 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3794
3496 1 3795 1
3497} 3796}
3498 3797
3499our $uuid_lock; 3798our $uuid_lock;
3511 or return; 3810 or return;
3512 3811
3513 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3514 3813
3515 unless ($value) { 3814 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3517 return; 3816 return;
3518 } 3817 }
3519 3818
3520 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3820 $uuid_skip = 0;
3531 or return; 3830 or return;
3532 3831
3533 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3534 and return; 3833 and return;
3535 3834
3536 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3537 3836
3538 1 3837 1
3539 3838
3540} 3839}
3541 3840
3547} 3846}
3548 3847
3549sub emergency_save() { 3848sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3551 3850
3552 warn "emergency_perl_save: enter\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3553 3857
3554 cf::sync_job { 3858 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 3860
3560 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 3867 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 3869 $pl->save;
3569 } 3870 }
3570 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3571 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3572 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 3878 $map->valid or next;
3576 $map->save; 3879 $map->save;
3577 } 3880 }
3578 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3579 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3580 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3583 3888
3584 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 3890 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 3911 };
3588 3912
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3595} 3914}
3596 3915
3597sub post_cleanup { 3916sub post_cleanup {
3598 my ($make_core) = @_; 3917 my ($make_core) = @_;
3599 3918
3919 IO::AIO::flush;
3920
3600 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 3922 if $make_core;
3602 3923
3603 my $fh = pidfile; 3924 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3605} 3926}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 3950 }
3630 warn "cleared package $pkg\n";#d#
3631} 3951}
3632 3952
3633sub do_reload_perl() { 3953sub do_reload_perl() {
3634 # can/must only be called in main 3954 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3636 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3637 return; 3957 return;
3638 } 3958 }
3639 3959
3640 return if $RELOAD++; 3960 return if $RELOAD++;
3641 3961
3642 my $t1 = EV::time; 3962 my $t1 = AE::time;
3643 3963
3644 while ($RELOAD) { 3964 while ($RELOAD) {
3645 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3646 3967
3647 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3648 3969
3649 cf::sync_job { 3970 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 3971 #cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 3972
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 3975 %EXT_CORO = ();
3667 3976
3668 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3669 %COMMAND = (); 3978 %COMMAND = ();
3670 3979
3671 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3672 %EXTCMD = (); 3981 %EXTCMD = ();
3673 %EXTICMD = (); 3982 %EXTICMD = ();
3674 3983
3675 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3678 3987
3679 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3680 eval { 3989 eval {
3681 $cb->($pkg); 3990 $cb->($pkg);
3682 1 3991 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3684 } 3993 }
3685 3994
3686 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3687 clear_package $pkg; 3996 clear_package $pkg;
3688 } 3997 }
3689 3998
3690 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 4002
3694 warn "... unloading $k"; 4003 trace "... unloading $k";
3695 delete $INC{$k}; 4004 delete $INC{$k};
3696 4005
3697 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3699 4008
3702 } 4011 }
3703 4012
3704 clear_package $k; 4013 clear_package $k;
3705 } 4014 }
3706 4015
3707 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 4017 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 4019
3711 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 4023
3715 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3716 # and global variables created in xs 4025 # and global variables created in xs
3717 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3718 4027
3719 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3720 4029
3721 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3722 require cf; 4031 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3724 4033
3725 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3726 cf::reload_config; 4035 cf::reload_config;
3727 4036
3728 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3729 cf::load_extensions; 4038 cf::load_extensions;
3730 4039
3731 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3735 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3738 } 4047 }
3739 4048
3740 warn "running post_init jobs"; 4049 cf::_post_init 1;
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4050
3743 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3744 4052
3745 1 4053 1
3746 } or do { 4054 } or do {
3747 warn $@; 4055 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3749 }; 4057 };
3750 4058
3751 warn "reloaded";
3752 --$RELOAD; 4059 --$RELOAD;
3753 } 4060 }
3754 4061
3755 $t1 = EV::time - $t1; 4062 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3757}; 4064};
3758 4065
3759our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3760 4067
3761sub reload_perl() { 4068sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3764 4071
3765 $RELOAD_WATCHER ||= cf::async { 4072 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4073 Coro::AIO::aio_wait cache_extensions;
3767 4074
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4076 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3771 }; 4078 };
3772 }; 4079 };
3773} 4080}
3782 reload_perl; 4089 reload_perl;
3783 }; 4090 };
3784 } 4091 }
3785}; 4092};
3786 4093
3787unshift @INC, $LIBDIR; 4094#############################################################################
3788 4095
3789my $bug_warning = 0; 4096my $bug_warning = 0;
3790 4097
3791our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3793 4100
3794sub wait_for_tick { 4101sub wait_for_tick() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4103
3797 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait; 4106 $signal->wait;
3800} 4107}
3801 4108
3802sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3804 4111
3805 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4114 $signal->wait;
3808} 4115}
3814 return; 4121 return;
3815 } 4122 }
3816 4123
3817 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3818 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4130 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4132 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3825 }; 4134 };
3826 } 4135 }
3827 4136
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4138 $sig->send;
3837 4146
3838 if (0) { 4147 if (0) {
3839 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3843 } 4152 }
3844 } 4153 }
3845} 4154}
3846 4155
3847{ 4156{
3848 # configure BDB 4157 # configure BDB
3849 4158
3850 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3853 4162
3854 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3892 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3893 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3894 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
3895} 4204}
3896 4205
3897my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3898 4208
3899sub _log_backtrace { 4209sub _log_backtrace {
3900 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3901 4211
3902 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3903 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3905 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3906 ++$_log_backtrace; 4220 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
3908 async { 4222 async {
3909 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3910 4224
3930 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3931 --$_log_backtrace; 4245 --$_log_backtrace;
3932 }; 4246 };
3933 } else { 4247 } else {
3934 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936 } 4250 }
3937} 4251}
3938 4252
3939# load additional modules 4253# load additional modules
3940use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3941 4256
3942END { cf::emergency_save } 4257END { cf::emergency_save }
3943 4258
39441 42591
3945 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines