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.316 by root, Mon Jul 23 21:02:50 2007 UTC vs.
Revision 1.567 by root, Mon May 2 16:16:00 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::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
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
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;
74 120
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 123our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
82 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
85 132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME;
137our $NOW;
90 138
91our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
94 142
95# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 145
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
100our $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 :)
101 155
102binmode STDOUT; 156binmode STDOUT;
103binmode STDERR; 157binmode STDERR;
104 158
105# read virtual server time, if available 159# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
110} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
111 167
112mkdir $_ 168mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 170
115our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
116 172
117sub 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::"} };
118 189
119############################################################################# 190#############################################################################
120 191
121=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
122 193
158 229
159The raw value load value from the last tick. 230The raw value load value from the last tick.
160 231
161=item %cf::CFG 232=item %cf::CFG
162 233
163Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 235from wherever your confdir points to.
165 236
166=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
167 238
168These 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
169returns 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
170per 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.
171 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
172=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
173 249
174This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
175C<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
176that call. 252that call.
177 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
178=back 260=back
179 261
180=cut 262=cut
181 263
182BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
183 *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 {
184 my $msg = join "", @_; 271 my $msg = join "", @_;
185 272
186 $msg .= "\n" 273 $msg .= "\n"
187 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
188 275
189 $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;
190 277
191 utf8::encode $msg;
192 LOG llevError, $msg; 278 LOG llevWarn, $msg;
193 }; 279};
194} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
195 294
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 305for my $pkg (qw(
207 cf::global cf::attachable 306 cf::global cf::attachable
208 cf::object cf::object::player 307 cf::object cf::object::player
209 cf::client cf::player 308 cf::client cf::player
210 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
211 cf::map cf::party cf::region 311 cf::party cf::region
212)) { 312)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 314}
216 315
217$Event::DIED = sub { 316$EV::DIED = sub {
218 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
219}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
220 324
221############################################################################# 325#############################################################################
222 326
223=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
224 328
245 $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;
246 $d 350 $d
247 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
248} 352}
249 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
250=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
251 369
252Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
253 371
254=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
255 373
256Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
257 375
258=cut 376=cut
259 377
260our $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
261 379
262sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
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}
264 444
265=item cf::lock_wait $string 445=item cf::lock_wait $string
266 446
267Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
268 448
269=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
270 450
271Wait 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
272a 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,
273for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
274returned. 454returned.
275 455
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
276Lock names should begin with a unique identifier (for example, cf::map::find 459Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
278 461
279=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
280 463
281Return 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.
282 465
283=cut 466=cut
284 467
285our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
286 469
287sub lock_wait($) { 470sub lock_wait($) {
288 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 472}
296 473
297sub lock_acquire($) { 474sub lock_acquire($) {
298 my ($key) = @_; 475 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 476}
310 477
311sub lock_active($) { 478sub lock_active($) {
312 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 480}
316 481
317sub freeze_mainloop { 482sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
319 484
320 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 486}
322 }; 487
323 $TICK_WATCHER->stop; 488=item cf::periodic $interval, $cb
324 $guard 489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
325} 501}
326 502
327=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
328 504
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
330This 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
331of 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.
332 512
333The 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
334used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
335 515
336Useful for short background jobs. 516Useful for short background jobs.
337 517
338=cut 518=cut
339 519
340our @SLOT_QUEUE; 520our @SLOT_QUEUE;
341our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
342 523
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
345 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
346 530
347 while () { 531 while () {
348 next_job: 532 next_job:
533
349 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
350 if ($avail > 0.01) { 535
351 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
353 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send; 540 $job->[2]->send;
355 Coro::cede; 541 Coro::cede;
356 goto next_job; 542 goto next_job;
357 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
358 } 545 }
359 } 546 }
360 547
361 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
362 # 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
363 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 551 $signal->wait;
365 } else { 552 } else {
553 $busy = 0;
366 Coro::schedule; 554 Coro::schedule;
367 } 555 }
368 } 556 }
369}; 557};
370 558
371sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
372 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
373 563
374 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
375 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
376 567
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
390 581
391BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
392 583
393=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
394 585
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 589acceptable.
399 590
400If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
405=cut 596=cut
406 597
407sub sync_job(&) { 598sub sync_job(&) {
408 my ($job) = @_; 599 my ($job) = @_;
409 600
410 if ($Coro::current == $Coro::main) { 601 if (in_main) {
411 my $time = Event::time; 602 my $time = AE::time;
412 603
413 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
415 606
416 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 608
418 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
419 610
420 my $busy = 1; 611 my $busy = 1;
421 my @res; 612 my @res;
422 613
423 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 616 @res = eval { $job->() };
425 warn $@ if $@; 617 error $@ if $@;
426 undef $busy; 618 undef $busy;
427 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
428 620
429 while ($busy) { 621 while ($busy) {
430 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
431 } 626 }
627 }
432 628
433 $time = Event::time - $time; 629 my $time = AE::time - $time;
434 630
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
439 632
440 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
441 } else { 634 } else {
442 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
443 636
463 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
464 657
465 $coro 658 $coro
466} 659}
467 660
468=item fork_call { }, $args 661=item fork_call { }, @args
469 662
470Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
474 667
475=cut 668=cut
476 669
477sub _store_scalar { 670sub post_fork {
478 open my $fh, ">", \my $buf 671 reset_signals;
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484} 672}
485 673
486sub fork_call(&@) { 674sub fork_call(&@) {
487 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
488 676
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 677 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 678 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 679 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 680
494 if (my $pid = fork) { 681 my @res = Coro::Util::fork_eval {
495 close $fh2; 682 cf::post_fork;
683 &$cb
684 } @args;
496 685
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 686 wantarray ? @res : $res[-1]
498 warn "pst<$res>" unless $res =~ /^pst/; 687}
499 $res = Coro::Storable::thaw $res;
500 688
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 689sub objinfo {
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals;
508 local $SIG{__WARN__};
509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
516 eval {
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 } 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 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
528} 725}
529 726
530=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
531 728
532Returns a single value from the environment database. 729Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
535 732
536Stores the given C<$value> in the family. It can currently store binary 733Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 734data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 735
736=item $db = cf::db_table "name"
737
738Create and/or open a new database table. The string must not be "db" and must be unique
739within each server.
740
539=cut 741=cut
742
743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
747 my ($name) = @_;
748 my $db = BDB::db_create $DB_ENV;
749
750 eval {
751 $db->set_flags (BDB::CHKSUM);
752
753 utf8::encode $name;
754 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
755 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
756 cf::cleanup "db_open(db): $!" if $!;
757 };
758 cf::cleanup "db_open(db): $@" if $@;
759
760 $db
761}
540 762
541our $DB; 763our $DB;
542 764
543sub db_init { 765sub db_init {
544 unless ($DB) { 766 $DB ||= db_table "db";
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job {
548 eval {
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 }
558} 767}
559 768
560sub db_get($$) { 769sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
562 771
563 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
564 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
565 776
566 $! ? () 777 $! ? ()
567 : $data 778 : $data
568 }
569} 779}
570 780
571sub db_put($$$) { 781sub db_put($$$) {
572 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
573 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
601 811
602 my @data; 812 my @data;
603 my $md5; 813 my $md5;
604 814
605 for (0 .. $#$src) { 815 for (0 .. $#$src) {
606 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
607 or Carp::croak "$src->[$_]: $!";
608 } 817 }
609 818
610 # if processing is expensive, check 819 # if processing is expensive, check
611 # checksum first 820 # checksum first
612 if (1) { 821 if (1) {
613 $md5 = 822 $md5 =
614 join "\x00", 823 join "\x00",
615 $processversion, 824 $processversion,
616 map { 825 map {
617 Coro::cede; 826 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 828 } 0.. $#$src;
620 829
621 830
622 my $dbmd5 = db_get cache => "$id/md5"; 831 my $dbmd5 = db_get cache => "$id/md5";
629 838
630 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
631 my $data = $process->(\@data); 840 my $data = $process->(\@data);
632 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
633 842
634 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
635 844
636 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
637 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
638 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
639 848
649 858
650=cut 859=cut
651 860
652sub datalog($@) { 861sub datalog($@) {
653 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
654 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
655} 864}
656 865
657=back 866=back
658 867
659=cut 868=cut
660 869
661############################################################################# 870#############################################################################
662 871
663=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
664 873
665Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
668 877
669In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 880Deliantra).
672 881
673=over 4 882=over 4
674 883
675=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
676 885
720=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
721 930
722Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
724 933
725Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
727 936
728These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
729 938
730=over 4 939=over 4
854 1063
855 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
856 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
857 1066
858 } elsif (ref $type) { 1067 } elsif (ref $type) {
859 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
860 1069
861 } else { 1070 } else {
862 shift @arg; 1071 shift @arg;
863 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
864 } 1073 }
865 } 1074 }
866} 1075}
867 1076
868sub _object_attach { 1077sub _object_attach {
878 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
879 } 1088 }
880 1089
881 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
882 } else { 1091 } else {
883 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
884 } 1093 }
885 1094
886 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
887} 1096}
888 1097
947 1156
948 for (@$callbacks) { 1157 for (@$callbacks) {
949 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
950 1159
951 if ($@) { 1160 if ($@) {
952 warn "$@";
953 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
954 override; 1162 override;
955 } 1163 }
956 1164
957 return 1 if $override; 1165 return 1 if $override;
958 } 1166 }
959 1167
960 0 1168 0
961} 1169}
962 1170
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1172
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1174
967Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
968 1176
974 1182
975=cut 1183=cut
976 1184
977############################################################################# 1185#############################################################################
978# object support 1186# object support
979#
980 1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
981sub _can_merge { 1221sub _can_merge {
982 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
983 1223
984 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1225
988 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
989} 1228}
990 1229
991sub reattach { 1230sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1232 my ($obj) = @_;
994 1233
1234 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1236
997 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
998 1238
999 @$registry = (); 1239 @$registry = ();
1000 1240
1005 for (@$attach) { 1245 for (@$attach) {
1006 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1007 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1008 } 1248 }
1009 } else { 1249 } else {
1010 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1011 } 1251 }
1012 } 1252 }
1013} 1253}
1014 1254
1015cf::attachable->attach ( 1255cf::attachable->attach (
1016 prio => -1000000, 1256 prio => -1000000,
1017 on_instantiate => sub { 1257 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1019 1259
1020 $data = from_json $data; 1260 $data = decode_json $data;
1021 1261
1022 for (@$data) { 1262 for (@$data) {
1023 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1024 1264
1025 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1281sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1043 1283
1044 sync_job { 1284 sync_job {
1045 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1048 1290
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 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 }
1053 close $fh; 1298 aio_close $fh;
1054 1299
1055 if (@$objs) { 1300 if (@$objs) {
1056 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) {
1057 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1060 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 }
1061 close $fh; 1309 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1311 }
1064 } else { 1312 } else {
1065 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1066 } 1314 }
1067 1315
1068 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1320 } else {
1070 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1071 } 1322 }
1072 } else { 1323 } else {
1073 aio_unlink $filename; 1324 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1075 } 1326 }
1076 } 1327 };
1077} 1328}
1078 1329
1079sub object_freezer_as_string { 1330sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1081 1332
1093 or return; 1344 or return;
1094 1345
1095 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1348 or return;
1349
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1099 } 1352 }
1100 1353
1354 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
1103 return ($data, $av); 1359 ($data, $av)
1104} 1360}
1105 1361
1106=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1107 1363
1108=over 4 1364=over 4
1162 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1163 1419
1164 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1165} 1421}
1166 1422
1423use File::Glob ();
1424
1167cf::player->attach ( 1425cf::player->attach (
1168 on_command => sub { 1426 on_unknown_command => sub {
1169 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1170 1428
1171 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1172 or return; 1430 or return;
1173 1431
1186 my ($type, $reply, @payload) = 1444 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1445 "ARRAY" eq ref $msg
1188 ? @$msg 1446 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1448
1449 my @reply;
1450
1191 if (my $cb = $EXTCMD{$type}) { 1451 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1452 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
1197 } else { 1458 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1460 }
1200 1461
1201 cf::override; 1462 cf::override;
1202 }, 1463 },
1203); 1464);
1204 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
1205sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1206 cf::sync_job { 1482 cf::sync_job {
1207 my %todo; 1483 my %todo;
1208 1484
1209 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1210 next unless -r $path; 1486 next unless -r $path;
1228 1504
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1507
1232 $ext{source} = 1508 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1234 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1235 . $source 1511 . $source
1236 . "\n};\n1"; 1512 . "\n};\n1";
1237 1513
1238 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1239 } 1515 }
1240 1516
1517 my $pass = 0;
1241 my %done; 1518 my %done;
1242 while (%todo) { 1519 while (%todo) {
1243 my $progress; 1520 my $progress;
1244 1521
1522 ++$pass;
1523
1524 ext:
1245 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1527 next ext
1248 unless exists $done{$_}; 1528 unless exists $done{$_};
1249 } 1529 }
1250 1530
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1532
1253 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1258 warn $msg; 1540
1259 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1542 delete $todo{$k};
1261 } 1543 } else {
1262 1544 $done{$k} = delete $todo{$k};
1263 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1264 } 1550 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1551 }
1270 1552
1271 skip: 1553 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 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 }
1274 } 1563 }
1275 }; 1564 };
1276} 1565}
1277 1566
1278############################################################################# 1567#############################################################################
1279 1568
1280=back 1569=back
1281 1570
1282=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1283 1572
1284Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1285 1574
1286=cut 1575=cut
1287 1576
1288package cf::player; 1577package cf::player;
1289 1578
1290use Coro::AIO; 1579use Coro::AIO;
1291 1580
1292=head3 cf::player 1581=head3 cf::player
1293 1582
1294=over 4 1583=over 4
1584
1585=item cf::player::num_playing
1586
1587Returns the official number of playing players, as per the Crossfire metaserver rules.
1588
1589=cut
1590
1591sub num_playing {
1592 scalar grep
1593 $_->ob->map
1594 && !$_->hidden
1595 && !$_->ob->flag (cf::FLAG_WIZ),
1596 cf::player::list
1597}
1295 1598
1296=item cf::player::find $login 1599=item cf::player::find $login
1297 1600
1298Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1299 1602
1318 1621
1319sub exists($) { 1622sub exists($) {
1320 my ($login) = @_; 1623 my ($login) = @_;
1321 1624
1322 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1324} 1627}
1325 1628
1326sub find($) { 1629sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1631 my $login = $_[0];
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1642
1340 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1644 or return;
1645
1646 my $pl = cf::player::load_pl $f
1647 or return;
1648
1649 local $cf::PLAYER_LOADING{$login} = $pl;
1650 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1343 } 1652 }
1344 } 1653 }
1345} 1654}
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);
1346 1668
1347sub save($) { 1669sub save($) {
1348 my ($pl) = @_; 1670 my ($pl) = @_;
1349 1671
1350 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1355 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1356 1678
1357 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1359 1681
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];
1686
1360 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1361 Coro::cede; 1688 cf::cede_to_tick;
1362} 1689}
1363 1690
1364sub new($) { 1691sub new($) {
1365 my ($login) = @_; 1692 my ($login) = @_;
1366 1693
1372 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1373 1700
1374 $self 1701 $self
1375} 1702}
1376 1703
1704=item $player->send_msg ($channel, $msg, $color, [extra...])
1705
1706=cut
1707
1708sub send_msg {
1709 my $ns = shift->ns
1710 or return;
1711 $ns->send_msg (@_);
1712}
1713
1377=item $pl->quit_character 1714=item $pl->quit_character
1378 1715
1379Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1381 1718
1385 my ($pl) = @_; 1722 my ($pl) = @_;
1386 1723
1387 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1388 1725
1389 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1391 1728
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1393 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1395 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1396 1737
1397 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1399 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1434 or return []; 1775 or return [];
1435 1776
1436 my @logins; 1777 my @logins;
1437 1778
1438 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1780 my $path = path $login;
1781
1782 # a .pst is a dead give-away for a valid player
1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1442 1789
1443 utf8::decode $login; 1790 utf8::decode $login;
1444 push @logins, $login; 1791 push @logins, $login;
1445 } 1792 }
1446 1793
1447 \@logins 1794 \@logins
1448} 1795}
1449 1796
1450=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1451 1800
1452Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1453player. May block. 1802player. May block.
1454 1803
1455=cut 1804=cut
1473 } 1822 }
1474 1823
1475 \@paths 1824 \@paths
1476} 1825}
1477 1826
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1828
1480Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1830
1528=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1529 1832
1530Sends an ext reply to the player. 1833Sends an ext reply to the player.
1531 1834
1532=cut 1835=cut
1533 1836
1534sub ext_reply($$@) { 1837sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1838 my ($self, $id, @msg) = @_;
1536 1839
1537 if ($self->ns->extcmd == 2) { 1840 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1841}
1545 1842
1546=item $player->ext_msg ($type, @msg) 1843=item $player->ext_msg ($type, @msg)
1547 1844
1548Sends an ext event to the client. 1845Sends an ext event to the client.
1569 1866
1570=cut 1867=cut
1571 1868
1572sub find_by_path($) { 1869sub find_by_path($) {
1573 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1574 1873
1575 my ($match, $specificity); 1874 my ($match, $specificity);
1576 1875
1577 for my $region (list) { 1876 for my $region (list) {
1578 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1604our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1606 1905
1607sub generate_random_map { 1906sub generate_random_map {
1608 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1609 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1610 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1614 $rmp->{exit_on_final_map},
1615 $rmp->{xsize}, $rmp->{ysize},
1616 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1617 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1618 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1619 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1620 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1621 (cf::region::find $rmp->{region}), $rmp->{custom}
1622 )
1623} 1912}
1624 1913
1625=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1626 1915
1627Register 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
1632 1921
1633sub register { 1922sub register {
1634 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1635 my $pkg = caller; 1924 my $pkg = caller;
1636 1925
1637 no strict;
1638 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1639 1927
1640 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1641} 1929}
1642 1930
1643# also paths starting with '/' 1931# also paths starting with '/'
1644$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1645 1933
1646sub thawer_merge { 1934sub thawer_merge {
1647 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1648 1936
1649 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1654} 1942}
1655 1943
1656sub normalise { 1944sub normalise {
1657 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1658 1946
1659 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1660 1948
1661 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1662 1950
1663 # map plan: 1951 # map plan:
1664 # 1952 #
1679 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1680 $path = "$base/$path"; 1968 $path = "$base/$path";
1681 } 1969 }
1682 1970
1683 for ($path) { 1971 for ($path) {
1684 redo if s{//}{/};
1685 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1686 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1687 } 1974 }
1688 1975
1689 $path 1976 $path
1703 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1704 return $self; 1991 return $self;
1705 } 1992 }
1706 } 1993 }
1707 1994
1708 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1709 () 1996 ()
1710} 1997}
1711 1998
1999# may re-bless or do other evil things
1712sub init { 2000sub init {
1713 my ($self) = @_; 2001 my ($self) = @_;
1714 2002
1715 $self 2003 $self
1716} 2004}
1735 2023
1736# the temporary/swap location 2024# the temporary/swap location
1737sub save_path { 2025sub save_path {
1738 my ($self) = @_; 2026 my ($self) = @_;
1739 2027
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1742} 2030}
1743 2031
1744# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1745sub uniq_path { 2033sub uniq_path {
1746 my ($self) = @_; 2034 my ($self) = @_;
1747 2035
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 2038}
1760 2039
1761sub decay_objects { 2040sub decay_objects {
1762 my ($self) = @_; 2041 my ($self) = @_;
1763 2042
1776 2055
1777sub load_header_from($) { 2056sub load_header_from($) {
1778 my ($self, $path) = @_; 2057 my ($self, $path) = @_;
1779 2058
1780 utf8::encode $path; 2059 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 2060 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 2061 or return;
1786 2062
2063 $self->_load_header ($f)
2064 or return;
2065
2066 local $MAP_LOADING{$self->{path}} = $self;
2067 $f->resolve_delayed_derefs;
2068
1787 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1788 2070
1789 1 2071 1
1790} 2072}
1791 2073
2074# used to laod the header of an original map
1792sub load_header_orig { 2075sub load_header_orig {
1793 my ($self) = @_; 2076 my ($self) = @_;
1794 2077
1795 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1796} 2079}
1797 2080
2081# used to laod the header of an instantiated map
1798sub load_header_temp { 2082sub load_header_temp {
1799 my ($self) = @_; 2083 my ($self) = @_;
1800 2084
1801 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1802} 2086}
1803 2087
2088# called after loading the header from an instantiated map
1804sub prepare_temp { 2089sub prepare_temp {
1805 my ($self) = @_; 2090 my ($self) = @_;
1806 2091
1807 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1808 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1809 # safety 2094 # safety
1810 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1811 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1812} 2097}
1813 2098
2099# called after loading the header from an original map
1814sub prepare_orig { 2100sub prepare_orig {
1815 my ($self) = @_; 2101 my ($self) = @_;
1816 2102
1817 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1818 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1842 2128
1843sub find; 2129sub find;
1844sub find { 2130sub find {
1845 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1846 2132
2133 cf::cede_to_tick;
2134
1847 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1848 2136
2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1850 2139
1851 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1854 or return; 2142 or return;
1855 2143
1856 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1857 2145
1859 or return; 2147 or return;
1860 2148
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
2153 undef $guard1;
1864 $map->reset; 2154 $map->reset;
1865 undef $guard;
1866 return find $path; 2155 return find $path;
1867 } 2156 }
1868 2157
1869 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1870 } 2159 }
1871} 2160}
1872 2161
1873sub pre_load { } 2162sub pre_load { }
1874sub post_load { } 2163#sub post_load { } # XS
1875 2164
1876sub load { 2165sub load {
1877 my ($self) = @_; 2166 my ($self) = @_;
1878 2167
1879 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1880 2169
1881 my $path = $self->{path}; 2170 my $path = $self->{path};
1882 2171
1883 { 2172 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
1885 2174
2175 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2177
1888 $self->in_memory (cf::MAP_LOADING); 2178 $self->in_memory (cf::MAP_LOADING);
1889 2179
1890 $self->alloc; 2180 $self->alloc;
1891 2181
1892 $self->pre_load; 2182 $self->pre_load;
1893 Coro::cede; 2183 cf::cede_to_tick;
1894 2184
1895 $self->_load_objects ($self->{load_path}, 1) 2185 if (exists $self->{load_path}) {
2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2187 $f->skip_block;
2188 $self->_load_objects ($f)
1896 or return; 2189 or return;
1897 2190
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2191 $self->post_load_original
1899 if delete $self->{load_original}; 2192 if delete $self->{load_original};
1900 2193
1901 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2195 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2196 unless (aio_stat $uniq) {
2197 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2198 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2199 $self->_load_objects ($f);
2200 $f->resolve_delayed_derefs;
2201 }
2202 }
1906 } 2203 }
1907 }
1908 2204
1909 Coro::cede; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2210
2211 cf::cede_to_tick;
1910 # now do the right thing for maps 2212 # now do the right thing for maps
1911 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2215 unless $self->difficulty;
1914 Coro::cede; 2216 cf::cede_to_tick;
1915 2217
1916 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2219 $self->decay_objects;
1918 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
1919 $self->update_buttons; 2221 $self->update_buttons;
1920 Coro::cede; 2222 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2223 $self->activate;
1924 } 2224 }
1925 2225
2226 $self->{last_save} = $cf::RUNTIME;
2227 $self->last_access ($cf::RUNTIME);
2228
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2229 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2230 }
1928 2231
1929 $self->post_load; 2232 $self->post_load;
1930}
1931 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
1932sub customise_for { 2240sub customise_for {
1933 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
1934 2242
1935 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
1936 if $self->per_player; 2244 if $self->per_player;
1940 2248
1941 $self 2249 $self
1942} 2250}
1943 2251
1944# find and load all maps in the 3x3 area around a map 2252# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2253sub load_neighbours {
1946 my ($map) = @_; 2254 my ($map) = @_;
1947 2255
1948 my @diag; # diagonal neighbours 2256 my @neigh; # diagonal neighbours
1949 2257
1950 for (0 .. 3) { 2258 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2259 my $neigh = $map->tile_path ($_)
1952 or next; 2260 or next;
1953 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
1954 or next; 2262 or next;
1955 $neigh->load; 2263 $neigh->load;
1956 2264
2265 # now find the diagonal neighbours
2266 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2269 }
1960 2270
1961 for (@diag) { 2271 for (grep defined $_->[0], @neigh) {
2272 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2273 my $neigh = find $path, $origin
1963 or next; 2274 or next;
1964 $neigh->load; 2275 $neigh->load;
1965 } 2276 }
1966} 2277}
1967 2278
1968sub find_sync { 2279sub find_sync {
1969 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
1970 2281
1971 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
1972} 2286}
1973 2287
1974sub do_load_sync { 2288sub do_load_sync {
1975 my ($map) = @_; 2289 my ($map) = @_;
1976 2290
1977 cf::sync_job { $map->load }; 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2292 if $Coro::current == $Coro::main;
2293
2294 $map->load;
1978} 2295}
1979 2296
1980our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
1982 2299
1983sub find_async { 2300sub find_async {
1984 my ($path, $origin) = @_; 2301 my ($path, $origin, $load) = @_;
1985 2302
1986 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
1987 2304
1988 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2307 }
1991 2308
1992 undef $MAP_PREFETCH{$path}; 2309 $MAP_PREFETCH{$path} |= $load;
2310
1993 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2312 $Coro::current->{desc} = "map prefetcher";
2313
1994 while (%MAP_PREFETCH) { 2314 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2315 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2316 if (my $map = find $k) {
1997 $map->load; 2317 $map->load if $v;
1998 } 2318 }
1999 2319
2000 delete $MAP_PREFETCH{$path}; 2320 delete $MAP_PREFETCH{$k};
2001 } 2321 }
2002 } 2322 }
2003 undef $MAP_PREFETCHER; 2323 undef $MAP_PREFETCHER;
2004 }; 2324 };
2005 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2006 2326
2007 () 2327 ()
2008} 2328}
2009 2329
2330# common code, used by both ->save and ->swapout
2010sub save { 2331sub _save {
2011 my ($self) = @_; 2332 my ($self) = @_;
2012
2013 my $lock = cf::lock_acquire "map_data:" . $self->path;
2014 2333
2015 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2016 2335
2017 return unless $self->dirty; 2336 return unless $self->dirty;
2018 2337
2024 return if $self->{deny_save}; 2343 return if $self->{deny_save};
2025 2344
2026 local $self->{last_access} = $self->last_access;#d# 2345 local $self->{last_access} = $self->last_access;#d#
2027 2346
2028 cf::async { 2347 cf::async {
2348 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
2030 }; 2350 };
2351
2352 cf::get_slot 0.02;
2031 2353
2032 if ($uniq) { 2354 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2357 } else {
2036 $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);
2037 } 2359 }
2038} 2360}
2039 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2040sub swap_out { 2370sub swap_out {
2041 my ($self) = @_; 2371 my ($self) = @_;
2042 2372
2043 # save first because save cedes
2044 $self->save;
2045
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2374
2375 return if $self->in_memory != cf::MAP_ACTIVE;
2376 return if $self->{deny_save};
2048 return if $self->players; 2377 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY;
2050 return if $self->{deny_save};
2051 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2052 $self->clear; 2388 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2389}
2055 2390
2056sub reset_at { 2391sub reset_at {
2057 my ($self) = @_; 2392 my ($self) = @_;
2058 2393
2076 2411
2077 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2078 2413
2079 return if $self->players; 2414 return if $self->players;
2080 2415
2081 warn "resetting map ", $self->path; 2416 cf::trace "resetting map ", $self->path, "\n";
2082 2417
2083 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->in_memory (cf::MAP_SWAPPED);
2084 2419
2085 # need to save uniques path 2420 # need to save uniques path
2086 unless ($self->{deny_save}) { 2421 unless ($self->{deny_save}) {
2090 if $uniq; 2425 if $uniq;
2091 } 2426 }
2092 2427
2093 delete $cf::MAP{$self->path}; 2428 delete $cf::MAP{$self->path};
2094 2429
2430 $self->deactivate;
2431 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2432 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2433
2099 $self->unlink_save; 2434 $self->unlink_save;
2100 $self->destroy; 2435 $self->destroy;
2101} 2436}
2102 2437
2103my $nuke_counter = "aaaa"; 2438my $nuke_counter = "aaaa";
2104 2439
2105sub nuke { 2440sub nuke {
2106 my ($self) = @_; 2441 my ($self) = @_;
2107 2442
2443 {
2444 my $lock = cf::lock_acquire "map_data:$self->{path}";
2445
2108 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2109 2447
2110 $self->unlink_save; 2448 $self->unlink_save;
2111 2449
2112 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2113 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2455
2118 $cf::MAP{$self->path} = $self; 2456 $cf::MAP{$self->path} = $self;
2457 }
2119 2458
2120 $self->reset; # polite request, might not happen 2459 $self->reset; # polite request, might not happen
2121} 2460}
2122 2461
2123=item $maps = cf::map::tmp_maps 2462=item $maps = cf::map::tmp_maps
2165 2504
2166sub unique_maps() { 2505sub unique_maps() {
2167 [ 2506 [
2168 map { 2507 map {
2169 utf8::decode $_; 2508 utf8::decode $_;
2170 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2171 ? normalise $_ 2512 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2514 ]
2175} 2515}
2176 2516
2177package cf; 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}
2178 2548
2179=back 2549=back
2180 2550
2181=head3 cf::object 2551=head3 cf::object
2182 2552
2186 2556
2187=over 4 2557=over 4
2188 2558
2189=item $ob->inv_recursive 2559=item $ob->inv_recursive
2190 2560
2191Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2192 2563
2193=cut 2564=cut
2194 2565
2195sub inv_recursive_; 2566sub inv_recursive_;
2196sub inv_recursive_ { 2567sub inv_recursive_ {
2199 2570
2200sub inv_recursive { 2571sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2202} 2573}
2203 2574
2575=item $ref = $ob->ref
2576
2577Creates and returns a persistent reference to an object that can be stored as a string.
2578
2579=item $ob = cf::object::deref ($refstring)
2580
2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2582even if the object actually exists. May block.
2583
2584=cut
2585
2586sub deref {
2587 my ($ref) = @_;
2588
2589 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2590 my ($uuid, $name) = ($1, $2);
2591 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2592 or return;
2593 $pl->ob->uuid eq $uuid
2594 or return;
2595
2596 $pl->ob
2597 } else {
2598 warn "$ref: cannot resolve object reference\n";
2599 undef
2600 }
2601}
2602
2204package cf; 2603package cf;
2205 2604
2206=back 2605=back
2207 2606
2208=head3 cf::object::player 2607=head3 cf::object::player
2214Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2613Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2215can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2216dialogue with the given NPC character. 2615dialogue with the given NPC character.
2217 2616
2218=cut 2617=cut
2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2219 2632
2220# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2634# with dialog boxes.
2222#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2223sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2235 my $dialog = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2650
2238 } else { 2651 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2654 }
2242 } 2655 }
2656}
2657
2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2659
2660=cut
2661
2662sub cf::object::send_msg {
2663 my $pl = shift->contr
2664 or return;
2665 $pl->send_msg (@_);
2243} 2666}
2244 2667
2245=item $player_object->may ("access") 2668=item $player_object->may ("access")
2246 2669
2247Returns wether the given player is authorized to access resource "access" 2670Returns wether the given player is authorized to access resource "access"
2260 2683
2261=item $player_object->enter_link 2684=item $player_object->enter_link
2262 2685
2263Freezes 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}>).
2264 2687
2265The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2266I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2267 2692
2268Will never block. 2693Will never block.
2269 2694
2270=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2271 2696
2291sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2292 my ($self) = @_; 2717 my ($self) = @_;
2293 2718
2294 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2295 2720
2721 ++$self->{_link_recursion};
2722
2296 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2297 2724
2298 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2299 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2300 2727
2301 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2302} 2729}
2303 2730
2304sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2305 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2306 2733
2323 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2324 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2325 2752
2326 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2329 2756
2330 $map->load; 2757 $map->load;
2331 $map->load_diag; 2758 $map->load_neighbours;
2332 2759
2333 return unless $self->contr->active; 2760 return unless $self->contr->active;
2334 $self->activate_recursive;
2335 2761
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2338} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2339 2769
2770}
2771
2340=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)]])
2341 2773
2342Moves 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
2343her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2344that 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
2345the 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
2346be called at the end of this process. 2778be called at the end of this process.
2347 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2348=cut 2783=cut
2349 2784
2350our $GOTOGEN; 2785our $GOTOGEN;
2351 2786
2352sub cf::object::player::goto { 2787sub cf::object::player::goto {
2353 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2354 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 }
2795
2355 # 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
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2798
2358 $self->enter_link; 2799 $self->enter_link;
2359 2800
2360 (async { 2801 (async {
2802 $Coro::current->{desc} = "player::goto $path $x $y";
2803
2804 # *tag paths override both path and x|y
2805 if ($path =~ /^\*(.*)$/) {
2806 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2807 my $ob = $obs[rand @obs];
2808
2809 # see if we actually can go there
2810 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2811 $ob = $obs[rand @obs];
2812 } else {
2813 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2814 }
2815 # else put us there anyways for now #d#
2816
2817 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2818 } else {
2819 ($path, $x, $y) = (undef, undef, undef);
2820 }
2821 }
2822
2361 my $map = eval { 2823 my $map = eval {
2362 my $map = cf::map::find $path; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2363 2825
2364 if ($map) { 2826 if ($map) {
2365 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2367 } else { 2829 } else {
2368 $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);
2369 } 2831 }
2370 2832
2371 $map 2833 $map
2372 }; 2834 };
2373 2835
2379 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2380 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2381 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2382 } 2844 }
2383 2845
2384 $done->() if $done; 2846 $done->($self) if $done;
2385 })->prio (1); 2847 })->prio (1);
2386} 2848}
2387 2849
2388=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2389 2851
2409} 2871}
2410 2872
2411sub prepare_random_map { 2873sub prepare_random_map {
2412 my ($exit) = @_; 2874 my ($exit) = @_;
2413 2875
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2878 # that depends on the exit object
2419 2879
2420 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2422 if ($exit->map) { 2882 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2427 } 2889 }
2428 2890
2429 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2430 2892
2431 my $data = cf::to_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2434 2896
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2899 undef $fh;
2438 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2439 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2442 } 2908 }
2443} 2909}
2444 2910
2445sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2447 2913
2448 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2449 2915
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2916 $self->enter_link;
2462 2917
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2918 (async {
2468 $self->deactivate_recursive; # just to be sure 2919 $Coro::current->{desc} = "enter_exit";
2920
2469 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
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 }
2948
2470 $self->goto ($slaying, $hp, $sp); 2949 $self->goto ($map, $x, $y);
2471 2950
2951 # if exit is damned, update players death & WoR home-position
2952 $self->contr->savebed ($map, $x, $y)
2953 if $exit->flag (cf::FLAG_DAMNED);
2954
2472 1; 2955 1
2473 }) { 2956 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2475 . "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. "
2476 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2478 2961
2479 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2480 $self->leave_link; 2963 $self->leave_link;
2481 } 2964 }
2482 })->prio (1); 2965 })->prio (1);
2483} 2966}
2484 2967
2496sub cf::client::send_drawinfo { 2979sub cf::client::send_drawinfo {
2497 my ($self, $text, $flags) = @_; 2980 my ($self, $text, $flags) = @_;
2498 2981
2499 utf8::encode $text; 2982 utf8::encode $text;
2500 $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);
2501} 3009}
2502 3010
2503=item $client->send_msg ($channel, $msg, $color, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2504 3012
2505Send 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
2507the message, with C<log> being the default. If C<$color> is negative, suppress 3015the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 3016the message unless the client supports the msg packet.
2509 3017
2510=cut 3018=cut
2511 3019
3020# non-persistent channels (usually the info channel)
3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
3028 "c/identify" => {
3029 id => "infobox",
3030 title => "Identify",
3031 reply => undef,
3032 tooltip => "Items recently identified",
3033 },
3034 "c/examine" => {
3035 id => "infobox",
3036 title => "Examine",
3037 reply => undef,
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",
3045 },
3046 "c/book" => {
3047 id => "infobox",
3048 title => "Book",
3049 reply => undef,
3050 tooltip => "The contents of a note or book",
3051 },
3052 "c/lookat" => {
3053 id => "infobox",
3054 title => "Look",
3055 reply => undef,
3056 tooltip => "What you saw there",
3057 },
3058 "c/who" => {
3059 id => "infobox",
3060 title => "Players",
3061 reply => undef,
3062 tooltip => "Shows players who are currently online",
3063 },
3064 "c/body" => {
3065 id => "infobox",
3066 title => "Body Parts",
3067 reply => undef,
3068 tooltip => "Shows which body parts you posess and are available",
3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
3076 "c/skills" => {
3077 id => "infobox",
3078 title => "Skills",
3079 reply => undef,
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",
3105 },
3106 "c/uptime" => {
3107 id => "infobox",
3108 title => "Uptime",
3109 reply => undef,
3110 tooltip => "How long the server has been running since last restart",
3111 },
3112 "c/mapinfo" => {
3113 id => "infobox",
3114 title => "Map Info",
3115 reply => undef,
3116 tooltip => "Information related to the maps",
3117 },
3118 "c/party" => {
3119 id => "party",
3120 title => "Party",
3121 reply => "gsay ",
3122 tooltip => "Messages and chat related to your party",
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,
3132);
3133
2512sub cf::client::send_msg { 3134sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2514 3136
2515 $msg = $self->pl->expand_cfpod ($msg); 3137 $msg = $self->pl->expand_cfpod ($msg)
3138 unless $color & cf::NDI_VERBATIM;
2516 3139
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 3140 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 3141
3142 # check predefined channels, for the benefit of C
3143 if ($CHANNEL{$channel}) {
3144 $channel = $CHANNEL{$channel};
3145
3146 $self->ext_msg (channel_info => $channel);
3147 $channel = $channel->{id};
3148
2519 if (ref $channel) { 3149 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 3150 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 3151 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 3152 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 3153 $self->ext_msg (channel_info => $channel);
2524 } 3154 }
2525 3155
2526 $channel = $channel->{id}; 3156 $channel = $channel->{id};
2527 } 3157 }
2528 3158
2529 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2530 3160
2531 if ($self->can_msg) { 3161 # default colour, mask it out
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2533 } else { 3163 if $color & cf::NDI_DEF;
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543 3164
2544 if ($color >= 0) { 3165 my $pkt = "msg "
2545 if (0 && $msg =~ /\[/) { 3166 . $self->{json_coder}->encode (
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2547 } else { 3168 );
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3169
2549 $self->send_packet ("drawinfo $color $msg") 3170 $self->send_big_packet ($pkt);
2550 }
2551 }
2552 }
2553} 3171}
2554 3172
2555=item $client->ext_msg ($type, @msg) 3173=item $client->ext_msg ($type, @msg)
2556 3174
2557Sends an ext event to the client. 3175Sends an ext event to the client.
2559=cut 3177=cut
2560 3178
2561sub cf::client::ext_msg($$@) { 3179sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 3180 my ($self, $type, @msg) = @_;
2563 3181
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 3182 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 3184 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 3185 push @msg, msgtype => "event_$type";
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3187 }
3188}
3189
3190=item $client->ext_reply ($msgid, @msg)
3191
3192Sends an ext reply to the client.
3193
3194=cut
3195
3196sub cf::client::ext_reply($$@) {
3197 my ($self, $id, @msg) = @_;
3198
3199 if ($self->extcmd == 2) {
3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3201 } elsif ($self->extcmd == 1) {
3202 #TODO: version 1, remove
3203 unshift @msg, msgtype => "reply", msgid => $id;
3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 3205 }
2572} 3206}
2573 3207
2574=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2575 3209
2636 my ($type, $reply, @payload) = 3270 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3271 "ARRAY" eq ref $msg
2638 ? @$msg 3272 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3273 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3274
3275 my @reply;
3276
2641 if (my $cb = $EXTICMD{$type}) { 3277 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3278 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3279 }
3280
3281 $ns->ext_reply ($reply, @reply)
3282 if $reply;
3283
2647 } else { 3284 } else {
2648 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";
2649 } 3286 }
2650 3287
2651 cf::override; 3288 cf::override;
2652 }, 3289 },
2653); 3290);
2673 3310
2674 $coro 3311 $coro
2675} 3312}
2676 3313
2677cf::client->attach ( 3314cf::client->attach (
2678 on_destroy => sub { 3315 on_client_destroy => sub {
2679 my ($ns) = @_; 3316 my ($ns) = @_;
2680 3317
2681 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2682 }, 3319 },
2683); 3320);
2698our $safe = new Safe "safe"; 3335our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
2700 3337
2701$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
2702 3339
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3340$safe->permit_only (Opcode::opset qw(
3341 :base_core :base_mem :base_orig :base_math :base_loop
3342 grepstart grepwhile mapstart mapwhile
3343 sort time
3344));
2704 3345
2705# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
2706 3347
2707=pod 3348=pod
2708 3349
2709The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
2710 3351
2711 cf::object 3352 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3353 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3354 insert remove name archname title slaying race decrease split
3355 value
2714 3356
2715 cf::object::player 3357 cf::object::player
2716 player 3358 player
2717 3359
2718 cf::player 3360 cf::player
2723 3365
2724=cut 3366=cut
2725 3367
2726for ( 3368for (
2727 ["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
2728 insert remove)], 3370 insert remove inv nrof name archname title slaying race
3371 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
2732) { 3375) {
2733 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2736 for @funs; 3378 for @funs;
2737} 3379}
2738 3380
2753 3395
2754 my $qcode = $code; 3396 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
2757 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
2758 local $_; 3403 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars;
2760 3404
2761 my $eval = 3405 my $eval =
2762 "do {\n" 3406 "do {\n"
2763 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2764 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
2765 . $code 3409 . $code
2766 . "\n}" 3410 . "\n}"
2767 ; 3411 ;
2768 3412
3413 if ($CFG{safe_eval}) {
2769 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
2770 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2771 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 }
2772 3422
2773 if ($@) { 3423 if ($@) {
2774 warn "$@"; 3424 warn "$@",
2775 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
2776 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
2777 } 3427 }
2778 3428
2779 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
2780} 3430}
2781 3431
2795=cut 3445=cut
2796 3446
2797sub register_script_function { 3447sub register_script_function {
2798 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
2799 3449
2800 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
2801 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
2802} 3452}
2803 3453
2804=back 3454=back
2805 3455
2806=cut 3456=cut
2809# the server's init and main functions 3459# the server's init and main functions
2810 3460
2811sub load_facedata($) { 3461sub load_facedata($) {
2812 my ($path) = @_; 3462 my ($path) = @_;
2813 3463
3464 # HACK to clear player env face cache, we need some signal framework
3465 # for this (global event?)
3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3467
3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3469
2814 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
2815 3471
2816 my $facedata; 3472 my $facedata = decode_storable load_file $path;
2817 0 < aio_load $path, $facedata
2818 or die "$path: $!";
2819
2820 $facedata = Coro::Storable::thaw $facedata;
2821 3473
2822 $facedata->{version} == 2 3474 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3476
3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3479 $facedata->{resource}{"res/exp_table"} = {
3480 type => FT_RSRC,
3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3483 };
3484 cf::cede_to_tick;
3485
2825 { 3486 {
2826 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
2827 3488
2828 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3491
2830 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2834 3497
2835 cf::cede_to_tick; 3498 cf::cede_to_tick;
2836 } 3499 }
2837 3500
2838 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3502 next unless $info->{smooth};
3503
2840 my $idx = cf::face::find $face 3504 my $idx = cf::face::find $face
2841 or next; 3505 or next;
3506
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3510 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
2847 } 3512 }
2848 3513
2849 cf::cede_to_tick; 3514 cf::cede_to_tick;
2850 } 3515 }
2851 } 3516 }
2860 3525
2861 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
2862 } 3527 }
2863 3528
2864 { 3529 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869 3531
2870 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 3533 if (defined $info->{type}) {
2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO#
2875 });
2876
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2878 3535
2879 if ($name =~ /\.jpg$/) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3537 cf::face::set_type $idx, $info->{type};
2882 } else { 3538 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3539 $RESOURCE{$name} = $info; # unused
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk;
2888 } 3540 }
2889 3541
2890 cf::cede_to_tick; 3542 cf::cede_to_tick;
2891 } 3543 }
2892 } 3544 }
2893 3545
3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3547
2894 1 3548 1
2895} 3549}
2896 3550
3551register_exticmd fx_want => sub {
3552 my ($ns, $want) = @_;
3553
3554 while (my ($k, $v) = each %$want) {
3555 $ns->fx_want ($k, $v);
3556 }
3557};
3558
3559sub load_resource_file($) {
3560 my $guard = lock_acquire "load_resource_file";
3561
3562 my $status = load_resource_file_ $_[0];
3563 get_slot 0.1, 100;
3564 cf::arch::commit_load;
3565
3566 $status
3567}
3568
2897sub reload_regions { 3569sub reload_regions {
3570 # HACK to clear player env face cache, we need some signal framework
3571 # for this (global event?)
3572 %ext::player_env::MUSIC_FACE_CACHE = ();
3573
2898 load_resource_file "$MAPDIR/regions" 3574 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 3575 or die "unable to load regions file\n";
2900 3576
2901 for (cf::region::list) { 3577 for (cf::region::list) {
2902 $_->{match} = qr/$_->{match}/ 3578 $_->{match} = qr/$_->{match}/
2910} 3586}
2911 3587
2912sub reload_archetypes { 3588sub reload_archetypes {
2913 load_resource_file "$DATADIR/archetypes" 3589 load_resource_file "$DATADIR/archetypes"
2914 or die "unable to load archetypes\n"; 3590 or die "unable to load archetypes\n";
2915 #d# NEED to laod twice to resolve forward references
2916 # this really needs to be done in an extra post-pass
2917 # (which needs to be synchronous, so solve it differently)
2918 load_resource_file "$DATADIR/archetypes"
2919 or die "unable to load archetypes\n";
2920} 3591}
2921 3592
2922sub reload_treasures { 3593sub reload_treasures {
2923 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
2924 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
2925} 3596}
2926 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
2927sub reload_resources { 3618sub reload_resources {
2928 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
2929 3620
3621 reload_exp_table;
3622 reload_materials;
3623 reload_facedata;
3624 reload_sound;
3625 reload_archetypes;
2930 reload_regions; 3626 reload_regions;
2931 reload_facedata;
2932 #reload_archetypes;#d#
2933 reload_archetypes;
2934 reload_treasures; 3627 reload_treasures;
2935 3628
2936 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
2937} 3630}
2938 3631
2939sub init { 3632sub reload_config {
2940 reload_resources; 3633 trace "reloading config file...\n";
2941}
2942 3634
2943sub cfg_load { 3635 my $config = load_file "$CONFDIR/config";
2944 open my $fh, "<:utf8", "$CONFDIR/config" 3636 utf8::decode $config;
2945 or return; 3637 *CFG = decode_yaml $config;
2946 3638
2947 local $/;
2948 *CFG = YAML::Syck::Load <$fh>;
2949
2950 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2951 3640
2952 $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};
2953 $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};
2954 3643
2955 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
2959 }; 3648 };
2960 warn $@ if $@; 3649 warn $@ if $@;
2961 } 3650 }
2962} 3651}
2963 3652
3653sub pidfile() {
3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3655 or die "$PIDFILE: $!";
3656 flock $fh, &Fcntl::LOCK_EX
3657 or die "$PIDFILE: flock: $!";
3658 $fh
3659}
3660
3661# make sure only one server instance is running at any one time
3662sub atomic {
3663 my $fh = pidfile;
3664
3665 my $pid = <$fh>;
3666 kill 9, $pid if $pid > 0;
3667
3668 seek $fh, 0, 0;
3669 print $fh $$;
3670}
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
2964sub main { 3681sub main {
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
3690
2965 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
2966 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
2967 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#
2968 (async { 3694 (async {
2969 Event::one_event; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3696 EV::loop EV::LOOP_ONESHOT;
2970 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
2971 }; 3698 };
2972 3699
2973 cfg_load; 3700 evthread_start IO::AIO::poll_fileno;
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;
3712 reload_config;
2974 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
2975 load_extensions; 3723 load_extensions;
2976 3724
2977 $TICK_WATCHER->start; 3725 utime time, time, $RUNTIMEFILE;
2978 Event::loop; 3726
3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3730
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;
2979} 3743}
2980 3744
2981############################################################################# 3745#############################################################################
2982# initialisation and cleanup 3746# initialisation and cleanup
2983 3747
2984# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
2985BEGIN { 3749BEGIN {
3750 our %SIGWATCHER = ();
2986 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
2987 Event->signal ( 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2988 reentrant => 0,
2989 data => WF_AUTOCANCEL,
2990 signal => $signal,
2991 prio => 0,
2992 cb => sub {
2993 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
2994 },
2995 ); 3754 };
2996 } 3755 }
2997} 3756}
2998 3757
2999sub write_runtime { 3758sub write_runtime_sync {
3000 my $runtime = "$LOCALDIR/runtime"; 3759 my $t0 = AE::time;
3001 3760
3002 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
3003 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
3004 3763
3005 IO::AIO::aio_utime $runtime, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3006 3765
3007 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
3008 3767
3009 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3010 or return; 3769 or return;
3011 3770
3012 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
3013 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
3014 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
3024 aio_utime $fh, undef, undef; 3783 aio_utime $fh, undef, undef;
3025 3784
3026 close $fh 3785 close $fh
3027 or return; 3786 or return;
3028 3787
3029 aio_rename "$runtime~", $runtime 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3030 and return; 3789 and return;
3031 3790
3032 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3033 3792
3034 1 3793 1
3794}
3795
3796our $uuid_lock;
3797our $uuid_skip;
3798
3799sub write_uuid_sync($) {
3800 $uuid_skip ||= $_[0];
3801
3802 return if $uuid_lock;
3803 local $uuid_lock = 1;
3804
3805 my $uuid = "$LOCALDIR/uuid";
3806
3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3808 or return;
3809
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;
3818 $uuid_skip = 0;
3819
3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3821 and return;
3822
3823 # always fsync - this file is important
3824 aio_fsync $fh
3825 and return;
3826
3827 close $fh
3828 or return;
3829
3830 aio_rename "$uuid~", $uuid
3831 and return;
3832
3833 trace "uuid file written ($value).\n";
3834
3835 1
3836
3837}
3838
3839sub write_uuid($$) {
3840 my ($skip, $sync) = @_;
3841
3842 $sync ? write_uuid_sync $skip
3843 : async { write_uuid_sync $skip };
3035} 3844}
3036 3845
3037sub emergency_save() { 3846sub emergency_save() {
3038 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
3039 3848
3040 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;
3041 3855
3042 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
3043 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
3044 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
3045 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
3046 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
3047 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
3048 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
3049 $pl->valid or next; 3865 $pl->valid or next;
3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3050 $pl->save; 3867 $pl->save;
3051 } 3868 }
3052 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
3053 3870
3054 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";
3055 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
3056 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
3057 $map->valid or next; 3876 $map->valid or next;
3058 $map->save; 3877 $map->save;
3059 } 3878 }
3060 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
3061 3880
3062 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";
3063 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
3064 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3886
3887 info "emergency_perl_save: begin write uuid\n";
3888 write_uuid_sync 1;
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
3065 }; 3909 };
3066 3910
3067 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
3068} 3912}
3069 3913
3070sub post_cleanup { 3914sub post_cleanup {
3071 my ($make_core) = @_; 3915 my ($make_core) = @_;
3072 3916
3917 IO::AIO::flush;
3918
3073 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
3074 if $make_core; 3920 if $make_core;
3921
3922 my $fh = pidfile;
3923 unlink $PIDFILE if <$fh> == $$;
3924}
3925
3926# a safer delete_package, copied from Symbol
3927sub clear_package($) {
3928 my $pkg = shift;
3929
3930 # expand to full symbol table name if needed
3931 unless ($pkg =~ /^main::.*::$/) {
3932 $pkg = "main$pkg" if $pkg =~ /^::/;
3933 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3934 $pkg .= '::' unless $pkg =~ /::$/;
3935 }
3936
3937 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3938 my $stem_symtab = *{$stem}{HASH};
3939
3940 defined $stem_symtab and exists $stem_symtab->{$leaf}
3941 or return;
3942
3943 # clear all symbols
3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3945 for my $name (keys %$leaf_symtab) {
3946 _gv_clear *{"$pkg$name"};
3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3948 }
3075} 3949}
3076 3950
3077sub do_reload_perl() { 3951sub do_reload_perl() {
3078 # can/must only be called in main 3952 # can/must only be called in main
3079 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
3080 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
3081 return; 3955 return;
3082 } 3956 }
3083 3957
3084 warn "reloading..."; 3958 return if $RELOAD++;
3085 3959
3086 warn "entering sync_job"; 3960 my $t1 = AE::time;
3087 3961
3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3965
3966 trace "perl_reload: entering sync_job";
3967
3088 cf::sync_job { 3968 cf::sync_job {
3089 cf::write_runtime; # external watchdog should not bark
3090 cf::emergency_save; 3969 #cf::emergency_save;
3091 cf::write_runtime; # external watchdog should not bark
3092 3970
3093 warn "syncing database to disk";
3094 BDB::db_env_txn_checkpoint $DB_ENV;
3095
3096 # if anything goes wrong in here, we should simply crash as we already saved
3097
3098 warn "cancelling all WF_AUTOCANCEL watchers";
3099 for (Event::all_watchers) {
3100 $_->cancel if $_->data & WF_AUTOCANCEL;
3101 }
3102
3103 warn "flushing outstanding aio requests";
3104 for (;;) {
3105 BDB::flush;
3106 IO::AIO::flush;
3107 Coro::cede;
3108 last unless IO::AIO::nreqs || BDB::nreqs;
3109 warn "iterate...";
3110 }
3111
3112 ++$RELOAD;
3113
3114 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3115 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3116 %EXT_CORO = (); 3973 %EXT_CORO = ();
3117 3974
3118 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3119 %COMMAND = (); 3976 %COMMAND = ();
3120 3977
3121 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3122 %EXTCMD = (); 3979 %EXTCMD = ();
3123 %EXTICMD = (); 3980 %EXTICMD = ();
3124 3981
3125 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3126 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3127 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3128 3985
3129 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3130 eval { 3987 eval {
3131 $cb->($pkg); 3988 $cb->($pkg);
3132 1 3989 1
3133 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3991 }
3992
3993 trace "... clearing $pkg";
3994 clear_package $pkg;
3134 } 3995 }
3135 3996
3136 warn "... nuking $pkg";
3137 Symbol::delete_package $pkg;
3138 }
3139
3140 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3141 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3142 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3143 4000
3144 warn "... unloading $k"; 4001 trace "... unloading $k";
3145 delete $INC{$k}; 4002 delete $INC{$k};
3146 4003
3147 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3148 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3149 4006
3150 if (my $cb = $k->can ("unload_module")) { 4007 if (my $cb = $k->can ("unload_module")) {
3151 $cb->(); 4008 $cb->();
4009 }
4010
4011 clear_package $k;
3152 } 4012 }
3153 4013
3154 Symbol::delete_package $k;
3155 }
3156
3157 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3158 Symbol::delete_package "safe::$_" 4015 clear_package "safe::$_"
3159 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);
3160 4017
3161 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3162 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3163 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3164 4021
3165 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3166 # and global variables created in xs 4023 # and global variables created in xs
3167 #Symbol::delete_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3168 4025
3169 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3170 4027
3171 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3172 require cf; 4029 require cf;
3173 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3174 4031
3175 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3176 cf::cfg_load; 4033 cf::reload_config;
3177 4034
3178 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3179 cf::load_extensions; 4036 cf::load_extensions;
3180 4037
4038 if ($REATTACH_ON_RELOAD) {
3181 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3182 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3183 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3184 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3185 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3186 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3187 4046
3188 warn "leaving sync_job"; 4047 cf::_post_init 1;
3189 4048
4049 trace "perl_reload: leaving sync_job";
4050
3190 1 4051 1
3191 } or do { 4052 } or do {
3192 warn $@; 4053 error $@;
3193 warn "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3194 exit 1; 4055 };
4056
4057 --$RELOAD;
3195 }; 4058 }
3196 4059
3197 warn "reloaded"; 4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3198}; 4062};
3199 4063
3200our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3201 4065
3202sub reload_perl() { 4066sub reload_perl() {
3203 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3204 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3205 4069
3206 $RELOAD_WATCHER ||= Event->timer ( 4070 $RELOAD_WATCHER ||= cf::async {
3207 reentrant => 0, 4071 Coro::AIO::aio_wait cache_extensions;
3208 after => 0, 4072
3209 data => WF_AUTOCANCEL, 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3210 cb => sub {
3211 do_reload_perl; 4074 do_reload_perl;
3212 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
3213 }, 4076 };
3214 ); 4077 };
3215} 4078}
3216 4079
3217register_command "reload" => sub { 4080register_command "reload" => sub {
3218 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3219 4082
3220 if ($who->flag (FLAG_WIZ)) { 4083 if ($who->flag (FLAG_WIZ)) {
3221 $who->message ("reloading server."); 4084 $who->message ("reloading server.");
4085 async {
4086 $Coro::current->{desc} = "perl_reload";
3222 async { reload_perl }; 4087 reload_perl;
4088 };
3223 } 4089 }
3224}; 4090};
3225 4091
3226unshift @INC, $LIBDIR; 4092#############################################################################
3227 4093
3228my $bug_warning = 0; 4094my $bug_warning = 0;
3229 4095
3230our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3231our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3232 4098
3233sub wait_for_tick { 4099sub wait_for_tick() {
3234 return unless $TICK_WATCHER->is_active;
3235 return if $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3236 4101
3237 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3238 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3239 $signal->wait; 4104 $signal->wait;
3240} 4105}
3241 4106
3242sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3243 return unless $TICK_WATCHER->is_active;
3244 return if $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3245 4109
3246 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3247 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3248 $signal->wait; 4112 $signal->wait;
3249} 4113}
3250 4114
3251 my $min = 1e6;#d# 4115sub tick {
3252 my $avg = 10;
3253$TICK_WATCHER = Event->timer (
3254 reentrant => 0,
3255 parked => 1,
3256 prio => 0,
3257 at => $NEXT_TICK || $TICK,
3258 data => WF_AUTOCANCEL,
3259 cb => sub {
3260 if ($Coro::current != $Coro::main) { 4116 if ($Coro::current != $Coro::main) {
3261 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3262 unless ++$bug_warning > 10; 4118 unless ++$bug_warning > 10;
3263 return; 4119 return;
3264 } 4120 }
3265 4121
3266 $NOW = $tick_start = Event::time;
3267
3268 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3269 4123
3270 0 && sync_job {#d# 4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3271 for(1..10) {
3272 my $t = Event::time;
3273 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3274 or die;
3275 4125
3276 $map->width (50); 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3277 $map->height (50); 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3278 $map->alloc; 4128 Coro::async_pool {
3279 $map->_load_objects ("/tmp/x.map", 1); 4129 $Coro::current->{desc} = "runtime saver";
3280 my $t = Event::time - $t; 4130 write_runtime_sync
3281 4131 or error "ERROR: unable to write runtime file: $!";
3282 #next unless $t < 0.0013;#d#
3283 if ($t < $min) {
3284 $min = $t;
3285 }
3286 $avg = $avg * 0.99 + $t * 0.01;
3287 }
3288 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3289 exit 0;
3290 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3291 }; 4132 };
4133 }
3292 4134
3293 $RUNTIME += $TICK;
3294 $NEXT_TICK += $TICK;
3295
3296 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3297 $NEXT_RUNTIME_WRITE = $NOW + 10;
3298 Coro::async_pool {
3299 write_runtime
3300 or warn "ERROR: unable to write runtime file: $!";
3301 };
3302 }
3303
3304# my $AFTER = Event::time;
3305# warn $AFTER - $NOW;#d#
3306
3307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3308 $sig->send; 4136 $sig->send;
3309 } 4137 }
3310 while (my $sig = shift @WAIT_FOR_TICK) { 4138 while (my $sig = shift @WAIT_FOR_TICK) {
3311 $sig->send; 4139 $sig->send;
3312 } 4140 }
3313 4141
3314 $NOW = Event::time; 4142 $LOAD = ($NOW - $TICK_START) / $TICK;
3315
3316 # if we are delayed by four ticks or more, skip them all
3317 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3318
3319 $TICK_WATCHER->at ($NEXT_TICK);
3320 $TICK_WATCHER->start;
3321
3322 $LOAD = ($NOW - $tick_start) / $TICK;
3323 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3324 4144
3325 _post_tick; 4145 if (0) {
3326 4146 if ($NEXT_TICK) {
3327 4147 my $jitter = $TICK_START - $NEXT_TICK;
4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4149 debug "jitter $JITTER\n";#d#
4150 }
3328 }, 4151 }
3329); 4152}
3330 4153
3331{ 4154{
3332 BDB::max_poll_time $TICK * 0.1; 4155 # configure BDB
3333 $BDB_POLL_WATCHER = Event->io ( 4156
3334 reentrant => 0,
3335 fd => BDB::poll_fileno,
3336 poll => 'r',
3337 prio => 0,
3338 data => WF_AUTOCANCEL,
3339 cb => \&BDB::poll_cb,
3340 );
3341 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3342 4158 BDB::max_poll_reqs $TICK * 0.1;
3343 BDB::set_sync_prepare { 4159 $AnyEvent::BDB::WATCHER->priority (1);
3344 my $status;
3345 my $current = $Coro::current;
3346 (
3347 sub {
3348 $status = $!;
3349 $current->ready; undef $current;
3350 },
3351 sub {
3352 Coro::schedule while defined $current;
3353 $! = $status;
3354 },
3355 )
3356 };
3357 4160
3358 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3359 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
4163 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4164 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4165 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4166 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4167 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3360 4168
3361 cf::sync_job { 4169 cf::sync_job {
3362 eval { 4170 eval {
3363 BDB::db_env_open 4171 BDB::db_env_open
3364 $DB_ENV, 4172 $DB_ENV,
3366 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4174 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3367 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4175 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3368 0666; 4176 0666;
3369 4177
3370 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4178 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3371
3372 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3373 $DB_ENV->set_lk_detect;
3374 }; 4179 };
3375 4180
3376 cf::cleanup "db_env_open(db): $@" if $@; 4181 cf::cleanup "db_env_open(db): $@" if $@;
3377 }; 4182 };
3378 } 4183 }
4184
4185 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4186 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4187 };
4188 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4189 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4190 };
4191 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4192 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4193 };
3379} 4194}
3380 4195
3381{ 4196{
4197 # configure IO::AIO
4198
3382 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3383
3384 undef $Coro::AIO::WATCHER;
3385 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3386 $AIO_POLL_WATCHER = Event->io ( 4201 undef $AnyEvent::AIO::WATCHER;
3387 reentrant => 0,
3388 data => WF_AUTOCANCEL,
3389 fd => IO::AIO::poll_fileno,
3390 poll => 'r',
3391 prio => 6,
3392 cb => \&IO::AIO::poll_cb,
3393 );
3394} 4202}
3395 4203
3396my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3397 4206
3398sub _log_backtrace { 4207sub _log_backtrace {
3399 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3400 4209
3401 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3402 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3403 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3404 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3405 ++$_log_backtrace; 4218 ++$_log_backtrace;
4219 my $perl_bt = Carp::longmess $msg;
3406 async { 4220 async {
4221 $Coro::current->{desc} = "abt $msg";
4222
3407 my @bt = fork_call { 4223 my @bt = fork_call {
3408 @addr = map { sprintf "%x", $_ } @addr; 4224 @addr = map { sprintf "%x", $_ } @addr;
3409 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4225 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3410 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4226 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3411 or die "addr2line: $!"; 4227 or die "addr2line: $!";
3419 } 4235 }
3420 4236
3421 @funcs 4237 @funcs
3422 }; 4238 };
3423 4239
3424 LOG llevInfo, "[ABT] $msg\n"; 4240 LOG llevInfo, "[ABT] $perl_bt\n";
4241 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3425 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3426 --$_log_backtrace; 4243 --$_log_backtrace;
3427 }; 4244 };
3428 } else { 4245 } else {
3429 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3430 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3431 } 4248 }
3432} 4249}
3433 4250
3434# load additional modules 4251# load additional modules
3435use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3436 4254
3437END { cf::emergency_save } 4255END { cf::emergency_save }
3438 4256
34391 42571
3440 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines