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.328 by root, Wed Aug 8 06:24:30 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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 #
1666 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1667 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1668 # ?random/... random maps 1956 # ?random/... random maps
1669 # /... normal maps 1957 # /... normal maps
1670 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1671 1960
1672 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1673 1962
1674 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1675 # something that looks reasonable 1964 # something that looks reasonable
1676 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1677 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1678 1967
1679 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1680 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1681 } 1984 }
1682 1985
1683 for ($path) { 1986 for ($path) {
1684 redo if s{//}{/};
1685 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1686 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1687 } 1989 }
1688 1990
1689 $path 1991 $path
1703 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1704 return $self; 2006 return $self;
1705 } 2007 }
1706 } 2008 }
1707 2009
1708 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1709 () 2011 ()
1710} 2012}
1711 2013
2014# may re-bless or do other evil things
1712sub init { 2015sub init {
1713 my ($self) = @_; 2016 my ($self) = @_;
1714 2017
1715 $self 2018 $self
1716} 2019}
1735 2038
1736# the temporary/swap location 2039# the temporary/swap location
1737sub save_path { 2040sub save_path {
1738 my ($self) = @_; 2041 my ($self) = @_;
1739 2042
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1742} 2045}
1743 2046
1744# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1745sub uniq_path { 2048sub uniq_path {
1746 my ($self) = @_; 2049 my ($self) = @_;
1747 2050
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 2052 "$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} 2053}
1760 2054
1761sub decay_objects { 2055sub decay_objects {
1762 my ($self) = @_; 2056 my ($self) = @_;
1763 2057
1776 2070
1777sub load_header_from($) { 2071sub load_header_from($) {
1778 my ($self, $path) = @_; 2072 my ($self, $path) = @_;
1779 2073
1780 utf8::encode $path; 2074 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 2075 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 2076 or return;
2077
2078 $self->_load_header ($f)
2079 or return;
2080
2081 local $MAP_LOADING{$self->{path}} = $self;
2082 $f->resolve_delayed_derefs;
1786 2083
1787 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1788 2085
1789 1 2086 1
1790} 2087}
1842 2139
1843sub find; 2140sub find;
1844sub find { 2141sub find {
1845 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1846 2143
2144 cf::cede_to_tick;
2145
1847 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1848 2147
2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1850 2150
1851 $cf::MAP{$path} || do { 2151 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 2152 my $map = new_from_path cf::map $path
1854 or return; 2153 or return;
1855 2154
1856 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1857 2156
1859 or return; 2158 or return;
1860 2159
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
2164 undef $guard1;
1864 $map->reset; 2165 $map->reset;
1865 undef $guard;
1866 return find $path; 2166 return find $path;
1867 } 2167 }
1868 2168
1869 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1870 } 2170 }
1871} 2171}
1872 2172
1873sub pre_load { } 2173sub pre_load { }
1874sub post_load { } 2174#sub post_load { } # XS
1875 2175
1876sub load { 2176sub load {
1877 my ($self) = @_; 2177 my ($self) = @_;
1878 2178
1879 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
1880 2180
1881 my $path = $self->{path}; 2181 my $path = $self->{path};
1882 2182
1883 { 2183 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2184 my $guard = cf::lock_acquire "map_data:$path";
1885 2185
2186 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2187 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2188
1888 $self->in_memory (cf::MAP_LOADING); 2189 $self->in_memory (cf::MAP_LOADING);
1889 2190
1890 $self->alloc; 2191 $self->alloc;
1891 2192
1892 $self->pre_load; 2193 $self->pre_load;
1893 Coro::cede; 2194 cf::cede_to_tick;
1894 2195
1895 $self->_load_objects ($self->{load_path}, 1) 2196 if (exists $self->{load_path}) {
2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2198 $f->skip_block;
2199 $self->_load_objects ($f)
1896 or return; 2200 or return;
1897 2201
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
1899 if delete $self->{load_original}; 2203 if delete $self->{load_original};
1900 2204
1901 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2206 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2207 unless (aio_stat $uniq) {
2208 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2209 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2210 $self->_load_objects ($f);
2211 $f->resolve_delayed_derefs;
2212 }
2213 }
1906 } 2214 }
1907 }
1908 2215
1909 Coro::cede; 2216 $f->resolve_delayed_derefs;
2217 }
2218
2219 cf::cede_to_tick;
1910 # now do the right thing for maps 2220 # now do the right thing for maps
1911 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2223 unless $self->difficulty;
1914 Coro::cede; 2224 cf::cede_to_tick;
1915 2225
1916 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2227 $self->decay_objects;
1918 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
1919 $self->update_buttons; 2229 $self->update_buttons;
1920 Coro::cede; 2230 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2231 $self->activate;
1924 } 2232 }
1925 2233
1926 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
1928 2236
1929 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
1930 } 2238 }
1931 2239
1932 $self->post_load; 2240 $self->post_load;
1933}
1934 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
1935sub customise_for { 2248sub customise_for {
1936 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
1937 2250
1938 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
1939 if $self->per_player; 2252 if $self->per_player;
1943 2256
1944 $self 2257 $self
1945} 2258}
1946 2259
1947# find and load all maps in the 3x3 area around a map 2260# find and load all maps in the 3x3 area around a map
1948sub load_diag { 2261sub load_neighbours {
1949 my ($map) = @_; 2262 my ($map) = @_;
1950 2263
1951 my @diag; # diagonal neighbours 2264 my @neigh; # diagonal neighbours
1952 2265
1953 for (0 .. 3) { 2266 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2267 my $neigh = $map->tile_path ($_)
1955 or next; 2268 or next;
1956 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
1957 or next; 2270 or next;
1958 $neigh->load; 2271 $neigh->load;
1959 2272
2273 # now find the diagonal neighbours
2274 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2277 }
1963 2278
1964 for (@diag) { 2279 for (grep defined $_->[0], @neigh) {
2280 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2281 my $neigh = find $path, $origin
1966 or next; 2282 or next;
1967 $neigh->load; 2283 $neigh->load;
1968 } 2284 }
1969} 2285}
1970 2286
1971sub find_sync { 2287sub find_sync {
1972 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
1973 2289
1974 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
1975} 2294}
1976 2295
1977sub do_load_sync { 2296sub do_load_sync {
1978 my ($map) = @_; 2297 my ($map) = @_;
1979 2298
1980 cf::sync_job { $map->load }; 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2300 if $Coro::current == $Coro::main;
2301
2302 $map->load;
1981} 2303}
1982 2304
1983our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
1985 2307
1986sub find_async { 2308sub find_async {
1987 my ($path, $origin) = @_; 2309 my ($path, $origin, $load) = @_;
1988 2310
1989 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
1990 2312
1991 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1993 } 2315 }
1994 2316
1995 undef $MAP_PREFETCH{$path}; 2317 $MAP_PREFETCH{$path} |= $load;
2318
1996 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2320 $Coro::current->{desc} = "map prefetcher";
2321
1997 while (%MAP_PREFETCH) { 2322 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2323 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2324 if (my $map = find $k) {
2000 $map->load; 2325 $map->load if $v;
2001 } 2326 }
2002 2327
2003 delete $MAP_PREFETCH{$path}; 2328 delete $MAP_PREFETCH{$k};
2004 } 2329 }
2005 } 2330 }
2006 undef $MAP_PREFETCHER; 2331 undef $MAP_PREFETCHER;
2007 }; 2332 };
2008 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2009 2334
2010 () 2335 ()
2011} 2336}
2012 2337
2338# common code, used by both ->save and ->swapout
2013sub save { 2339sub _save {
2014 my ($self) = @_; 2340 my ($self) = @_;
2015
2016 my $lock = cf::lock_acquire "map_data:" . $self->path;
2017 2341
2018 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2019 2343
2020 return unless $self->dirty; 2344 return unless $self->dirty;
2021 2345
2027 return if $self->{deny_save}; 2351 return if $self->{deny_save};
2028 2352
2029 local $self->{last_access} = $self->last_access;#d# 2353 local $self->{last_access} = $self->last_access;#d#
2030 2354
2031 cf::async { 2355 cf::async {
2356 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2033 }; 2358 };
2359
2360 cf::get_slot 0.02;
2034 2361
2035 if ($uniq) { 2362 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2037 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2038 } else { 2365 } else {
2039 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2040 } 2367 }
2041} 2368}
2042 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2043sub swap_out { 2378sub swap_out {
2044 my ($self) = @_; 2379 my ($self) = @_;
2045 2380
2046 # save first because save cedes
2047 $self->save;
2048
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2051 return if $self->players; 2385 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save};
2054 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2055 $self->clear; 2396 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2397}
2058 2398
2059sub reset_at { 2399sub reset_at {
2060 my ($self) = @_; 2400 my ($self) = @_;
2061 2401
2079 2419
2080 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2081 2421
2082 return if $self->players; 2422 return if $self->players;
2083 2423
2084 warn "resetting map ", $self->path; 2424 cf::trace "resetting map ", $self->path, "\n";
2085 2425
2086 $self->in_memory (cf::MAP_SWAPPED); 2426 $self->in_memory (cf::MAP_SWAPPED);
2087 2427
2088 # need to save uniques path 2428 # need to save uniques path
2089 unless ($self->{deny_save}) { 2429 unless ($self->{deny_save}) {
2093 if $uniq; 2433 if $uniq;
2094 } 2434 }
2095 2435
2096 delete $cf::MAP{$self->path}; 2436 delete $cf::MAP{$self->path};
2097 2437
2438 $self->deactivate;
2439 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2440 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2441
2102 $self->unlink_save; 2442 $self->unlink_save;
2103 $self->destroy; 2443 $self->destroy;
2104} 2444}
2105 2445
2106my $nuke_counter = "aaaa"; 2446my $nuke_counter = "aaaa";
2107 2447
2108sub nuke { 2448sub nuke {
2109 my ($self) = @_; 2449 my ($self) = @_;
2110 2450
2451 {
2452 my $lock = cf::lock_acquire "map_data:$self->{path}";
2453
2111 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2112 2455
2113 $self->unlink_save; 2456 $self->unlink_save;
2114 2457
2115 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2116 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2463
2121 $cf::MAP{$self->path} = $self; 2464 $cf::MAP{$self->path} = $self;
2465 }
2122 2466
2123 $self->reset; # polite request, might not happen 2467 $self->reset; # polite request, might not happen
2124} 2468}
2125 2469
2126=item $maps = cf::map::tmp_maps 2470=item $maps = cf::map::tmp_maps
2168 2512
2169sub unique_maps() { 2513sub unique_maps() {
2170 [ 2514 [
2171 map { 2515 map {
2172 utf8::decode $_; 2516 utf8::decode $_;
2173 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2174 ? normalise $_ 2520 : normalise $_
2175 : ()
2176 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2177 ] 2522 ]
2178} 2523}
2179 2524
2180package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2181 2556
2182=back 2557=back
2183 2558
2184=head3 cf::object 2559=head3 cf::object
2185 2560
2189 2564
2190=over 4 2565=over 4
2191 2566
2192=item $ob->inv_recursive 2567=item $ob->inv_recursive
2193 2568
2194Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
2195 2571
2196=cut 2572=cut
2197 2573
2198sub inv_recursive_; 2574sub inv_recursive_;
2199sub inv_recursive_ { 2575sub inv_recursive_ {
2202 2578
2203sub inv_recursive { 2579sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2205} 2581}
2206 2582
2583=item $ref = $ob->ref
2584
2585Creates and returns a persistent reference to an object that can be stored as a string.
2586
2587=item $ob = cf::object::deref ($refstring)
2588
2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2590even if the object actually exists. May block.
2591
2592=cut
2593
2594sub deref {
2595 my ($ref) = @_;
2596
2597 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2598 my ($uuid, $name) = ($1, $2);
2599 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2600 or return;
2601 $pl->ob->uuid eq $uuid
2602 or return;
2603
2604 $pl->ob
2605 } else {
2606 warn "$ref: cannot resolve object reference\n";
2607 undef
2608 }
2609}
2610
2207package cf; 2611package cf;
2208 2612
2209=back 2613=back
2210 2614
2211=head3 cf::object::player 2615=head3 cf::object::player
2217Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2621Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2218can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
2219dialogue with the given NPC character. 2623dialogue with the given NPC character.
2220 2624
2221=cut 2625=cut
2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
2222 2640
2223# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2224# with dialog boxes. 2642# with dialog boxes.
2225#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
2226sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2238 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2240 2658
2241 } else { 2659 } else {
2242 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2243 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2244 } 2662 }
2245 } 2663 }
2664}
2665
2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2667
2668=cut
2669
2670sub cf::object::send_msg {
2671 my $pl = shift->contr
2672 or return;
2673 $pl->send_msg (@_);
2246} 2674}
2247 2675
2248=item $player_object->may ("access") 2676=item $player_object->may ("access")
2249 2677
2250Returns wether the given player is authorized to access resource "access" 2678Returns wether the given player is authorized to access resource "access"
2263 2691
2264=item $player_object->enter_link 2692=item $player_object->enter_link
2265 2693
2266Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2267 2695
2268The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
2269I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
2270 2700
2271Will never block. 2701Will never block.
2272 2702
2273=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2274 2704
2294sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2295 my ($self) = @_; 2725 my ($self) = @_;
2296 2726
2297 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2298 2728
2729 ++$self->{_link_recursion};
2730
2299 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2300 2732
2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2302 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2303 2735
2304 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2305} 2737}
2306 2738
2307sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2308 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2309 2741
2326 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2327 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2328 2760
2329 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2332 2764
2333 $map->load; 2765 $map->load;
2334 $map->load_diag; 2766 $map->load_neighbours;
2335 2767
2336 return unless $self->contr->active; 2768 return unless $self->contr->active;
2337 $self->activate_recursive;
2338 2769
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2340 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2341} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2342 2777
2778}
2779
2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2344 2781
2345Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2346her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2347that has to return the map if sucecssful, and then unfreezes the player on 2784that has to return the map if sucecssful, and then unfreezes the player on
2348the new (success) or old (failed) map position. In either case, $done will 2785the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process. 2786be called at the end of this process.
2350 2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2790
2351=cut 2791=cut
2352 2792
2353our $GOTOGEN; 2793our $GOTOGEN;
2354 2794
2355sub cf::object::player::goto { 2795sub cf::object::player::goto {
2356 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2357 2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2803
2358 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2806
2361 $self->enter_link; 2807 $self->enter_link;
2362 2808
2363 (async { 2809 (async {
2810 $Coro::current->{desc} = "player::goto $path $x $y";
2811
2812 # *tag paths override both path and x|y
2813 if ($path =~ /^\*(.*)$/) {
2814 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2815 my $ob = $obs[rand @obs];
2816
2817 # see if we actually can go there
2818 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2819 $ob = $obs[rand @obs];
2820 } else {
2821 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2822 }
2823 # else put us there anyways for now #d#
2824
2825 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2826 } else {
2827 ($path, $x, $y) = (undef, undef, undef);
2828 }
2829 }
2830
2364 my $map = eval { 2831 my $map = eval {
2365 my $map = cf::map::find $path; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2366 2833
2367 if ($map) { 2834 if ($map) {
2368 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2370 } else { 2837 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2839 }
2373 2840
2374 $map 2841 $map
2375 }; 2842 };
2376 2843
2382 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2383 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2384 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2385 } 2852 }
2386 2853
2387 $done->() if $done; 2854 $done->($self) if $done;
2388 })->prio (1); 2855 })->prio (1);
2389} 2856}
2390 2857
2391=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2392 2859
2412} 2879}
2413 2880
2414sub prepare_random_map { 2881sub prepare_random_map {
2415 my ($exit) = @_; 2882 my ($exit) = @_;
2416 2883
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2886 # that depends on the exit object
2422 2887
2423 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2425 if ($exit->map) { 2890 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2430 } 2897 }
2431 2898
2432 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2433 2900
2434 my $data = cf::to_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2437 2904
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2907 undef $fh;
2441 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2442 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2445 } 2916 }
2446} 2917}
2447 2918
2448sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2450 2921
2451 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2452 2923
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2924 $self->enter_link;
2465 2925
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2926 (async {
2471 $self->deactivate_recursive; # just to be sure 2927 $Coro::current->{desc} = "enter_exit";
2928
2472 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2473 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2474 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2475 1; 2950 1
2476 }) { 2951 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2478 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2479 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2481 2956
2482 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2483 $self->leave_link; 2958 $self->leave_link;
2484 } 2959 }
2485 })->prio (1); 2960 })->prio (1);
2486} 2961}
2487 2962
2499sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2500 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2501 2976
2502 utf8::encode $text; 2977 utf8::encode $text;
2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2504} 3004}
2505 3005
2506=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2507 3007
2508Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2510the message, with C<log> being the default. If C<$color> is negative, suppress 3010the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 3011the message unless the client supports the msg packet.
2512 3012
2513=cut 3013=cut
2514 3014
3015# non-persistent channels (usually the info channel)
3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
3023 "c/identify" => {
3024 id => "infobox",
3025 title => "Identify",
3026 reply => undef,
3027 tooltip => "Items recently identified",
3028 },
3029 "c/examine" => {
3030 id => "infobox",
3031 title => "Examine",
3032 reply => undef,
3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
3040 },
3041 "c/book" => {
3042 id => "infobox",
3043 title => "Book",
3044 reply => undef,
3045 tooltip => "The contents of a note or book",
3046 },
3047 "c/lookat" => {
3048 id => "infobox",
3049 title => "Look",
3050 reply => undef,
3051 tooltip => "What you saw there",
3052 },
3053 "c/who" => {
3054 id => "infobox",
3055 title => "Players",
3056 reply => undef,
3057 tooltip => "Shows players who are currently online",
3058 },
3059 "c/body" => {
3060 id => "infobox",
3061 title => "Body Parts",
3062 reply => undef,
3063 tooltip => "Shows which body parts you posess and are available",
3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
3101 "c/uptime" => {
3102 id => "infobox",
3103 title => "Uptime",
3104 reply => undef,
3105 tooltip => "How long the server has been running since last restart",
3106 },
3107 "c/mapinfo" => {
3108 id => "infobox",
3109 title => "Map Info",
3110 reply => undef,
3111 tooltip => "Information related to the maps",
3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
3127);
3128
2515sub cf::client::send_msg { 3129sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2517 3131
2518 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2519 3134
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 3136
3137 # check predefined channels, for the benefit of C
3138 if ($CHANNEL{$channel}) {
3139 $channel = $CHANNEL{$channel};
3140
3141 $self->ext_msg (channel_info => $channel);
3142 $channel = $channel->{id};
3143
2522 if (ref $channel) { 3144 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 3148 $self->ext_msg (channel_info => $channel);
2527 } 3149 }
2529 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2530 } 3152 }
2531 3153
2532 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2533 3155
2534 if ($self->can_msg) {
2535 # default colour, mask it out 3156 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2538 3159
2539 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 3163 );
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552 3164
2553 $color &= cf::NDI_COLOR_MASK; 3165 $self->send_big_packet ($pkt);
2554
2555 utf8::encode $msg;
2556
2557 if (0 && $msg =~ /\[/) {
2558 $self->send_packet ("drawextinfo $color 4 0 $msg")
2559 } else {
2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561 $self->send_packet ("drawinfo $color $msg")
2562 }
2563 }
2564 }
2565} 3166}
2566 3167
2567=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2568 3169
2569Sends an ext event to the client. 3170Sends an ext event to the client.
2571=cut 3172=cut
2572 3173
2573sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2574 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2575 3176
2576 my $extcmd = $self->extcmd;
2577
2578 if ($extcmd == 2) { 3177 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580 } elsif ($extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2581 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2582 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3182 }
3183}
3184
3185=item $client->ext_reply ($msgid, @msg)
3186
3187Sends an ext reply to the client.
3188
3189=cut
3190
3191sub cf::client::ext_reply($$@) {
3192 my ($self, $id, @msg) = @_;
3193
3194 if ($self->extcmd == 2) {
3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3196 } elsif ($self->extcmd == 1) {
3197 #TODO: version 1, remove
3198 unshift @msg, msgtype => "reply", msgid => $id;
3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583 } 3200 }
2584} 3201}
2585 3202
2586=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2587 3204
2648 my ($type, $reply, @payload) = 3265 my ($type, $reply, @payload) =
2649 "ARRAY" eq ref $msg 3266 "ARRAY" eq ref $msg
2650 ? @$msg 3267 ? @$msg
2651 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3268 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2652 3269
3270 my @reply;
3271
2653 if (my $cb = $EXTICMD{$type}) { 3272 if (my $cb = $EXTICMD{$type}) {
2654 my @reply = $cb->($ns, @payload); 3273 @reply = $cb->($ns, @payload);
2655
2656 $ns->ext_reply ($reply, @reply)
2657 if $reply;
2658 } 3274 }
3275
3276 $ns->ext_reply ($reply, @reply)
3277 if $reply;
3278
2659 } else { 3279 } else {
2660 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2661 } 3281 }
2662 3282
2663 cf::override; 3283 cf::override;
2664 }, 3284 },
2665); 3285);
2685 3305
2686 $coro 3306 $coro
2687} 3307}
2688 3308
2689cf::client->attach ( 3309cf::client->attach (
2690 on_destroy => sub { 3310 on_client_destroy => sub {
2691 my ($ns) = @_; 3311 my ($ns) = @_;
2692 3312
2693 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2694 }, 3314 },
2695); 3315);
2711our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
2712 3332
2713$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
2714 3334
2715$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
2716 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
2717 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
2718 sort time 3338 sort time
2719)); 3339));
2720 3340
2721# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
2723=pod 3343=pod
2724 3344
2725The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
2726 3346
2727 cf::object 3347 cf::object
2728 contr pay_amount pay_player map x y force_find force_add 3348 contr pay_amount pay_player map x y force_find force_add destroy
2729 insert remove 3349 insert remove name archname title slaying race decrease split
3350 value
2730 3351
2731 cf::object::player 3352 cf::object::player
2732 player 3353 player
2733 3354
2734 cf::player 3355 cf::player
2739 3360
2740=cut 3361=cut
2741 3362
2742for ( 3363for (
2743 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2744 insert remove inv)], 3365 insert remove inv nrof name archname title slaying race
3366 decrease split destroy change_exp value msg lore send_msg)],
2745 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
2746 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
2747 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
2748) { 3370) {
2749 no strict 'refs';
2750 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
2751 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2752 for @funs; 3373 for @funs;
2753} 3374}
2754 3375
2769 3390
2770 my $qcode = $code; 3391 my $qcode = $code;
2771 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2772 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
2773 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
2774 local $_; 3398 local $_;
2775 local @safe::cf::_safe_eval_args = values %vars;
2776 3399
2777 my $eval = 3400 my $eval =
2778 "do {\n" 3401 "do {\n"
2779 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2780 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
2781 . $code 3404 . $code
2782 . "\n}" 3405 . "\n}"
2783 ; 3406 ;
2784 3407
3408 if ($CFG{safe_eval}) {
2785 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
2786 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2787 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
2788 3417
2789 if ($@) { 3418 if ($@) {
2790 warn "$@"; 3419 warn "$@",
2791 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
2792 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
2793 } 3422 }
2794 3423
2795 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
2796} 3425}
2797 3426
2811=cut 3440=cut
2812 3441
2813sub register_script_function { 3442sub register_script_function {
2814 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
2815 3444
2816 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
2817 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
2818} 3447}
2819 3448
2820=back 3449=back
2821 3450
2822=cut 3451=cut
2825# the server's init and main functions 3454# the server's init and main functions
2826 3455
2827sub load_facedata($) { 3456sub load_facedata($) {
2828 my ($path) = @_; 3457 my ($path) = @_;
2829 3458
3459 # HACK to clear player env face cache, we need some signal framework
3460 # for this (global event?)
3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3462
3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3464
2830 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
2831 3466
2832 my $facedata; 3467 my $facedata = decode_storable load_file $path;
2833 0 < aio_load $path, $facedata
2834 or die "$path: $!";
2835
2836 $facedata = Coro::Storable::thaw $facedata;
2837 3468
2838 $facedata->{version} == 2 3469 $facedata->{version} == 2
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3471
3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3474 $facedata->{resource}{"res/exp_table"} = {
3475 type => FT_RSRC,
3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3478 };
3479 cf::cede_to_tick;
3480
2841 { 3481 {
2842 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
2843 3483
2844 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
2845 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3486
2846 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
2847 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
2848 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2849 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2850 3492
2851 cf::cede_to_tick; 3493 cf::cede_to_tick;
2852 } 3494 }
2853 3495
2854 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
2855 next unless $info->{smooth}; 3497 next unless $info->{smooth};
3498
2856 my $idx = cf::face::find $face 3499 my $idx = cf::face::find $face
2857 or next; 3500 or next;
3501
2858 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
2859 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
2860 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2861 } else { 3505 } else {
2862 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
2863 } 3507 }
2864 3508
2865 cf::cede_to_tick; 3509 cf::cede_to_tick;
2866 } 3510 }
2867 } 3511 }
2876 3520
2877 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
2878 } 3522 }
2879 3523
2880 { 3524 {
2881 # TODO: for gcfclient pleasure, we should give resources
2882 # that gcfclient doesn't grok a >10000 face index.
2883 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
2884 my $enc = JSON::XS->new->utf8->canonical;
2885
2886 my $soundconf = delete $res->{"res/sound.conf"};
2887 3526
2888 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
2889 my $meta = $enc->encode ({ 3528 if (defined $info->{type}) {
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2895 3530
2896 if ($info->{type} & 1) {
2897 # prepend meta info
2898
2899 my $data = pack "(w/a*)*", $meta, $info->{data};
2900 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2901
2902 cf::face::set_data $idx, 0, $data, $chk; 3531 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3532 cf::face::set_type $idx, $info->{type};
2903 } else { 3533 } else {
2904 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3534 $RESOURCE{$name} = $info; # unused
2905 } 3535 }
2906 3536
2907 cf::face::set_type $idx, $info->{type};
2908
2909 cf::cede_to_tick; 3537 cf::cede_to_tick;
2910 } 3538 }
2911
2912 if ($soundconf) {
2913 $soundconf = $enc->decode (delete $soundconf->{data});
2914
2915 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2916 my $sound = $soundconf->{compat}[$_]
2917 or next;
2918
2919 my $face = cf::face::find "sound/$sound->[1]";
2920 cf::sound::set $sound->[0] => $face;
2921 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2922 }
2923
2924 while (my ($k, $v) = each %{$soundconf->{event}}) {
2925 my $face = cf::face::find "sound/$v";
2926 cf::sound::set $k => $face;
2927 }
2928 }
2929 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2930 3542
2931 1 3543 1
2932} 3544}
2933 3545
2934register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
2937 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
2938 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
2939 } 3551 }
2940}; 3552};
2941 3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3563
2942sub reload_regions { 3564sub reload_regions {
3565 # HACK to clear player env face cache, we need some signal framework
3566 # for this (global event?)
3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3568
2943 load_resource_file "$MAPDIR/regions" 3569 load_resource_file "$MAPDIR/regions"
2944 or die "unable to load regions file\n"; 3570 or die "unable to load regions file\n";
2945 3571
2946 for (cf::region::list) { 3572 for (cf::region::list) {
2947 $_->{match} = qr/$_->{match}/ 3573 $_->{match} = qr/$_->{match}/
2955} 3581}
2956 3582
2957sub reload_archetypes { 3583sub reload_archetypes {
2958 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
2959 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
2960 #d# NEED to laod twice to resolve forward references
2961 # this really needs to be done in an extra post-pass
2962 # (which needs to be synchronous, so solve it differently)
2963 load_resource_file "$DATADIR/archetypes"
2964 or die "unable to load archetypes\n";
2965} 3586}
2966 3587
2967sub reload_treasures { 3588sub reload_treasures {
2968 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
2969 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
2970} 3591}
2971 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
2972sub reload_resources { 3613sub reload_resources {
2973 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
2974 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
2975 reload_regions; 3621 reload_regions;
2976 reload_facedata;
2977 #reload_archetypes;#d#
2978 reload_archetypes;
2979 reload_treasures; 3622 reload_treasures;
2980 3623
2981 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
2982} 3625}
2983 3626
2984sub init { 3627sub reload_config {
2985 reload_resources; 3628 trace "reloading config file...\n";
2986}
2987 3629
2988sub cfg_load { 3630 my $config = load_file "$CONFDIR/config";
2989 open my $fh, "<:utf8", "$CONFDIR/config" 3631 utf8::decode $config;
2990 or return; 3632 *CFG = decode_yaml $config;
2991 3633
2992 local $/;
2993 *CFG = YAML::Syck::Load <$fh>;
2994
2995 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2996 3635
2997 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2998 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2999 3638
3000 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3004 }; 3643 };
3005 warn $@ if $@; 3644 warn $@ if $@;
3006 } 3645 }
3007} 3646}
3008 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3009sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
3010 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3011 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3012 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3013 (async { 3689 (async {
3014 Event::one_event; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3691 EV::loop EV::LOOP_ONESHOT;
3015 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3016 }; 3693 };
3017 3694
3018 cfg_load; 3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3707 reload_config;
3019 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
3020 load_extensions; 3718 load_extensions;
3021 3719
3022 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3023 Event::loop; 3721
3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3024} 3738}
3025 3739
3026############################################################################# 3740#############################################################################
3027# initialisation and cleanup 3741# initialisation and cleanup
3028 3742
3029# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3030BEGIN { 3744BEGIN {
3745 our %SIGWATCHER = ();
3031 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3032 Event->signal ( 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3033 reentrant => 0,
3034 data => WF_AUTOCANCEL,
3035 signal => $signal,
3036 prio => 0,
3037 cb => sub {
3038 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3039 },
3040 ); 3749 };
3041 } 3750 }
3042} 3751}
3043 3752
3044sub write_runtime { 3753sub write_runtime_sync {
3045 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3046 3755
3047 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3048 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3049 3758
3050 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3051 3760
3052 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3053 3762
3054 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3055 or return; 3764 or return;
3056 3765
3057 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3058 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3059 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3069 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3070 3779
3071 close $fh 3780 close $fh
3072 or return; 3781 or return;
3073 3782
3074 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3075 and return; 3784 and return;
3076 3785
3077 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3078 3787
3079 1 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
3080} 3839}
3081 3840
3082sub emergency_save() { 3841sub emergency_save() {
3083 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3084 3843
3085 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3086 3850
3087 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3088 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3089 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3090 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3091 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3092 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3093 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3094 $pl->valid or next; 3860 $pl->valid or next;
3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3095 $pl->save; 3862 $pl->save;
3096 } 3863 }
3097 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3098 3865
3099 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3100 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3101 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3102 $map->valid or next; 3871 $map->valid or next;
3103 $map->save; 3872 $map->save;
3104 } 3873 }
3105 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3106 3875
3107 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3108 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3109 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3110 }; 3904 };
3111 3905
3112 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3113} 3907}
3114 3908
3115sub post_cleanup { 3909sub post_cleanup {
3116 my ($make_core) = @_; 3910 my ($make_core) = @_;
3117 3911
3912 IO::AIO::flush;
3913
3118 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3119 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
3120} 3944}
3121 3945
3122sub do_reload_perl() { 3946sub do_reload_perl() {
3123 # can/must only be called in main 3947 # can/must only be called in main
3124 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3125 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3126 return; 3950 return;
3127 } 3951 }
3128 3952
3129 warn "reloading..."; 3953 return if $RELOAD++;
3130 3954
3131 warn "entering sync_job"; 3955 my $t1 = AE::time;
3132 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
3133 cf::sync_job { 3963 cf::sync_job {
3134 cf::write_runtime; # external watchdog should not bark
3135 cf::emergency_save; 3964 #cf::emergency_save;
3136 cf::write_runtime; # external watchdog should not bark
3137 3965
3138 warn "syncing database to disk";
3139 BDB::db_env_txn_checkpoint $DB_ENV;
3140
3141 # if anything goes wrong in here, we should simply crash as we already saved
3142
3143 warn "cancelling all WF_AUTOCANCEL watchers";
3144 for (Event::all_watchers) {
3145 $_->cancel if $_->data & WF_AUTOCANCEL;
3146 }
3147
3148 warn "flushing outstanding aio requests";
3149 for (;;) {
3150 BDB::flush;
3151 IO::AIO::flush;
3152 Coro::cede;
3153 last unless IO::AIO::nreqs || BDB::nreqs;
3154 warn "iterate...";
3155 }
3156
3157 ++$RELOAD;
3158
3159 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3160 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3161 %EXT_CORO = (); 3968 %EXT_CORO = ();
3162 3969
3163 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3164 %COMMAND = (); 3971 %COMMAND = ();
3165 3972
3166 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3167 %EXTCMD = (); 3974 %EXTCMD = ();
3168 %EXTICMD = (); 3975 %EXTICMD = ();
3169 3976
3170 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3171 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3172 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3173 3980
3174 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3175 eval { 3982 eval {
3176 $cb->($pkg); 3983 $cb->($pkg);
3177 1 3984 1
3178 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
3179 } 3990 }
3180 3991
3181 warn "... nuking $pkg";
3182 Symbol::delete_package $pkg;
3183 }
3184
3185 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3186 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3187 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3188 3995
3189 warn "... unloading $k"; 3996 trace "... unloading $k";
3190 delete $INC{$k}; 3997 delete $INC{$k};
3191 3998
3192 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3193 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3194 4001
3195 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3196 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3197 } 4007 }
3198 4008
3199 Symbol::delete_package $k;
3200 }
3201
3202 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3203 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3204 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3205 4012
3206 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3207 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3208 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3209 4016
3210 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3211 # and global variables created in xs 4018 # and global variables created in xs
3212 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3213 4020
3214 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3215 4022
3216 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3217 require cf; 4024 require cf;
3218 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3219 4026
3220 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3221 cf::cfg_load; 4028 cf::reload_config;
3222 4029
3223 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3224 cf::load_extensions; 4031 cf::load_extensions;
3225 4032
4033 if ($REATTACH_ON_RELOAD) {
3226 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3227 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3228 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3229 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3230 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3231 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3232 4041
3233 warn "leaving sync_job"; 4042 cf::_post_init 1;
3234 4043
4044 trace "perl_reload: leaving sync_job";
4045
3235 1 4046 1
3236 } or do { 4047 } or do {
3237 warn $@; 4048 error $@;
3238 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3239 exit 1; 4050 };
4051
4052 --$RELOAD;
3240 }; 4053 }
3241 4054
3242 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3243}; 4057};
3244 4058
3245our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3246 4060
3247sub reload_perl() { 4061sub reload_perl() {
3248 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3249 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3250 4064
3251 $RELOAD_WATCHER ||= Event->timer ( 4065 $RELOAD_WATCHER ||= cf::async {
3252 reentrant => 0, 4066 Coro::AIO::aio_wait cache_extensions;
3253 after => 0, 4067
3254 data => WF_AUTOCANCEL, 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3255 cb => sub {
3256 do_reload_perl; 4069 do_reload_perl;
3257 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3258 }, 4071 };
3259 ); 4072 };
3260} 4073}
3261 4074
3262register_command "reload" => sub { 4075register_command "reload" => sub {
3263 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3264 4077
3265 if ($who->flag (FLAG_WIZ)) { 4078 if ($who->flag (FLAG_WIZ)) {
3266 $who->message ("reloading server."); 4079 $who->message ("reloading server.");
4080 async {
4081 $Coro::current->{desc} = "perl_reload";
3267 async { reload_perl }; 4082 reload_perl;
4083 };
3268 } 4084 }
3269}; 4085};
3270 4086
3271unshift @INC, $LIBDIR; 4087#############################################################################
3272 4088
3273my $bug_warning = 0; 4089my $bug_warning = 0;
3274 4090
3275our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3276our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3277 4093
3278sub wait_for_tick { 4094sub wait_for_tick() {
3279 return unless $TICK_WATCHER->is_active;
3280 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3281 4096
3282 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3283 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3284 $signal->wait; 4099 $signal->wait;
3285} 4100}
3286 4101
3287sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3288 return unless $TICK_WATCHER->is_active;
3289 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3290 4104
3291 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3292 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3293 $signal->wait; 4107 $signal->wait;
3294} 4108}
3295 4109
3296 my $min = 1e6;#d# 4110sub tick {
3297 my $avg = 10;
3298$TICK_WATCHER = Event->timer (
3299 reentrant => 0,
3300 parked => 1,
3301 prio => 0,
3302 at => $NEXT_TICK || $TICK,
3303 data => WF_AUTOCANCEL,
3304 cb => sub {
3305 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3306 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3307 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3308 return; 4114 return;
3309 } 4115 }
3310 4116
3311 $NOW = $tick_start = Event::time;
3312
3313 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3314 4118
3315 0 && sync_job {#d# 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3316 for(1..10) {
3317 my $t = Event::time;
3318 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3319 or die;
3320 4120
3321 $map->width (50); 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3322 $map->height (50); 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3323 $map->alloc; 4123 Coro::async_pool {
3324 $map->_load_objects ("/tmp/x.map", 1); 4124 $Coro::current->{desc} = "runtime saver";
3325 my $t = Event::time - $t; 4125 write_runtime_sync
3326 4126 or error "ERROR: unable to write runtime file: $!";
3327 #next unless $t < 0.0013;#d#
3328 if ($t < $min) {
3329 $min = $t;
3330 }
3331 $avg = $avg * 0.99 + $t * 0.01;
3332 }
3333 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3334 exit 0;
3335 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3336 }; 4127 };
4128 }
3337 4129
3338 $RUNTIME += $TICK;
3339 $NEXT_TICK += $TICK;
3340
3341 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3342 $NEXT_RUNTIME_WRITE = $NOW + 10;
3343 Coro::async_pool {
3344 write_runtime
3345 or warn "ERROR: unable to write runtime file: $!";
3346 };
3347 }
3348
3349# my $AFTER = Event::time;
3350# warn $AFTER - $NOW;#d#
3351
3352 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3353 $sig->send; 4131 $sig->send;
3354 } 4132 }
3355 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3356 $sig->send; 4134 $sig->send;
3357 } 4135 }
3358 4136
3359 $NOW = Event::time; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3360
3361 # if we are delayed by four ticks or more, skip them all
3362 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3363
3364 $TICK_WATCHER->at ($NEXT_TICK);
3365 $TICK_WATCHER->start;
3366
3367 $LOAD = ($NOW - $tick_start) / $TICK;
3368 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3369 4139
3370 _post_tick; 4140 if (0) {
3371 4141 if ($NEXT_TICK) {
3372 4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
3373 }, 4146 }
3374); 4147}
3375 4148
3376{ 4149{
3377 BDB::max_poll_time $TICK * 0.1; 4150 # configure BDB
3378 $BDB_POLL_WATCHER = Event->io ( 4151
3379 reentrant => 0,
3380 fd => BDB::poll_fileno,
3381 poll => 'r',
3382 prio => 0,
3383 data => WF_AUTOCANCEL,
3384 cb => \&BDB::poll_cb,
3385 );
3386 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3387 4153 BDB::max_poll_reqs $TICK * 0.1;
3388 BDB::set_sync_prepare { 4154 $AnyEvent::BDB::WATCHER->priority (1);
3389 my $status;
3390 my $current = $Coro::current;
3391 (
3392 sub {
3393 $status = $!;
3394 $current->ready; undef $current;
3395 },
3396 sub {
3397 Coro::schedule while defined $current;
3398 $! = $status;
3399 },
3400 )
3401 };
3402 4155
3403 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3404 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3405 4163
3406 cf::sync_job { 4164 cf::sync_job {
3407 eval { 4165 eval {
3408 BDB::db_env_open 4166 BDB::db_env_open
3409 $DB_ENV, 4167 $DB_ENV,
3411 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4169 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3412 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4170 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3413 0666; 4171 0666;
3414 4172
3415 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4173 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3416
3417 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3418 $DB_ENV->set_lk_detect;
3419 }; 4174 };
3420 4175
3421 cf::cleanup "db_env_open(db): $@" if $@; 4176 cf::cleanup "db_env_open(db): $@" if $@;
3422 }; 4177 };
3423 } 4178 }
4179
4180 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4181 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4182 };
4183 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4184 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4185 };
4186 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4187 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4188 };
3424} 4189}
3425 4190
3426{ 4191{
4192 # configure IO::AIO
4193
3427 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3428
3429 undef $Coro::AIO::WATCHER;
3430 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3431 $AIO_POLL_WATCHER = Event->io ( 4196 undef $AnyEvent::AIO::WATCHER;
3432 reentrant => 0,
3433 data => WF_AUTOCANCEL,
3434 fd => IO::AIO::poll_fileno,
3435 poll => 'r',
3436 prio => 6,
3437 cb => \&IO::AIO::poll_cb,
3438 );
3439} 4197}
3440 4198
3441my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3442 4201
3443sub _log_backtrace { 4202sub _log_backtrace {
3444 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3445 4204
3446 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3447 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3448 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3449 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3450 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3451 async { 4215 async {
4216 $Coro::current->{desc} = "abt $msg";
4217
3452 my @bt = fork_call { 4218 my @bt = fork_call {
3453 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3454 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4220 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3455 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4221 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3456 or die "addr2line: $!"; 4222 or die "addr2line: $!";
3464 } 4230 }
3465 4231
3466 @funcs 4232 @funcs
3467 }; 4233 };
3468 4234
3469 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3470 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3471 --$_log_backtrace; 4238 --$_log_backtrace;
3472 }; 4239 };
3473 } else { 4240 } else {
3474 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3475 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3476 } 4243 }
3477} 4244}
3478 4245
3479# load additional modules 4246# load additional modules
3480use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3481 4249
3482END { cf::emergency_save } 4250END { cf::emergency_save }
3483 4251
34841 42521
3485 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines