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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 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;
127 145
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 148our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
132 155
133binmode STDOUT; 156binmode STDOUT;
134binmode STDERR; 157binmode STDERR;
135 158
136# read virtual server time, if available 159# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
141} 164}
142 165
166eval "sub TICK() { $TICK } 1" or die;
167
143mkdir $_ 168mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 170
146our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
147 172
148sub 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::"} };
149 189
150############################################################################# 190#############################################################################
151 191
152=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
153 193
195from wherever your confdir points to. 235from wherever your confdir points to.
196 236
197=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
198 238
199These 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
200returns 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
201per 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.
202 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
203=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
204 249
205This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 252that call.
208 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
209=back 260=back
210 261
211=cut 262=cut
212 263
213BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 271 my $msg = join "", @_;
216 272
217 $msg .= "\n" 273 $msg .= "\n"
218 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
219 275
220 $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;
221 277
222 LOG llevError, $msg; 278 LOG llevWarn, $msg;
223 }; 279};
224}
225 280
226$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
228 283
229 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 288 return;#d#
232 }#d# 289 }#d#
233 290
234 # kill coroutine otherwise 291 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 292 Coro::terminate
237}; 293};
238
239$SIG{__DIE__} = sub { }; #d#?
240 294
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 312)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 314}
261 315
262$EV::DIED = sub { 316$EV::DIED = sub {
263 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
264}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
265 324
266############################################################################# 325#############################################################################
267 326
268=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
269 328
290 $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;
291 $d 350 $d
292 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
293} 352}
294 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
295=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
296 369
297Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
298 371
299=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
305our $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
306 379
307sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
444
310=item cf::lock_wait $string 445=item cf::lock_wait $string
311 446
312Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
313 448
314=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
315 450
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
319returned. 454returned.
320 455
321Locks 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
322deadlocked coro. 457deadlocked coro.
328 463
329Return 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.
330 465
331=cut 466=cut
332 467
333our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 469
336sub lock_wait($) { 470sub lock_wait($) {
337 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 472}
351 473
352sub lock_acquire($) { 474sub lock_acquire($) {
353 my ($key) = @_; 475 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 476}
367 477
368sub lock_active($) { 478sub lock_active($) {
369 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 480}
373 481
374sub freeze_mainloop { 482sub freeze_mainloop {
375 tick_inhibit_inc; 483 tick_inhibit_inc;
376 484
377 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
378} 486}
379 487
380=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
381 489
382Like 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
383get spread over timer. 491get spread over time.
384 492
385=cut 493=cut
386 494
387sub periodic($$) { 495sub periodic($$) {
388 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
392 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
393} 501}
394 502
395=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
396 504
397Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
398This 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
399of 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.
400 512
401The 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
402used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
403 515
404Useful for short background jobs. 516Useful for short background jobs.
405 517
406=cut 518=cut
407 519
408our @SLOT_QUEUE; 520our @SLOT_QUEUE;
409our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
410 523
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
414 527
415 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
416 530
417 while () { 531 while () {
418 next_job: 532 next_job:
533
419 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 535
421 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 540 $job->[2]->send;
425 Coro::cede; 541 Coro::cede;
426 goto next_job; 542 goto next_job;
427 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 545 }
429 } 546 }
430 547
431 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
434 $signal->wait; 551 $signal->wait;
435 } else { 552 } else {
553 $busy = 0;
436 Coro::schedule; 554 Coro::schedule;
437 } 555 }
438 } 556 }
439}; 557};
440 558
441sub get_slot($;$$) { 559sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
443 561
444 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
445 563
446 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
447 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
448 567
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
477=cut 596=cut
478 597
479sub sync_job(&) { 598sub sync_job(&) {
480 my ($job) = @_; 599 my ($job) = @_;
481 600
482 if ($Coro::current == $Coro::main) { 601 if (in_main) {
483 my $time = EV::time; 602 my $time = AE::time;
484 603
485 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
487 606
488 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
489 608
490 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
491 610
492 my $busy = 1; 611 my $busy = 1;
493 my @res; 612 my @res;
494 613
495 (async { 614 (async {
496 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
497 @res = eval { $job->() }; 616 @res = eval { $job->() };
498 warn $@ if $@; 617 error $@ if $@;
499 undef $busy; 618 undef $busy;
500 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
501 620
502 while ($busy) { 621 while ($busy) {
503 if (Coro::nready) { 622 if (Coro::nready) {
505 } else { 624 } else {
506 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
507 } 626 }
508 } 627 }
509 628
510 my $time = EV::time - $time; 629 my $time = AE::time - $time;
511 630
512 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
513 632
514 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
515 } else { 634 } else {
537 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
538 657
539 $coro 658 $coro
540} 659}
541 660
542=item fork_call { }, $args 661=item fork_call { }, @args
543 662
544Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
545process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
546Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
547never block itself or use any form of event handling. 666never block itself or use any form of event handling.
548 667
549=cut 668=cut
550 669
670sub post_fork {
671 reset_signals;
672}
673
551sub fork_call(&@) { 674sub fork_call(&@) {
552 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
553 676
554 # 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,
555 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
556 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
557 680
558 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
559 reset_signals; 682 cf::post_fork;
560 &$cb 683 &$cb
561 }, @args; 684 } @args;
562 685
563 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 )
564} 698}
565 699
566=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
567 701
568=cut 702=cut
605within each server. 739within each server.
606 740
607=cut 741=cut
608 742
609sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
610 my ($name) = @_; 747 my ($name) = @_;
611 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
612 749
613 eval { 750 eval {
614 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
624} 761}
625 762
626our $DB; 763our $DB;
627 764
628sub db_init { 765sub db_init {
629 cf::sync_job {
630 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
631 };
632} 767}
633 768
634sub db_get($$) { 769sub db_get($$) {
635 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
636 771
637 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
638 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
639 776
640 $! ? () 777 $! ? ()
641 : $data 778 : $data
642 }
643} 779}
644 780
645sub db_put($$$) { 781sub db_put($$$) {
646 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
647 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
675 811
676 my @data; 812 my @data;
677 my $md5; 813 my $md5;
678 814
679 for (0 .. $#$src) { 815 for (0 .. $#$src) {
680 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
681 or Carp::croak "$src->[$_]: $!";
682 } 817 }
683 818
684 # if processing is expensive, check 819 # if processing is expensive, check
685 # checksum first 820 # checksum first
686 if (1) { 821 if (1) {
703 838
704 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
705 my $data = $process->(\@data); 840 my $data = $process->(\@data);
706 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
707 842
708 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
709 844
710 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
711 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
712 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
713 848
723 858
724=cut 859=cut
725 860
726sub datalog($@) { 861sub datalog($@) {
727 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
728 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
729} 864}
730 865
731=back 866=back
732 867
733=cut 868=cut
928 1063
929 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
930 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
931 1066
932 } elsif (ref $type) { 1067 } elsif (ref $type) {
933 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
934 1069
935 } else { 1070 } else {
936 shift @arg; 1071 shift @arg;
937 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
938 } 1073 }
939 } 1074 }
940} 1075}
941 1076
942sub _object_attach { 1077sub _object_attach {
952 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
953 } 1088 }
954 1089
955 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
956 } else { 1091 } else {
957 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
958 } 1093 }
959 1094
960 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
961} 1096}
962 1097
1021 1156
1022 for (@$callbacks) { 1157 for (@$callbacks) {
1023 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1024 1159
1025 if ($@) { 1160 if ($@) {
1026 warn "$@";
1027 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1028 override; 1162 override;
1029 } 1163 }
1030 1164
1031 return 1 if $override; 1165 return 1 if $override;
1032 } 1166 }
1111 for (@$attach) { 1245 for (@$attach) {
1112 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1113 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1114 } 1248 }
1115 } else { 1249 } else {
1116 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1117 } 1251 }
1118 } 1252 }
1119} 1253}
1120 1254
1121cf::attachable->attach ( 1255cf::attachable->attach (
1148 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1149 1283
1150 sync_job { 1284 sync_job {
1151 if (length $$rdata) { 1285 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1153 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1154 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1155 1290
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1298 aio_close $fh;
1161 1299
1162 if (@$objs) { 1300 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1309 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1311 }
1171 } else { 1312 } else {
1172 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1173 } 1314 }
1174 1315
1175 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1320 } else {
1177 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1178 } 1322 }
1179 } else { 1323 } else {
1180 aio_unlink $filename; 1324 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1182 } 1326 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1351 $av = $st->{objs};
1208 } 1352 }
1209 1353
1210 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1213 1358
1214 ($data, $av) 1359 ($data, $av)
1215} 1360}
1216 1361
1217=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1273 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1274 1419
1275 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1276} 1421}
1277 1422
1423use File::Glob ();
1424
1278cf::player->attach ( 1425cf::player->attach (
1279 on_command => sub { 1426 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1281 1428
1282 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1283 or return; 1430 or return;
1284 1431
1307 1454
1308 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1309 if $reply; 1456 if $reply;
1310 1457
1311 } else { 1458 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1460 }
1314 1461
1315 cf::override; 1462 cf::override;
1316 }, 1463 },
1317); 1464);
1318 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1319sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1320 cf::sync_job { 1482 cf::sync_job {
1321 my %todo; 1483 my %todo;
1322 1484
1323 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1324 next unless -r $path; 1486 next unless -r $path;
1342 1504
1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1345 1507
1346 $ext{source} = 1508 $ext{source} =
1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1348 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1349 . $source 1511 . $source
1350 . "\n};\n1"; 1512 . "\n};\n1";
1351 1513
1352 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1353 } 1515 }
1354 1516
1517 my $pass = 0;
1355 my %done; 1518 my %done;
1356 while (%todo) { 1519 while (%todo) {
1357 my $progress; 1520 my $progress;
1358 1521
1522 ++$pass;
1523
1524 ext:
1359 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1527 next ext
1362 unless exists $done{$_}; 1528 unless exists $done{$_};
1363 } 1529 }
1364 1530
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1532
1367 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1537
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1539 if exists $v->{meta}{mandatory};
1375 1540
1376 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;
1377 } 1550 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1551 }
1383 1552
1384 skip: 1553 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1563 }
1388 }; 1564 };
1389} 1565}
1390 1566
1391############################################################################# 1567#############################################################################
1445 1621
1446sub exists($) { 1622sub exists($) {
1447 my ($login) = @_; 1623 my ($login) = @_;
1448 1624
1449 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1451} 1627}
1452 1628
1453sub find($) { 1629sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1631 my $login = $_[0];
1475 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1476 } 1652 }
1477 } 1653 }
1478} 1654}
1479 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
1480sub save($) { 1669sub save($) {
1481 my ($pl) = @_; 1670 my ($pl) = @_;
1482 1671
1483 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1484 1673
1489 1678
1490 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1492 1681
1493 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];
1494 1686
1495 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1688 cf::cede_to_tick;
1497} 1689}
1498 1690
1532 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1533 1725
1534 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1535 $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
1536 1728
1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1538 $pl->deactivate; 1730 $pl->deactivate;
1731
1539 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;
1540 $pl->ob->check_score;
1541 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1542 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1543 1737
1544 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1545 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1546 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1600 \@logins 1794 \@logins
1601} 1795}
1602 1796
1603=item $player->maps 1797=item $player->maps
1604 1798
1799=item cf::player::maps $login
1800
1605Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1606player. May block. 1802player. May block.
1607 1803
1608=cut 1804=cut
1609 1805
1671=cut 1867=cut
1672 1868
1673sub find_by_path($) { 1869sub find_by_path($) {
1674 my ($path) = @_; 1870 my ($path) = @_;
1675 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1676 my ($match, $specificity); 1874 my ($match, $specificity);
1677 1875
1678 for my $region (list) { 1876 for my $region (list) {
1679 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1680 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1708sub generate_random_map { 1906sub generate_random_map {
1709 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1710 1908
1711 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
1712 1910
1713 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1722 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1723 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1724 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1725 (cf::region::find $rmp->{region}), $rmp->{custom}
1726 )
1727} 1912}
1728 1913
1729=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1730 1915
1731Register 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
1736 1921
1737sub register { 1922sub register {
1738 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1739 my $pkg = caller; 1924 my $pkg = caller;
1740 1925
1741 no strict;
1742 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1743 1927
1744 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745} 1929}
1746 1930
1747# also paths starting with '/' 1931# also paths starting with '/'
1748$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749 1933
1750sub thawer_merge { 1934sub thawer_merge {
1751 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1752 1936
1753 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1758} 1942}
1759 1943
1760sub normalise { 1944sub normalise {
1761 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1762 1946
1763 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1764 1948
1765 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1766 1950
1767 # map plan: 1951 # map plan:
1768 # 1952 #
1783 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1784 $path = "$base/$path"; 1968 $path = "$base/$path";
1785 } 1969 }
1786 1970
1787 for ($path) { 1971 for ($path) {
1788 redo if s{//}{/};
1789 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1790 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1791 } 1974 }
1792 1975
1793 $path 1976 $path
1807 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1808 return $self; 1991 return $self;
1809 } 1992 }
1810 } 1993 }
1811 1994
1812 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1813 () 1996 ()
1814} 1997}
1815 1998
1999# may re-bless or do other evil things
1816sub init { 2000sub init {
1817 my ($self) = @_; 2001 my ($self) = @_;
1818 2002
1819 $self 2003 $self
1820} 2004}
1851 2035
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1854} 2038}
1855 2039
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 2040sub decay_objects {
1866 my ($self) = @_; 2041 my ($self) = @_;
1867 2042
1868 return if $self->{deny_reset}; 2043 return if $self->{deny_reset};
1869 2044
1894 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1895 2070
1896 1 2071 1
1897} 2072}
1898 2073
2074# used to laod the header of an original map
1899sub load_header_orig { 2075sub load_header_orig {
1900 my ($self) = @_; 2076 my ($self) = @_;
1901 2077
1902 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1903} 2079}
1904 2080
2081# used to laod the header of an instantiated map
1905sub load_header_temp { 2082sub load_header_temp {
1906 my ($self) = @_; 2083 my ($self) = @_;
1907 2084
1908 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1909} 2086}
1910 2087
2088# called after loading the header from an instantiated map
1911sub prepare_temp { 2089sub prepare_temp {
1912 my ($self) = @_; 2090 my ($self) = @_;
1913 2091
1914 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1915 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1916 # safety 2094 # safety
1917 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1918 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1919} 2097}
1920 2098
2099# called after loading the header from an original map
1921sub prepare_orig { 2100sub prepare_orig {
1922 my ($self) = @_; 2101 my ($self) = @_;
1923 2102
1924 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1925 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1949 2128
1950sub find; 2129sub find;
1951sub find { 2130sub find {
1952 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1953 2132
2133 cf::cede_to_tick;
2134
1954 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1955 2136
1956 cf::lock_wait "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2139
1959 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1964 or return; 2142 or return;
1965 2143
1966 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1967 2145
1979 2157
1980 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1981 } 2159 }
1982} 2160}
1983 2161
1984sub pre_load { } 2162sub pre_load { }
1985sub post_load { } 2163#sub post_load { } # XS
1986 2164
1987sub load { 2165sub load {
1988 my ($self) = @_; 2166 my ($self) = @_;
1989 2167
1990 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2002 $self->alloc; 2180 $self->alloc;
2003 2181
2004 $self->pre_load; 2182 $self->pre_load;
2005 cf::cede_to_tick; 2183 cf::cede_to_tick;
2006 2184
2185 if (exists $self->{load_path}) {
2007 my $f = new_from_file cf::object::thawer $self->{load_path}; 2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2008 $f->skip_block; 2187 $f->skip_block;
2009 $self->_load_objects ($f) 2188 $self->_load_objects ($f)
2010 or return; 2189 or return;
2011 2190
2012 $self->post_load_original 2191 $self->post_load_original
2013 if delete $self->{load_original}; 2192 if delete $self->{load_original};
2014 2193
2015 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
2016 utf8::encode $uniq; 2195 utf8::encode $uniq;
2017 unless (aio_stat $uniq) { 2196 unless (aio_stat $uniq) {
2018 if (my $f = new_from_file cf::object::thawer $uniq) { 2197 if (my $f = new_from_file cf::object::thawer $uniq) {
2019 $self->clear_unique_items; 2198 $self->clear_unique_items;
2020 $self->_load_objects ($f); 2199 $self->_load_objects ($f);
2021 $f->resolve_delayed_derefs; 2200 $f->resolve_delayed_derefs;
2201 }
2022 } 2202 }
2023 } 2203 }
2024 }
2025 2204
2026 $f->resolve_delayed_derefs; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2027 2210
2028 cf::cede_to_tick; 2211 cf::cede_to_tick;
2029 # now do the right thing for maps 2212 # now do the right thing for maps
2030 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2031 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2035 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2219 $self->decay_objects;
2037 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2038 $self->update_buttons; 2221 $self->update_buttons;
2039 cf::cede_to_tick; 2222 cf::cede_to_tick;
2040 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
2041 cf::cede_to_tick;
2042 $self->activate;
2043 } 2224 }
2044 2225
2045 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2047 2228
2048 $self->in_memory (cf::MAP_ACTIVE); 2229 $self->in_memory (cf::MAP_ACTIVE);
2049 } 2230 }
2050 2231
2051 $self->post_load; 2232 $self->post_load;
2052}
2053 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
2054sub customise_for { 2240sub customise_for {
2055 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
2056 2242
2057 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2244 if $self->per_player;
2074 or next; 2260 or next;
2075 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
2076 or next; 2262 or next;
2077 $neigh->load; 2263 $neigh->load;
2078 2264
2265 # now find the diagonal neighbours
2079 push @neigh, 2266 push @neigh,
2080 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2081 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2082 } 2269 }
2083 2270
2090} 2277}
2091 2278
2092sub find_sync { 2279sub find_sync {
2093 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
2094 2281
2095 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
2096} 2286}
2097 2287
2098sub do_load_sync { 2288sub do_load_sync {
2099 my ($map) = @_; 2289 my ($map) = @_;
2100 2290
2101 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2102 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2103 2293
2104 cf::sync_job { $map->load }; 2294 $map->load;
2105} 2295}
2106 2296
2107our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2108our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2109 2299
2110sub find_async { 2300sub find_async {
2111 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2112 2302
2113 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2114 2304
2115 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2116 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2117 } 2307 }
2118 2308
2135 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2136 2326
2137 () 2327 ()
2138} 2328}
2139 2329
2330# common code, used by both ->save and ->swapout
2140sub save { 2331sub _save {
2141 my ($self) = @_; 2332 my ($self) = @_;
2142
2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
2144 2333
2145 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2146 2335
2147 return unless $self->dirty; 2336 return unless $self->dirty;
2148 2337
2168 } else { 2357 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2359 }
2171} 2360}
2172 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2173sub swap_out { 2370sub swap_out {
2174 my ($self) = @_; 2371 my ($self) = @_;
2175 2372
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2374
2181 return if $self->players;
2182 return if $self->in_memory != cf::MAP_ACTIVE; 2375 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2376 return if $self->{deny_save};
2377 return if $self->players;
2184 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2186 2429
2187 $self->deactivate; 2430 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2432 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2433
2235 $self->unlink_save; 2434 $self->unlink_save;
2236 $self->destroy; 2435 $self->destroy;
2237} 2436}
2238 2437
2246 2445
2247 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2248 2447
2249 $self->unlink_save; 2448 $self->unlink_save;
2250 2449
2251 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2455
2313 : normalise $_ 2512 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2514 ]
2316} 2515}
2317 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2318=back 2549=back
2319 2550
2320=head3 cf::object 2551=head3 cf::object
2321 2552
2322=cut 2553=cut
2387 2618
2388our $SAY_CHANNEL = { 2619our $SAY_CHANNEL = {
2389 id => "say", 2620 id => "say",
2390 title => "Map", 2621 title => "Map",
2391 reply => "say ", 2622 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2624};
2394 2625
2395our $CHAT_CHANNEL = { 2626our $CHAT_CHANNEL = {
2396 id => "chat", 2627 id => "chat",
2397 title => "Chat", 2628 title => "Chat",
2454 2685
2455Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2456 2687
2457The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2458for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2460map. 2691map.
2461 2692
2462Will never block. 2693Will never block.
2463 2694
2464=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2485sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2486 my ($self) = @_; 2717 my ($self) = @_;
2487 2718
2488 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2489 2720
2721 ++$self->{_link_recursion};
2722
2490 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2491 2724
2492 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2494 2727
2495 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2496} 2729}
2497 2730
2498sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2499 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2500 2733
2517 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2519 2752
2520 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2523 2756
2524 $map->load; 2757 $map->load;
2525 $map->load_neighbours; 2758 $map->load_neighbours;
2526 2759
2527 return unless $self->contr->active; 2760 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2761
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2533} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2534 2769
2770}
2771
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2773
2537Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2547 2784
2548our $GOTOGEN; 2785our $GOTOGEN;
2549 2786
2550sub cf::object::player::goto { 2787sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2552 2795
2553 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2798
2556 $self->enter_link; 2799 $self->enter_link;
2576 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2577 } 2820 }
2578 } 2821 }
2579 2822
2580 my $map = eval { 2823 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2582 2825
2583 if ($map) { 2826 if ($map) {
2584 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2829 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2831 }
2589 2832
2590 $map 2833 $map
2598 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2601 } 2844 }
2602 2845
2603 $done->() if $done; 2846 $done->($self) if $done;
2604 })->prio (1); 2847 })->prio (1);
2605} 2848}
2606 2849
2607=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2608 2851
2676 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2677 2920
2678 unless (eval { 2921 unless (eval {
2679 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2680 2923
2681 # random map handling
2682 {
2683 my $guard = cf::lock_acquire "exit_prepare:$exit";
2684
2685 prepare_random_map $exit
2686 if $exit->slaying eq "/!";
2687 }
2688
2689 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2690 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2691 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2692 2948
2693 $self->goto ($map, $x, $y); 2949 $self->goto ($map, $x, $y);
2694 2950
2695 # if exit is damned, update players death & WoR home-position 2951 # if exit is damned, update players death & WoR home-position
2696 $self->contr->savebed ($map, $x, $y) 2952 $self->contr->savebed ($map, $x, $y)
2701 $self->message ("Something went wrong deep within the deliantra server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2705 2961
2706 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2707 $self->leave_link; 2963 $self->leave_link;
2708 } 2964 }
2709 })->prio (1); 2965 })->prio (1);
2710} 2966}
2711 2967
2723sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2725 2981
2726 utf8::encode $text; 2982 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2984}
2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
2728} 3009}
2729 3010
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 3012
2732Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2736 3017
2737=cut 3018=cut
2738 3019
2739# non-persistent channels (usually the info channel) 3020# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
2741 "c/identify" => { 3028 "c/identify" => {
2742 id => "infobox", 3029 id => "infobox",
2743 title => "Identify", 3030 title => "Identify",
2744 reply => undef, 3031 reply => undef,
2745 tooltip => "Items recently identified", 3032 tooltip => "Items recently identified",
2747 "c/examine" => { 3034 "c/examine" => {
2748 id => "infobox", 3035 id => "infobox",
2749 title => "Examine", 3036 title => "Examine",
2750 reply => undef, 3037 reply => undef,
2751 tooltip => "Signs and other items you examined", 3038 tooltip => "Signs and other items you examined",
3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 3045 },
2753 "c/book" => { 3046 "c/book" => {
2754 id => "infobox", 3047 id => "infobox",
2755 title => "Book", 3048 title => "Book",
2756 reply => undef, 3049 reply => undef,
2772 id => "infobox", 3065 id => "infobox",
2773 title => "Body Parts", 3066 title => "Body Parts",
2774 reply => undef, 3067 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 3068 tooltip => "Shows which body parts you posess and are available",
2776 }, 3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
2777 "c/skills" => { 3076 "c/skills" => {
2778 id => "infobox", 3077 id => "infobox",
2779 title => "Skills", 3078 title => "Skills",
2780 reply => undef, 3079 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
2782 }, 3105 },
2783 "c/uptime" => { 3106 "c/uptime" => {
2784 id => "infobox", 3107 id => "infobox",
2785 title => "Uptime", 3108 title => "Uptime",
2786 reply => undef, 3109 reply => undef,
2796 id => "party", 3119 id => "party",
2797 title => "Party", 3120 title => "Party",
2798 reply => "gsay ", 3121 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 3122 tooltip => "Messages and chat related to your party",
2800 }, 3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
2801); 3132);
2802 3133
2803sub cf::client::send_msg { 3134sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3136
2810 3141
2811 # check predefined channels, for the benefit of C 3142 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 3143 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 3144 $channel = $CHANNEL{$channel};
2814 3145
2815 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3147 $channel = $channel->{id};
2819 3148
2820 } elsif (ref $channel) { 3149 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3153 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3154 }
2827 3155
2828 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2829 } 3157 }
2830 3158
2831 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2832 3160
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3161 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3163 if $color & cf::NDI_DEF;
2837 3164
2838 my $pkt = "msg " 3165 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3166 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3168 );
2842 3169
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3170 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3171}
2880 3172
2881=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2882 3174
2883Sends an ext event to the client. 3175Sends an ext event to the client.
2886 3178
2887sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2889 3181
2890 if ($self->extcmd == 2) { 3182 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 } 3187 }
2896} 3188}
2897 3189
2898=item $client->ext_reply ($msgid, @msg) 3190=item $client->ext_reply ($msgid, @msg)
2899 3191
2903 3195
2904sub cf::client::ext_reply($$@) { 3196sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_; 3197 my ($self, $id, @msg) = @_;
2906 3198
2907 if ($self->extcmd == 2) { 3199 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) { 3201 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove 3202 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id; 3203 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3205 }
2914} 3206}
2915 3207
2916=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2917 3209
2988 3280
2989 $ns->ext_reply ($reply, @reply) 3281 $ns->ext_reply ($reply, @reply)
2990 if $reply; 3282 if $reply;
2991 3283
2992 } else { 3284 } else {
2993 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2994 } 3286 }
2995 3287
2996 cf::override; 3288 cf::override;
2997 }, 3289 },
2998); 3290);
3018 3310
3019 $coro 3311 $coro
3020} 3312}
3021 3313
3022cf::client->attach ( 3314cf::client->attach (
3023 on_destroy => sub { 3315 on_client_destroy => sub {
3024 my ($ns) = @_; 3316 my ($ns) = @_;
3025 3317
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3319 },
3028); 3320);
3044our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
3045 3337
3046$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
3047 3339
3048$safe->permit_only (Opcode::opset qw( 3340$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3341 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3342 grepstart grepwhile mapstart mapwhile
3051 sort time 3343 sort time
3052)); 3344));
3053 3345
3054# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
3059 3351
3060 cf::object 3352 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3353 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3354 insert remove name archname title slaying race decrease split
3355 value
3063 3356
3064 cf::object::player 3357 cf::object::player
3065 player 3358 player
3066 3359
3067 cf::player 3360 cf::player
3073=cut 3366=cut
3074 3367
3075for ( 3368for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3370 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3371 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
3082) { 3375) {
3083 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3086 for @funs; 3378 for @funs;
3087} 3379}
3088 3380
3103 3395
3104 my $qcode = $code; 3396 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
3107 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
3108 local $_; 3403 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3404
3111 my $eval = 3405 my $eval =
3112 "do {\n" 3406 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3409 . $code
3116 . "\n}" 3410 . "\n}"
3117 ; 3411 ;
3118 3412
3413 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
3122 3422
3123 if ($@) { 3423 if ($@) {
3124 warn "$@"; 3424 warn "$@",
3125 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
3127 } 3427 }
3128 3428
3129 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
3130} 3430}
3131 3431
3145=cut 3445=cut
3146 3446
3147sub register_script_function { 3447sub register_script_function {
3148 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
3149 3449
3150 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
3152} 3452}
3153 3453
3154=back 3454=back
3155 3455
3156=cut 3456=cut
3165 # for this (global event?) 3465 # for this (global event?)
3166 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3167 3467
3168 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3169 3469
3170 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
3171 3471
3172 my $facedata; 3472 my $facedata = decode_storable load_file $path;
3173 0 < aio_load $path, $facedata
3174 or die "$path: $!";
3175
3176 $facedata = Coro::Storable::thaw $facedata;
3177 3473
3178 $facedata->{version} == 2 3474 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3476
3181 # patch in the exptable 3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3182 $facedata->{resource}{"res/exp_table"} = { 3479 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC, 3480 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3185 }; 3483 };
3186 cf::cede_to_tick; 3484 cf::cede_to_tick;
3187 3485
3188 { 3486 {
3189 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
3191 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3491
3194 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3198 3497
3199 cf::cede_to_tick; 3498 cf::cede_to_tick;
3200 } 3499 }
3201 3500
3202 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
3207 3506
3208 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
3209 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
3210 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3211 } else { 3510 } else {
3212 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
3213 } 3512 }
3214 3513
3215 cf::cede_to_tick; 3514 cf::cede_to_tick;
3216 } 3515 }
3217 } 3516 }
3226 3525
3227 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
3228 } 3527 }
3229 3528
3230 { 3529 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
3234 3531
3235 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3533 if (defined $info->{type}) {
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3535
3240 if ($info->{type} & 1) { 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3537 cf::face::set_type $idx, $info->{type};
3255 } else { 3538 } else {
3256 $RESOURCE{$name} = $info; 3539 $RESOURCE{$name} = $info; # unused
3257 } 3540 }
3258 3541
3259 cf::cede_to_tick; 3542 cf::cede_to_tick;
3260 } 3543 }
3261 } 3544 }
3262 3545
3263 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264 3547
3265 1 3548 1
3266} 3549}
3267
3268cf::global->attach (on_resource_update => sub {
3269 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273 my $sound = $soundconf->{compat}[$_]
3274 or next;
3275
3276 my $face = cf::face::find "sound/$sound->[1]";
3277 cf::sound::set $sound->[0] => $face;
3278 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279 }
3280
3281 while (my ($k, $v) = each %{$soundconf->{event}}) {
3282 my $face = cf::face::find "sound/$v";
3283 cf::sound::set $k => $face;
3284 }
3285 }
3286});
3287 3550
3288register_exticmd fx_want => sub { 3551register_exticmd fx_want => sub {
3289 my ($ns, $want) = @_; 3552 my ($ns, $want) = @_;
3290 3553
3291 while (my ($k, $v) = each %$want) { 3554 while (my ($k, $v) = each %$want) {
3330sub reload_treasures { 3593sub reload_treasures {
3331 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
3332 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
3333} 3596}
3334 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
3335sub reload_resources { 3618sub reload_resources {
3336 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
3337 3620
3621 reload_exp_table;
3622 reload_materials;
3338 reload_facedata; 3623 reload_facedata;
3624 reload_sound;
3339 reload_archetypes; 3625 reload_archetypes;
3340 reload_regions; 3626 reload_regions;
3341 reload_treasures; 3627 reload_treasures;
3342 3628
3343 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
3344}
3345
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352} 3630}
3353 3631
3354sub reload_config { 3632sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3633 trace "reloading config file...\n";
3356 or return;
3357 3634
3358 local $/; 3635 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3636 utf8::decode $config;
3637 *CFG = decode_yaml $config;
3360 3638
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3640
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3643
3366 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
3389 3667
3390 seek $fh, 0, 0; 3668 seek $fh, 0, 0;
3391 print $fh $$; 3669 print $fh $$;
3392} 3670}
3393 3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
3394sub main { 3681sub main {
3395 atomic; 3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3690
3397 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3694 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3696 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
3404 }; 3698 };
3405 3699
3406 { 3700 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3408 reload_config; 3712 reload_config;
3409 db_init; 3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
3410 load_extensions; 3723 load_extensions;
3411 3724
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3725 utime time, time, $RUNTIMEFILE;
3416 3726
3417 # no (long-running) fork's whatsoever before this point(!) 3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3730
3420 EV::loop; 3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
3421} 3743}
3422 3744
3423############################################################################# 3745#############################################################################
3424# initialisation and cleanup 3746# initialisation and cleanup
3425 3747
3426# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
3427BEGIN { 3749BEGIN {
3428 our %SIGWATCHER = (); 3750 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
3432 }; 3754 };
3433 } 3755 }
3434} 3756}
3435 3757
3436sub write_runtime_sync { 3758sub write_runtime_sync {
3759 my $t0 = AE::time;
3760
3437 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3439 3763
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3765
3442 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3443 3767
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3769 or return;
3446 3770
3447 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3462 or return; 3786 or return;
3463 3787
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3789 and return;
3466 3790
3467 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3792
3469 1 3793 1
3470} 3794}
3471 3795
3472our $uuid_lock; 3796our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3805 my $uuid = "$LOCALDIR/uuid";
3482 3806
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3808 or return;
3485 3809
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3818 $uuid_skip = 0;
3488 3819
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3821 and return;
3491 3822
3497 or return; 3828 or return;
3498 3829
3499 aio_rename "$uuid~", $uuid 3830 aio_rename "$uuid~", $uuid
3500 and return; 3831 and return;
3501 3832
3502 warn "uuid file written ($value).\n"; 3833 trace "uuid file written ($value).\n";
3503 3834
3504 1 3835 1
3505 3836
3506} 3837}
3507 3838
3513} 3844}
3514 3845
3515sub emergency_save() { 3846sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3517 3848
3518 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
3519 3855
3520 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3521 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3865 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3867 $pl->save;
3530 } 3868 }
3531 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3532 3870
3533 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 3876 $map->valid or next;
3537 $map->save; 3877 $map->save;
3538 } 3878 }
3539 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3540 3880
3541 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3544 3886
3545 warn "begin write uuid\n"; 3887 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 3888 write_uuid_sync 1;
3547 warn "end write uuid\n"; 3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 3909 };
3549 3910
3550 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3551} 3912}
3552 3913
3553sub post_cleanup { 3914sub post_cleanup {
3554 my ($make_core) = @_; 3915 my ($make_core) = @_;
3555 3916
3917 IO::AIO::flush;
3918
3556 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3557 if $make_core; 3920 if $make_core;
3558 3921
3559 my $fh = pidfile; 3922 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$; 3923 unlink $PIDFILE if <$fh> == $$;
3561} 3924}
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) { 3945 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"}; 3946 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 } 3948 }
3586 warn "cleared package $pkg\n";#d#
3587} 3949}
3588 3950
3589sub do_reload_perl() { 3951sub do_reload_perl() {
3590 # can/must only be called in main 3952 # can/must only be called in main
3591 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3592 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3593 return; 3955 return;
3594 } 3956 }
3595 3957
3596 return if $RELOAD++; 3958 return if $RELOAD++;
3597 3959
3960 my $t1 = AE::time;
3961
3598 while ($RELOAD) { 3962 while ($RELOAD) {
3599 warn "reloading..."; 3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3600 3965
3601 warn "entering sync_job"; 3966 trace "perl_reload: entering sync_job";
3602 3967
3603 cf::sync_job { 3968 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3969 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 3970
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 while (IO::AIO::nreqs || BDB::nreqs) {
3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = (); 3973 %EXT_CORO = ();
3621 3974
3622 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3623 %COMMAND = (); 3976 %COMMAND = ();
3624 3977
3625 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3626 %EXTCMD = (); 3979 %EXTCMD = ();
3627 %EXTICMD = (); 3980 %EXTICMD = ();
3628 3981
3629 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3630 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3632 3985
3633 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3634 eval { 3987 eval {
3635 $cb->($pkg); 3988 $cb->($pkg);
3636 1 3989 1
3637 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3638 } 3991 }
3639 3992
3640 warn "... clearing $pkg"; 3993 trace "... clearing $pkg";
3641 clear_package $pkg; 3994 clear_package $pkg;
3642 } 3995 }
3643 3996
3644 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 4000
3648 warn "... unloading $k"; 4001 trace "... unloading $k";
3649 delete $INC{$k}; 4002 delete $INC{$k};
3650 4003
3651 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3653 4006
3656 } 4009 }
3657 4010
3658 clear_package $k; 4011 clear_package $k;
3659 } 4012 }
3660 4013
3661 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3662 clear_package "safe::$_" 4015 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 4017
3665 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 4021
3669 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3670 # and global variables created in xs 4023 # and global variables created in xs
3671 #clear_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3672 4025
3673 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3674 4027
3675 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3676 require cf; 4029 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3678 4031
3679 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3680 cf::reload_config; 4033 cf::reload_config;
3681 4034
3682 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3683 cf::load_extensions; 4036 cf::load_extensions;
3684 4037
4038 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3688 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3691 4046
3692 warn "leaving sync_job"; 4047 cf::_post_init 1;
4048
4049 trace "perl_reload: leaving sync_job";
3693 4050
3694 1 4051 1
3695 } or do { 4052 } or do {
3696 warn $@; 4053 error $@;
3697 cf::cleanup "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3698 }; 4055 };
3699 4056
3700 warn "reloaded";
3701 --$RELOAD; 4057 --$RELOAD;
3702 } 4058 }
4059
4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3703}; 4062};
3704 4063
3705our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3706 4065
3707sub reload_perl() { 4066sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3710 4069
4070 $RELOAD_WATCHER ||= cf::async {
4071 Coro::AIO::aio_wait cache_extensions;
4072
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4074 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
4076 };
3714 }; 4077 };
3715} 4078}
3716 4079
3717register_command "reload" => sub { 4080register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3724 reload_perl; 4087 reload_perl;
3725 }; 4088 };
3726 } 4089 }
3727}; 4090};
3728 4091
3729unshift @INC, $LIBDIR; 4092#############################################################################
3730 4093
3731my $bug_warning = 0; 4094my $bug_warning = 0;
3732 4095
3733our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3735 4098
3736sub wait_for_tick { 4099sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 4101
3739 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 4104 $signal->wait;
3742} 4105}
3743 4106
3744sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 4109
3747 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4112 $signal->wait;
3750} 4113}
3756 return; 4119 return;
3757 } 4120 }
3758 4121
3759 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3760 4123
4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4125
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4128 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4129 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4130 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4131 or error "ERROR: unable to write runtime file: $!";
3767 }; 4132 };
3768 } 4133 }
3769 4134
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4136 $sig->send;
3779 4144
3780 if (0) { 4145 if (0) {
3781 if ($NEXT_TICK) { 4146 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4147 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4149 debug "jitter $JITTER\n";#d#
3785 } 4150 }
3786 } 4151 }
3787} 4152}
3788 4153
3789{ 4154{
3790 # configure BDB 4155 # configure BDB
3791 4156
3792 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4158 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4159 $AnyEvent::BDB::WATCHER->priority (1);
3795 4160
3796 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
3834 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3835 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3836 undef $AnyEvent::AIO::WATCHER; 4201 undef $AnyEvent::AIO::WATCHER;
3837} 4202}
3838 4203
3839my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3840 4206
3841sub _log_backtrace { 4207sub _log_backtrace {
3842 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3843 4209
3844 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3845 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3846 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3847 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3848 ++$_log_backtrace; 4218 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg; 4219 my $perl_bt = Carp::longmess $msg;
3850 async { 4220 async {
3851 $Coro::current->{desc} = "abt $msg"; 4221 $Coro::current->{desc} = "abt $msg";
3852 4222
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 4243 --$_log_backtrace;
3874 }; 4244 };
3875 } else { 4245 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3878 } 4248 }
3879} 4249}
3880 4250
3881# load additional modules 4251# load additional modules
3882use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3883 4254
3884END { cf::emergency_save } 4255END { cf::emergency_save }
3885 4256
38861 42571
3887 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines