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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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 Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
90our $DATADIR = datadir; 99our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
94our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 112
103our %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;
104 120
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 123our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
109 125
110our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 129our $DB_ENV;
114 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
115our %CFG; 133our %CFG;
116 134
117our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 136our $RUNTIME;
119our $NOW; 137our $NOW;
130our $JITTER; # average jitter 148our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
132 150
133our @POST_INIT; 151our @POST_INIT;
134 152
135our $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 :)
136 155
137binmode STDOUT; 156binmode STDOUT;
138binmode STDERR; 157binmode STDERR;
139 158
140# read virtual server time, if available 159# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
145} 164}
146 165
166eval "sub TICK() { $TICK } 1" or die;
167
147mkdir $_ 168mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 170
150our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
151 172
152sub 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::"} };
153 189
154############################################################################# 190#############################################################################
155 191
156=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
157 193
199from wherever your confdir points to. 235from wherever your confdir points to.
200 236
201=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
202 238
203These 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
204returns 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
205per 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.
206 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
207=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
208 249
209This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 252that call.
212 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
213=back 260=back
214 261
215=cut 262=cut
216 263
217BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
218 *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 {
219 my $msg = join "", @_; 271 my $msg = join "", @_;
220 272
221 $msg .= "\n" 273 $msg .= "\n"
222 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
223 275
224 $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;
225 277
226 LOG llevError, $msg; 278 LOG llevWarn, $msg;
227 }; 279};
228}
229 280
230$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
232 283
233 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 288 return;#d#
236 }#d# 289 }#d#
237 290
238 # kill coroutine otherwise 291 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 292 Coro::terminate
241}; 293};
242
243$SIG{__DIE__} = sub { }; #d#?
244 294
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 312)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 314}
265 315
266$EV::DIED = sub { 316$EV::DIED = sub {
267 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
268}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
269 324
270############################################################################# 325#############################################################################
271 326
272=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
273 328
294 $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;
295 $d 350 $d
296 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
297} 352}
298 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
299=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
300 369
301Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
302 371
303=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
309our $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
310 379
311sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
312sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
313 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
314=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
315 415
316Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
318 418
319The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
320is a reload or not. 420is a reload or not.
321 421
322=cut 422=cut
323 423
324sub post_init(&) { 424sub post_init(&) {
325 push @POST_INIT, shift; 425 push @POST_INIT, shift;
326} 426}
327 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 }
443}
444
328=item cf::lock_wait $string 445=item cf::lock_wait $string
329 446
330Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
331 448
332=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
333 450
334Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
335a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
337returned. 454returned.
338 455
339Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 457deadlocked coro.
346 463
347Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
348 465
349=cut 466=cut
350 467
351our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 469
354sub lock_wait($) { 470sub lock_wait($) {
355 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 472}
369 473
370sub lock_acquire($) { 474sub lock_acquire($) {
371 my ($key) = @_; 475 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 476}
385 477
386sub lock_active($) { 478sub lock_active($) {
387 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 480}
391 481
392sub freeze_mainloop { 482sub freeze_mainloop {
393 tick_inhibit_inc; 483 tick_inhibit_inc;
394 484
395 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
396} 486}
397 487
398=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
399 489
400Like 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
401get spread over timer. 491get spread over time.
402 492
403=cut 493=cut
404 494
405sub periodic($$) { 495sub periodic($$) {
406 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
411} 501}
412 502
413=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
414 504
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 512
419The 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
420used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
421 515
422Useful for short background jobs. 516Useful for short background jobs.
423 517
424=cut 518=cut
425 519
426our @SLOT_QUEUE; 520our @SLOT_QUEUE;
427our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
428 523
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
432 527
433 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
434 530
435 while () { 531 while () {
436 next_job: 532 next_job:
533
437 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 535
439 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 540 $job->[2]->send;
443 Coro::cede; 541 Coro::cede;
444 goto next_job; 542 goto next_job;
445 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 545 }
447 } 546 }
448 547
449 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 551 $signal->wait;
453 } else { 552 } else {
553 $busy = 0;
454 Coro::schedule; 554 Coro::schedule;
455 } 555 }
456 } 556 }
457}; 557};
458 558
459sub get_slot($;$$) { 559sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
461 561
462 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
463 563
464 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
465 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
466 567
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
495=cut 596=cut
496 597
497sub sync_job(&) { 598sub sync_job(&) {
498 my ($job) = @_; 599 my ($job) = @_;
499 600
500 if ($Coro::current == $Coro::main) { 601 if (in_main) {
501 my $time = EV::time; 602 my $time = AE::time;
502 603
503 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
505 606
506 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
507 608
508 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
509 610
510 my $busy = 1; 611 my $busy = 1;
511 my @res; 612 my @res;
512 613
513 (async { 614 (async {
514 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 616 @res = eval { $job->() };
516 warn $@ if $@; 617 error $@ if $@;
517 undef $busy; 618 undef $busy;
518 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
519 620
520 while ($busy) { 621 while ($busy) {
521 if (Coro::nready) { 622 if (Coro::nready) {
523 } else { 624 } else {
524 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
525 } 626 }
526 } 627 }
527 628
528 my $time = EV::time - $time; 629 my $time = AE::time - $time;
529 630
530 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
531 632
532 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
533 } else { 634 } else {
555 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
556 657
557 $coro 658 $coro
558} 659}
559 660
560=item fork_call { }, $args 661=item fork_call { }, @args
561 662
562Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 666never block itself or use any form of event handling.
566 667
567=cut 668=cut
568 669
670sub post_fork {
671 reset_signals;
672}
673
569sub fork_call(&@) { 674sub fork_call(&@) {
570 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
571 676
572 # 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,
573 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
575 680
576 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
577 reset_signals; 682 cf::post_fork;
578 &$cb 683 &$cb
579 }, @args; 684 } @args;
580 685
581 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 )
582} 698}
583 699
584=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
585 701
586=cut 702=cut
623within each server. 739within each server.
624 740
625=cut 741=cut
626 742
627sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
628 my ($name) = @_; 747 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
630 749
631 eval { 750 eval {
632 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
642} 761}
643 762
644our $DB; 763our $DB;
645 764
646sub db_init { 765sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
649 };
650} 767}
651 768
652sub db_get($$) { 769sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
654 771
655 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
656 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
657 776
658 $! ? () 777 $! ? ()
659 : $data 778 : $data
660 }
661} 779}
662 780
663sub db_put($$$) { 781sub db_put($$$) {
664 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 811
694 my @data; 812 my @data;
695 my $md5; 813 my $md5;
696 814
697 for (0 .. $#$src) { 815 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 817 }
701 818
702 # if processing is expensive, check 819 # if processing is expensive, check
703 # checksum first 820 # checksum first
704 if (1) { 821 if (1) {
721 838
722 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 840 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
725 842
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 844
728 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
731 848
741 858
742=cut 859=cut
743 860
744sub datalog($@) { 861sub datalog($@) {
745 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 864}
748 865
749=back 866=back
750 867
751=cut 868=cut
946 1063
947 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1066
950 } elsif (ref $type) { 1067 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
952 1069
953 } else { 1070 } else {
954 shift @arg; 1071 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
956 } 1073 }
957 } 1074 }
958} 1075}
959 1076
960sub _object_attach { 1077sub _object_attach {
970 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
971 } 1088 }
972 1089
973 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
974 } else { 1091 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1093 }
977 1094
978 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
979} 1096}
980 1097
1039 1156
1040 for (@$callbacks) { 1157 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1042 1159
1043 if ($@) { 1160 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1162 override;
1047 } 1163 }
1048 1164
1049 return 1 if $override; 1165 return 1 if $override;
1050 } 1166 }
1129 for (@$attach) { 1245 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1132 } 1248 }
1133 } else { 1249 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1251 }
1136 } 1252 }
1137} 1253}
1138 1254
1139cf::attachable->attach ( 1255cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1167 1283
1168 sync_job { 1284 sync_job {
1169 if (length $$rdata) { 1285 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1173 1290
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 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 }
1178 aio_close $fh; 1298 aio_close $fh;
1179 1299
1180 if (@$objs) { 1300 if (@$objs) {
1181 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) {
1182 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1185 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 }
1186 aio_close $fh; 1309 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1311 }
1189 } else { 1312 } else {
1190 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1194 1317
1195 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1320 } else {
1198 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1199 } 1322 }
1200 } else { 1323 } else {
1201 aio_unlink $filename; 1324 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1203 } 1326 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1351 $av = $st->{objs};
1229 } 1352 }
1230 1353
1231 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1234 1358
1235 ($data, $av) 1359 ($data, $av)
1236} 1360}
1237 1361
1238=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1297} 1421}
1298 1422
1299use File::Glob (); 1423use File::Glob ();
1300 1424
1301cf::player->attach ( 1425cf::player->attach (
1302 on_command => sub { 1426 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1304 1428
1305 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1306 or return; 1430 or return;
1307 1431
1330 1454
1331 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1332 if $reply; 1456 if $reply;
1333 1457
1334 } else { 1458 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1460 }
1337 1461
1338 cf::override; 1462 cf::override;
1339 }, 1463 },
1340); 1464);
1341 1465
1342# "readahead" all extensions 1466# "readahead" all extensions
1343sub cache_extensions { 1467sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1468 my $grp = IO::AIO::aio_group;
1345 1469
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1471 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1473 }
1350 }; 1474 };
1351 1475
1352 $grp 1476 $grp
1353} 1477}
1354 1478
1355sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1356 cf::sync_job { 1482 cf::sync_job {
1357 my %todo; 1483 my %todo;
1358 1484
1359 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1486 next unless -r $path;
1378 1504
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1507
1382 $ext{source} = 1508 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1385 . $source 1511 . $source
1386 . "\n};\n1"; 1512 . "\n};\n1";
1387 1513
1388 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1389 } 1515 }
1390 1516
1517 my $pass = 0;
1391 my %done; 1518 my %done;
1392 while (%todo) { 1519 while (%todo) {
1393 my $progress; 1520 my $progress;
1394 1521
1522 ++$pass;
1523
1524 ext:
1395 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1527 next ext
1398 unless exists $done{$_}; 1528 unless exists $done{$_};
1399 } 1529 }
1400 1530
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1532
1403 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1537
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1539 if exists $v->{meta}{mandatory};
1411 1540
1412 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;
1413 } 1550 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1551 }
1419 1552
1420 skip: 1553 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 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 }
1423 } 1563 }
1424 }; 1564 };
1425} 1565}
1426 1566
1427############################################################################# 1567#############################################################################
1511 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1512 } 1652 }
1513 } 1653 }
1514} 1654}
1515 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
1516sub save($) { 1669sub save($) {
1517 my ($pl) = @_; 1670 my ($pl) = @_;
1518 1671
1519 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1520 1673
1525 1678
1526 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1528 1681
1529 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];
1530 1686
1531 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1688 cf::cede_to_tick;
1533} 1689}
1534 1690
1568 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1569 1725
1570 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1571 $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
1572 1728
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574 $pl->deactivate; 1730 $pl->deactivate;
1731
1575 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;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1578 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1579 1737
1580 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1582 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1636 \@logins 1794 \@logins
1637} 1795}
1638 1796
1639=item $player->maps 1797=item $player->maps
1640 1798
1799=item cf::player::maps $login
1800
1641Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1642player. May block. 1802player. May block.
1643 1803
1644=cut 1804=cut
1645 1805
1707=cut 1867=cut
1708 1868
1709sub find_by_path($) { 1869sub find_by_path($) {
1710 my ($path) = @_; 1870 my ($path) = @_;
1711 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1712 my ($match, $specificity); 1874 my ($match, $specificity);
1713 1875
1714 for my $region (list) { 1876 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1744sub generate_random_map { 1906sub generate_random_map {
1745 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1746 1908
1747 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
1748 1910
1749 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1759 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1760 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1761 (cf::region::find $rmp->{region}), $rmp->{custom}
1762 )
1763} 1912}
1764 1913
1765=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1766 1915
1767Register 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
1772 1921
1773sub register { 1922sub register {
1774 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 1924 my $pkg = caller;
1776 1925
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 1927
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 1929}
1782 1930
1783# also paths starting with '/' 1931# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 1933
1786sub thawer_merge { 1934sub thawer_merge {
1787 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1788 1936
1789 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1794} 1942}
1795 1943
1796sub normalise { 1944sub normalise {
1797 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1798 1946
1799 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1800 1948
1801 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1802 1950
1803 # map plan: 1951 # map plan:
1804 # 1952 #
1806 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1807 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1808 # ?random/... random maps 1956 # ?random/... random maps
1809 # /... normal maps 1957 # /... normal maps
1810 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1811 1960
1812 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1813 1962
1814 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1815 # something that looks reasonable 1964 # something that looks reasonable
1816 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1817 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1818 1967
1819 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1820 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1821 } 1984 }
1822 1985
1823 for ($path) { 1986 for ($path) {
1824 redo if s{//}{/};
1825 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1826 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1827 } 1989 }
1828 1990
1829 $path 1991 $path
1843 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1844 return $self; 2006 return $self;
1845 } 2007 }
1846 } 2008 }
1847 2009
1848 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1849 () 2011 ()
1850} 2012}
1851 2013
2014# may re-bless or do other evil things
1852sub init { 2015sub init {
1853 my ($self) = @_; 2016 my ($self) = @_;
1854 2017
1855 $self 2018 $self
1856} 2019}
1885sub uniq_path { 2048sub uniq_path {
1886 my ($self) = @_; 2049 my ($self) = @_;
1887 2050
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1890}
1891
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899} 2053}
1900 2054
1901sub decay_objects { 2055sub decay_objects {
1902 my ($self) = @_; 2056 my ($self) = @_;
1903 2057
1985 2139
1986sub find; 2140sub find;
1987sub find { 2141sub find {
1988 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1989 2143
2144 cf::cede_to_tick;
2145
1990 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1991 2147
1992 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2150
1995 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
2000 or return; 2153 or return;
2001 2154
2002 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
2003 2156
2015 2168
2016 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
2017 } 2170 }
2018} 2171}
2019 2172
2020sub pre_load { } 2173sub pre_load { }
2021sub post_load { } 2174#sub post_load { } # XS
2022 2175
2023sub load { 2176sub load {
2024 my ($self) = @_; 2177 my ($self) = @_;
2025 2178
2026 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
2038 $self->alloc; 2191 $self->alloc;
2039 2192
2040 $self->pre_load; 2193 $self->pre_load;
2041 cf::cede_to_tick; 2194 cf::cede_to_tick;
2042 2195
2196 if (exists $self->{load_path}) {
2043 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2044 $f->skip_block; 2198 $f->skip_block;
2045 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2046 or return; 2200 or return;
2047 2201
2048 $self->post_load_original 2202 $self->post_load_original
2049 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2050 2204
2051 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2052 utf8::encode $uniq; 2206 utf8::encode $uniq;
2053 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2054 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2055 $self->clear_unique_items; 2209 $self->clear_unique_items;
2056 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2057 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2058 } 2213 }
2059 } 2214 }
2060 }
2061 2215
2062 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2063 2218
2064 cf::cede_to_tick; 2219 cf::cede_to_tick;
2065 # now do the right thing for maps 2220 # now do the right thing for maps
2066 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2067 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
2071 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2227 $self->decay_objects;
2073 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
2074 $self->update_buttons; 2229 $self->update_buttons;
2075 cf::cede_to_tick; 2230 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2231 $self->activate;
2079 } 2232 }
2080 2233
2081 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
2083 2236
2084 $self->in_memory (cf::MAP_ACTIVE); 2237 $self->in_memory (cf::MAP_ACTIVE);
2085 } 2238 }
2086 2239
2087 $self->post_load; 2240 $self->post_load;
2088}
2089 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2090sub customise_for { 2248sub customise_for {
2091 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2092 2250
2093 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2252 if $self->per_player;
2110 or next; 2268 or next;
2111 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2112 or next; 2270 or next;
2113 $neigh->load; 2271 $neigh->load;
2114 2272
2273 # now find the diagonal neighbours
2115 push @neigh, 2274 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 } 2277 }
2119 2278
2126} 2285}
2127 2286
2128sub find_sync { 2287sub find_sync {
2129 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2130 2289
2131 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2132} 2294}
2133 2295
2134sub do_load_sync { 2296sub do_load_sync {
2135 my ($map) = @_; 2297 my ($map) = @_;
2136 2298
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2139 2301
2140 cf::sync_job { $map->load }; 2302 $map->load;
2141} 2303}
2142 2304
2143our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2145 2307
2146sub find_async { 2308sub find_async {
2147 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2148 2310
2149 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2150 2312
2151 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2153 } 2315 }
2154 2316
2171 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2172 2334
2173 () 2335 ()
2174} 2336}
2175 2337
2338# common code, used by both ->save and ->swapout
2176sub save { 2339sub _save {
2177 my ($self) = @_; 2340 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2341
2181 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2182 2343
2183 return unless $self->dirty; 2344 return unless $self->dirty;
2184 2345
2204 } else { 2365 } else {
2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2206 } 2367 }
2207} 2368}
2208 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2209sub swap_out { 2378sub swap_out {
2210 my ($self) = @_; 2379 my ($self) = @_;
2211 2380
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2382
2217 return if $self->players;
2218 return if $self->in_memory != cf::MAP_ACTIVE; 2383 return if $self->in_memory != cf::MAP_ACTIVE;
2219 return if $self->{deny_save}; 2384 return if $self->{deny_save};
2385 return if $self->players;
2220 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2221 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2222 2437
2223 $self->deactivate; 2438 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2440 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2441
2271 $self->unlink_save; 2442 $self->unlink_save;
2272 $self->destroy; 2443 $self->destroy;
2273} 2444}
2274 2445
2282 2453
2283 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2284 2455
2285 $self->unlink_save; 2456 $self->unlink_save;
2286 2457
2287 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2463
2349 : normalise $_ 2520 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2522 ]
2352} 2523}
2353 2524
2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2556
2354=back 2557=back
2355 2558
2356=head3 cf::object 2559=head3 cf::object
2357 2560
2358=cut 2561=cut
2423 2626
2424our $SAY_CHANNEL = { 2627our $SAY_CHANNEL = {
2425 id => "say", 2628 id => "say",
2426 title => "Map", 2629 title => "Map",
2427 reply => "say ", 2630 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2632};
2430 2633
2431our $CHAT_CHANNEL = { 2634our $CHAT_CHANNEL = {
2432 id => "chat", 2635 id => "chat",
2433 title => "Chat", 2636 title => "Chat",
2490 2693
2491Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2492 2695
2493The player should be reasonably safe there for short amounts of time (e.g. 2696The player should be reasonably safe there for short amounts of time (e.g.
2494for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link 2698though, as the player cannot control the character while it is on the link
2496map. 2699map.
2497 2700
2498Will never block. 2701Will never block.
2499 2702
2500=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2522 my ($self) = @_; 2725 my ($self) = @_;
2523 2726
2524 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2525 2728
2729 ++$self->{_link_recursion};
2730
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2732
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2530 2735
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2737}
2533 2738
2534sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2536 2741
2553 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2555 2760
2556 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2559 2764
2560 $map->load; 2765 $map->load;
2561 $map->load_neighbours; 2766 $map->load_neighbours;
2562 2767
2563 return unless $self->contr->active; 2768 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2769
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2569} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2570 2777
2778}
2779
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2572 2781
2573Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2574her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2575that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2576the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2583 2792
2584our $GOTOGEN; 2793our $GOTOGEN;
2585 2794
2586sub cf::object::player::goto { 2795sub cf::object::player::goto {
2587 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2588 2803
2589 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2806
2592 $self->enter_link; 2807 $self->enter_link;
2612 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2613 } 2828 }
2614 } 2829 }
2615 2830
2616 my $map = eval { 2831 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2618 2833
2619 if ($map) { 2834 if ($map) {
2620 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2837 } else {
2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2624 } 2839 }
2625 2840
2626 $map 2841 $map
2634 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2637 } 2852 }
2638 2853
2639 $done->() if $done; 2854 $done->($self) if $done;
2640 })->prio (1); 2855 })->prio (1);
2641} 2856}
2642 2857
2643=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2644 2859
2720 2935
2721 prepare_random_map $exit 2936 prepare_random_map $exit
2722 if $exit->slaying eq "/!"; 2937 if $exit->slaying eq "/!";
2723 } 2938 }
2724 2939
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2726 my $x = $exit->stats->hp; 2941 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp; 2942 my $y = $exit->stats->sp;
2728 2943
2729 $self->goto ($map, $x, $y); 2944 $self->goto ($map, $x, $y);
2730 2945
2737 $self->message ("Something went wrong deep within the deliantra server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2739 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2741 2956
2742 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 2958 $self->leave_link;
2744 } 2959 }
2745 })->prio (1); 2960 })->prio (1);
2746} 2961}
2747 2962
2759sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2761 2976
2762 utf8::encode $text; 2977 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2764} 3004}
2765 3005
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 3007
2768Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2772 3012
2773=cut 3013=cut
2774 3014
2775# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2777 "c/identify" => { 3023 "c/identify" => {
2778 id => "infobox", 3024 id => "infobox",
2779 title => "Identify", 3025 title => "Identify",
2780 reply => undef, 3026 reply => undef,
2781 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2783 "c/examine" => { 3029 "c/examine" => {
2784 id => "infobox", 3030 id => "infobox",
2785 title => "Examine", 3031 title => "Examine",
2786 reply => undef, 3032 reply => undef,
2787 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 3040 },
2789 "c/book" => { 3041 "c/book" => {
2790 id => "infobox", 3042 id => "infobox",
2791 title => "Book", 3043 title => "Book",
2792 reply => undef, 3044 reply => undef,
2808 id => "infobox", 3060 id => "infobox",
2809 title => "Body Parts", 3061 title => "Body Parts",
2810 reply => undef, 3062 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 3063 tooltip => "Shows which body parts you posess and are available",
2812 }, 3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
2813 "c/skills" => { 3071 "c/skills" => {
2814 id => "infobox", 3072 id => "infobox",
2815 title => "Skills", 3073 title => "Skills",
2816 reply => undef, 3074 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
2818 }, 3100 },
2819 "c/uptime" => { 3101 "c/uptime" => {
2820 id => "infobox", 3102 id => "infobox",
2821 title => "Uptime", 3103 title => "Uptime",
2822 reply => undef, 3104 reply => undef,
2832 id => "party", 3114 id => "party",
2833 title => "Party", 3115 title => "Party",
2834 reply => "gsay ", 3116 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3117 tooltip => "Messages and chat related to your party",
2836 }, 3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2837); 3127);
2838 3128
2839sub cf::client::send_msg { 3129sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3131
2846 3136
2847 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3138 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3139 $channel = $CHANNEL{$channel};
2850 3140
2851 $self->ext_msg (channel_info => $channel) 3141 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3142 $channel = $channel->{id};
2855 3143
2856 } elsif (ref $channel) { 3144 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3149 }
2863 3150
2864 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2865 } 3152 }
2866 3153
2867 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2868 3155
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3156 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2873 3159
2874 my $pkt = "msg " 3160 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3161 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3163 );
2878 3164
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3165 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3166}
2916 3167
2917=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2918 3169
2919Sends an ext event to the client. 3170Sends an ext event to the client.
2922 3173
2923sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2925 3176
2926 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3182 }
2932} 3183}
2933 3184
2934=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2935 3186
2939 3190
2940sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2942 3193
2943 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3197 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3200 }
2950} 3201}
2951 3202
2952=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2953 3204
3024 3275
3025 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
3026 if $reply; 3277 if $reply;
3027 3278
3028 } else { 3279 } else {
3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3030 } 3281 }
3031 3282
3032 cf::override; 3283 cf::override;
3033 }, 3284 },
3034); 3285);
3054 3305
3055 $coro 3306 $coro
3056} 3307}
3057 3308
3058cf::client->attach ( 3309cf::client->attach (
3059 on_destroy => sub { 3310 on_client_destroy => sub {
3060 my ($ns) = @_; 3311 my ($ns) = @_;
3061 3312
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3314 },
3064); 3315);
3080our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
3081 3332
3082$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
3083 3334
3084$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
3087 sort time 3338 sort time
3088)); 3339));
3089 3340
3090# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
3095 3346
3096 cf::object 3347 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3348 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3349 insert remove name archname title slaying race decrease split
3350 value
3099 3351
3100 cf::object::player 3352 cf::object::player
3101 player 3353 player
3102 3354
3103 cf::player 3355 cf::player
3109=cut 3361=cut
3110 3362
3111for ( 3363for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3118) { 3370) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3373 for @funs;
3123} 3374}
3124 3375
3139 3390
3140 my $qcode = $code; 3391 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3143 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
3144 local $_; 3398 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3399
3147 my $eval = 3400 my $eval =
3148 "do {\n" 3401 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3404 . $code
3152 . "\n}" 3405 . "\n}"
3153 ; 3406 ;
3154 3407
3408 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
3158 3417
3159 if ($@) { 3418 if ($@) {
3160 warn "$@"; 3419 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3163 } 3422 }
3164 3423
3165 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3166} 3425}
3167 3426
3181=cut 3440=cut
3182 3441
3183sub register_script_function { 3442sub register_script_function {
3184 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3185 3444
3186 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3188} 3447}
3189 3448
3190=back 3449=back
3191 3450
3192=cut 3451=cut
3201 # for this (global event?) 3460 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3203 3462
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3464
3206 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3207 3466
3208 my $facedata; 3467 my $facedata = decode_storable load_file $path;
3209 0 < aio_load $path, $facedata
3210 or die "$path: $!";
3211
3212 $facedata = Coro::Storable::thaw $facedata;
3213 3468
3214 $facedata->{version} == 2 3469 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3471
3217 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3218 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3475 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3221 }; 3478 };
3222 cf::cede_to_tick; 3479 cf::cede_to_tick;
3223 3480
3224 { 3481 {
3225 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3227 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3486
3230 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3234 3492
3235 cf::cede_to_tick; 3493 cf::cede_to_tick;
3236 } 3494 }
3237 3495
3238 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3243 3501
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3505 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3507 }
3250 3508
3251 cf::cede_to_tick; 3509 cf::cede_to_tick;
3252 } 3510 }
3253 } 3511 }
3262 3520
3263 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3264 } 3522 }
3265 3523
3266 { 3524 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3270 3526
3271 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3528 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3530
3276 if ($info->{type} & 1) { 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3532 cf::face::set_type $idx, $info->{type};
3291 } else { 3533 } else {
3292 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3293 } 3535 }
3294 3536
3295 cf::cede_to_tick; 3537 cf::cede_to_tick;
3296 } 3538 }
3297 } 3539 }
3298 3540
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3542
3301 1 3543 1
3302} 3544}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3545
3324register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3547 my ($ns, $want) = @_;
3326 3548
3327 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3366sub reload_treasures { 3588sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3369} 3591}
3370 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3371sub reload_resources { 3613sub reload_resources {
3372 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3373 3615
3616 reload_exp_table;
3617 reload_materials;
3374 reload_facedata; 3618 reload_facedata;
3619 reload_sound;
3375 reload_archetypes; 3620 reload_archetypes;
3376 reload_regions; 3621 reload_regions;
3377 reload_treasures; 3622 reload_treasures;
3378 3623
3379 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3380} 3625}
3381 3626
3382sub reload_config { 3627sub reload_config {
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3384 or return;
3385 3629
3386 local $/; 3630 my $config = load_file "$CONFDIR/config";
3387 *CFG = YAML::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3388 3633
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3635
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3638
3394 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3417 3662
3418 seek $fh, 0, 0; 3663 seek $fh, 0, 0;
3419 print $fh $$; 3664 print $fh $$;
3420} 3665}
3421 3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3422sub main { 3676sub main {
3423 cf::init_globals; # initialise logging 3677 cf::init_globals; # initialise logging
3424 3678
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435 3683
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3685
3438 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3445 }; 3693 };
3446 3694
3447 evthread_start IO::AIO::poll_fileno; 3695 evthread_start IO::AIO::poll_fileno;
3448 3696
3449 cf::sync_job { 3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3450 reload_resources; 3706 reload_resources;
3451 reload_config; 3707 reload_config;
3452 db_init; 3708 db_init;
3453 3709
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3710 cf::init_uuid;
3457 cf::init_signals; 3711 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3712 cf::init_skills;
3460 3713
3461 cf::init_beforeplay; 3714 cf::init_beforeplay;
3462 3715
3463 atomic; 3716 atomic;
3465 load_extensions; 3718 load_extensions;
3466 3719
3467 utime time, time, $RUNTIMEFILE; 3720 utime time, time, $RUNTIMEFILE;
3468 3721
3469 # no (long-running) fork's whatsoever before this point(!) 3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3725
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3726 cf::_post_init 0;
3473 }; 3727 };
3474 3728
3475 EV::loop; 3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3476} 3738}
3477 3739
3478############################################################################# 3740#############################################################################
3479# initialisation and cleanup 3741# initialisation and cleanup
3480 3742
3481# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3482BEGIN { 3744BEGIN {
3483 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3487 }; 3749 };
3488 } 3750 }
3489} 3751}
3490 3752
3491sub write_runtime_sync { 3753sub write_runtime_sync {
3754 my $t0 = AE::time;
3755
3492 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3494 3758
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3760
3497 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3498 3762
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3764 or return;
3501 3765
3502 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3517 or return; 3781 or return;
3518 3782
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3784 and return;
3521 3785
3522 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3787
3524 1 3788 1
3525} 3789}
3526 3790
3527our $uuid_lock; 3791our $uuid_lock;
3539 or return; 3803 or return;
3540 3804
3541 my $value = uuid_seq uuid_cur; 3805 my $value = uuid_seq uuid_cur;
3542 3806
3543 unless ($value) { 3807 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3808 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3809 return;
3546 } 3810 }
3547 3811
3548 my $value = uuid_str $value + $uuid_skip; 3812 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3813 $uuid_skip = 0;
3559 or return; 3823 or return;
3560 3824
3561 aio_rename "$uuid~", $uuid 3825 aio_rename "$uuid~", $uuid
3562 and return; 3826 and return;
3563 3827
3564 warn "uuid file written ($value).\n"; 3828 trace "uuid file written ($value).\n";
3565 3829
3566 1 3830 1
3567 3831
3568} 3832}
3569 3833
3575} 3839}
3576 3840
3577sub emergency_save() { 3841sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3579 3843
3580 warn "emergency_perl_save: enter\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3581 3850
3582 cf::sync_job { 3851 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 3852 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 3853
3588 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 3860 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 3862 $pl->save;
3597 } 3863 }
3598 warn "emergency_perl_save: end player save\n"; 3864 info "emergency_perl_save: end player save\n";
3599 3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3600 warn "emergency_perl_save: begin map save\n"; 3868 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 3871 $map->valid or next;
3604 $map->save; 3872 $map->save;
3605 } 3873 }
3606 warn "emergency_perl_save: end map save\n"; 3874 info "emergency_perl_save: end map save\n";
3607 3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3608 warn "emergency_perl_save: begin database checkpoint\n"; 3878 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3611 3881
3612 warn "emergency_perl_save: begin write uuid\n"; 3882 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 3883 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n"; 3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3615 }; 3904 };
3616 3905
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 3906 info "emergency_perl_save: leave\n";
3623} 3907}
3624 3908
3625sub post_cleanup { 3909sub post_cleanup {
3626 my ($make_core) = @_; 3910 my ($make_core) = @_;
3627 3911
3912 IO::AIO::flush;
3913
3628 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 3915 if $make_core;
3630 3916
3631 my $fh = pidfile; 3917 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 3918 unlink $PIDFILE if <$fh> == $$;
3633} 3919}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 3940 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 3941 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 3943 }
3658 warn "cleared package $pkg\n";#d#
3659} 3944}
3660 3945
3661sub do_reload_perl() { 3946sub do_reload_perl() {
3662 # can/must only be called in main 3947 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3664 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3665 return; 3950 return;
3666 } 3951 }
3667 3952
3668 return if $RELOAD++; 3953 return if $RELOAD++;
3669 3954
3670 my $t1 = EV::time; 3955 my $t1 = AE::time;
3671 3956
3672 while ($RELOAD) { 3957 while ($RELOAD) {
3673 warn "reloading..."; 3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3674 3960
3675 warn "entering sync_job"; 3961 trace "perl_reload: entering sync_job";
3676 3962
3677 cf::sync_job { 3963 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 3964 #cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 3965
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 3968 %EXT_CORO = ();
3695 3969
3696 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3697 %COMMAND = (); 3971 %COMMAND = ();
3698 3972
3699 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3700 %EXTCMD = (); 3974 %EXTCMD = ();
3701 %EXTICMD = (); 3975 %EXTICMD = ();
3702 3976
3703 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3706 3980
3707 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3708 eval { 3982 eval {
3709 $cb->($pkg); 3983 $cb->($pkg);
3710 1 3984 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3712 } 3986 }
3713 3987
3714 warn "... clearing $pkg"; 3988 trace "... clearing $pkg";
3715 clear_package $pkg; 3989 clear_package $pkg;
3716 } 3990 }
3717 3991
3718 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 3995
3722 warn "... unloading $k"; 3996 trace "... unloading $k";
3723 delete $INC{$k}; 3997 delete $INC{$k};
3724 3998
3725 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3727 4001
3730 } 4004 }
3731 4005
3732 clear_package $k; 4006 clear_package $k;
3733 } 4007 }
3734 4008
3735 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 4010 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 4012
3739 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 4016
3743 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3744 # and global variables created in xs 4018 # and global variables created in xs
3745 #clear_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3746 4020
3747 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3748 4022
3749 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3750 require cf; 4024 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3752 4026
3753 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3754 cf::reload_config; 4028 cf::reload_config;
3755 4029
3756 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3757 cf::load_extensions; 4031 cf::load_extensions;
3758 4032
3759 if ($REATTACH_ON_RELOAD) { 4033 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3763 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
3766 } 4040 }
3767 4041
3768 warn "running post_init jobs"; 4042 cf::_post_init 1;
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770 4043
3771 warn "leaving sync_job"; 4044 trace "perl_reload: leaving sync_job";
3772 4045
3773 1 4046 1
3774 } or do { 4047 } or do {
3775 warn $@; 4048 error $@;
3776 cf::cleanup "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3777 }; 4050 };
3778 4051
3779 warn "reloaded";
3780 --$RELOAD; 4052 --$RELOAD;
3781 } 4053 }
3782 4054
3783 $t1 = EV::time - $t1; 4055 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 4056 info "perl_reload: completed in ${t1}s\n";
3785}; 4057};
3786 4058
3787our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3788 4060
3789sub reload_perl() { 4061sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3792 4064
3793 $RELOAD_WATCHER ||= cf::async { 4065 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4066 Coro::AIO::aio_wait cache_extensions;
3795 4067
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4069 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3799 }; 4071 };
3800 }; 4072 };
3801} 4073}
3810 reload_perl; 4082 reload_perl;
3811 }; 4083 };
3812 } 4084 }
3813}; 4085};
3814 4086
3815unshift @INC, $LIBDIR; 4087#############################################################################
3816 4088
3817my $bug_warning = 0; 4089my $bug_warning = 0;
3818 4090
3819our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3821 4093
3822sub wait_for_tick { 4094sub wait_for_tick() {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 4096
3825 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 4099 $signal->wait;
3828} 4100}
3829 4101
3830sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 4104
3833 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4107 $signal->wait;
3836} 4108}
3842 return; 4114 return;
3843 } 4115 }
3844 4116
3845 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3846 4118
4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4120
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4123 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4125 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3853 }; 4127 };
3854 } 4128 }
3855 4129
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4131 $sig->send;
3865 4139
3866 if (0) { 4140 if (0) {
3867 if ($NEXT_TICK) { 4141 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4142 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4144 debug "jitter $JITTER\n";#d#
3871 } 4145 }
3872 } 4146 }
3873} 4147}
3874 4148
3875{ 4149{
3876 # configure BDB 4150 # configure BDB
3877 4151
3878 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4154 $AnyEvent::BDB::WATCHER->priority (1);
3881 4155
3882 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3920 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3921 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3922 undef $AnyEvent::AIO::WATCHER; 4196 undef $AnyEvent::AIO::WATCHER;
3923} 4197}
3924 4198
3925my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3926 4201
3927sub _log_backtrace { 4202sub _log_backtrace {
3928 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3929 4204
3930 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3931 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3932 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3933 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3934 ++$_log_backtrace; 4213 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg; 4214 my $perl_bt = Carp::longmess $msg;
3936 async { 4215 async {
3937 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3938 4217
3958 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3959 --$_log_backtrace; 4238 --$_log_backtrace;
3960 }; 4239 };
3961 } else { 4240 } else {
3962 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3964 } 4243 }
3965} 4244}
3966 4245
3967# load additional modules 4246# load additional modules
3968use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3969 4249
3970END { cf::emergency_save } 4250END { cf::emergency_save }
3971 4251
39721 42521
3973 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines