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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 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;
322 };
323 $TICK_WATCHER->stop;
324 $guard
325} 486}
326 487
488=item cf::periodic $interval, $cb
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
501}
502
327=item cf::get_slot $time[, $priority] 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.
512
513The optional C<$name> can be used to identify the job to run. It might be
514used for statistical purposes and should identify the same time-class.
332 515
333Useful for short background jobs. 516Useful for short background jobs.
334 517
335=cut 518=cut
336 519
337our @SLOT_QUEUE; 520our @SLOT_QUEUE;
338our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
339 523
340$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
341$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
342 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
343 530
344 while () { 531 while () {
345 next_job: 532 next_job:
533
346 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
347 if ($avail > 0.01) { 535
348 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
349 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
350 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
351 $job->[2]->send; 540 $job->[2]->send;
352 Coro::cede; 541 Coro::cede;
353 goto next_job; 542 goto next_job;
354 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
355 } 545 }
356 } 546 }
357 547
358 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
359 # 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
360 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
361 $signal->wait; 551 $signal->wait;
362 } else { 552 } else {
553 $busy = 0;
363 Coro::schedule; 554 Coro::schedule;
364 } 555 }
365 } 556 }
366}; 557};
367 558
368sub get_slot($;$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
369 my ($time, $pri) = @_; 562 my ($time, $pri, $name) = @_;
370 563
564 $time = clamp $time, 0.01, $TICK * .6;
565
566 my $sig = new Coro::Signal;
567
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
374 $sig->wait; 571 $sig->wait;
375} 572}
376 573
384 581
385BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
386 583
387=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
388 585
389The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
390is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
391partly 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
392acceptable. 589acceptable.
393 590
394If 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
395the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
399=cut 596=cut
400 597
401sub sync_job(&) { 598sub sync_job(&) {
402 my ($job) = @_; 599 my ($job) = @_;
403 600
404 if ($Coro::current == $Coro::main) { 601 if (in_main) {
405 my $time = Event::time; 602 my $time = AE::time;
406 603
407 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
408 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
409 606
410 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
411 # (but this is cancel-safe) 608
412 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
413 610
414 my $busy = 1; 611 my $busy = 1;
415 my @res; 612 my @res;
416 613
417 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
418 @res = eval { $job->() }; 616 @res = eval { $job->() };
419 warn $@ if $@; 617 error $@ if $@;
420 undef $busy; 618 undef $busy;
421 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
422 620
423 while ($busy) { 621 while ($busy) {
424 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
425 } 626 }
627 }
426 628
427 $time = Event::time - $time; 629 my $time = AE::time - $time;
428 630
429 LOG llevError | logBacktrace, Carp::longmess "long sync job"
430 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
431
432 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
433 632
434 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
435 } else { 634 } else {
436 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
437 636
457 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
458 657
459 $coro 658 $coro
460} 659}
461 660
462=item fork_call { }, $args 661=item fork_call { }, @args
463 662
464Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
465process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
466Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
468 667
469=cut 668=cut
470 669
471sub _store_scalar { 670sub post_fork {
472 open my $fh, ">", \my $buf 671 reset_signals;
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478} 672}
479 673
480sub fork_call(&@) { 674sub fork_call(&@) {
481 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
482 676
483# 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,
484# or die "socketpair: $!"; 678 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 679 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 680
488 if (my $pid = fork) { 681 my @res = Coro::Util::fork_eval {
489 close $fh2; 682 cf::post_fork;
683 &$cb
684 } @args;
490 685
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 686 wantarray ? @res : $res[-1]
492 warn "pst<$res>" unless $res =~ /^pst/; 687}
493 $res = Coro::Storable::thaw $res;
494 688
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 689sub objinfo {
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals;
502 local $SIG{__WARN__};
503 local $SIG{__DIE__};
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509
510 eval {
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 } 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
522} 725}
523 726
524=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
525 728
526Returns a single value from the environment database. 729Returns a single value from the environment database.
528=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
529 732
530Stores 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
531data 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).
532 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
533=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}
534 762
535our $DB; 763our $DB;
536 764
537sub db_init { 765sub db_init {
538 unless ($DB) { 766 $DB ||= db_table "db";
539 $DB = BDB::db_create $DB_ENV;
540
541 cf::sync_job {
542 eval {
543 $DB->set_flags (BDB::CHKSUM);
544
545 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
546 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
547 cf::cleanup "db_open(db): $!" if $!;
548 };
549 cf::cleanup "db_open(db): $@" if $@;
550 };
551 }
552} 767}
553 768
554sub db_get($$) { 769sub db_get($$) {
555 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
556 771
557 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
558 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
559 776
560 $! ? () 777 $! ? ()
561 : $data 778 : $data
562 }
563} 779}
564 780
565sub db_put($$$) { 781sub db_put($$$) {
566 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
567 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
595 811
596 my @data; 812 my @data;
597 my $md5; 813 my $md5;
598 814
599 for (0 .. $#$src) { 815 for (0 .. $#$src) {
600 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
601 or Carp::croak "$src->[$_]: $!";
602 } 817 }
603 818
604 # if processing is expensive, check 819 # if processing is expensive, check
605 # checksum first 820 # checksum first
606 if (1) { 821 if (1) {
607 $md5 = 822 $md5 =
608 join "\x00", 823 join "\x00",
609 $processversion, 824 $processversion,
610 map { 825 map {
611 Coro::cede; 826 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 828 } 0.. $#$src;
614 829
615 830
616 my $dbmd5 = db_get cache => "$id/md5"; 831 my $dbmd5 = db_get cache => "$id/md5";
623 838
624 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
625 my $data = $process->(\@data); 840 my $data = $process->(\@data);
626 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
627 842
628 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
629 844
630 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
631 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
632 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
633 848
643 858
644=cut 859=cut
645 860
646sub datalog($@) { 861sub datalog($@) {
647 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
648 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
649} 864}
650 865
651=back 866=back
652 867
653=cut 868=cut
654 869
655############################################################################# 870#############################################################################
656 871
657=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
658 873
659Many 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
660attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
661to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
662 877
663In 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>
664C<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
665Crossfire TRT). 880Deliantra).
666 881
667=over 4 882=over 4
668 883
669=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
670 885
714=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
715 930
716Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
717given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
718 933
719Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
720that 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.
721 936
722These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
723 938
724=over 4 939=over 4
848 1063
849 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
850 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
851 1066
852 } elsif (ref $type) { 1067 } elsif (ref $type) {
853 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
854 1069
855 } else { 1070 } else {
856 shift @arg; 1071 shift @arg;
857 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
858 } 1073 }
859 } 1074 }
860} 1075}
861 1076
862sub _object_attach { 1077sub _object_attach {
872 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
873 } 1088 }
874 1089
875 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
876 } else { 1091 } else {
877 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
878 } 1093 }
879 1094
880 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
881} 1096}
882 1097
941 1156
942 for (@$callbacks) { 1157 for (@$callbacks) {
943 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
944 1159
945 if ($@) { 1160 if ($@) {
946 warn "$@";
947 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
948 override; 1162 override;
949 } 1163 }
950 1164
951 return 1 if $override; 1165 return 1 if $override;
952 } 1166 }
953 1167
954 0 1168 0
955} 1169}
956 1170
957=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
958 1172
959=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
960 1174
961Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
962 1176
968 1182
969=cut 1183=cut
970 1184
971############################################################################# 1185#############################################################################
972# object support 1186# object support
973#
974 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#
975sub _can_merge { 1221sub _can_merge {
976 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
977 1223
978 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
979 my $fob1 = Storable::freeze $ob1;
980 my $fob2 = Storable::freeze $ob2;
981 1225
982 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
983} 1228}
984 1229
985sub reattach { 1230sub reattach {
986 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
987 my ($obj) = @_; 1232 my ($obj) = @_;
988 1233
1234 # no longer needed after getting rid of delete_package?
989 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
990 1236
991 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
992 1238
993 @$registry = (); 1239 @$registry = ();
994 1240
999 for (@$attach) { 1245 for (@$attach) {
1000 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1001 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1002 } 1248 }
1003 } else { 1249 } else {
1004 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1005 } 1251 }
1006 } 1252 }
1007} 1253}
1008 1254
1009cf::attachable->attach ( 1255cf::attachable->attach (
1010 prio => -1000000, 1256 prio => -1000000,
1011 on_instantiate => sub { 1257 on_instantiate => sub {
1012 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1013 1259
1014 $data = from_json $data; 1260 $data = decode_json $data;
1015 1261
1016 for (@$data) { 1262 for (@$data) {
1017 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1018 1264
1019 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1035sub object_freezer_save { 1281sub object_freezer_save {
1036 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1037 1283
1038 sync_job { 1284 sync_job {
1039 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
1040 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1041 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1042 1290
1043 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1044 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1045 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1046 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 }
1047 close $fh; 1298 aio_close $fh;
1048 1299
1049 if (@$objs) { 1300 if (@$objs) {
1050 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) {
1051 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1052 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1053 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1054 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 }
1055 close $fh; 1309 aio_close $fh;
1056 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1057 } 1311 }
1058 } else { 1312 } else {
1059 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1060 } 1314 }
1061 1315
1062 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1063 } else { 1320 } else {
1064 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1065 } 1322 }
1066 } else { 1323 } else {
1067 aio_unlink $filename; 1324 aio_unlink $filename;
1068 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1069 } 1326 }
1070 } 1327 };
1071} 1328}
1072 1329
1073sub object_freezer_as_string { 1330sub object_freezer_as_string {
1074 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1075 1332
1087 or return; 1344 or return;
1088 1345
1089 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1348 or return;
1349
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1093 } 1352 }
1094 1353
1354 utf8::decode (my $decname = $filename);
1095 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1096 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
1097 return ($data, $av); 1359 ($data, $av)
1098} 1360}
1099 1361
1100=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1101 1363
1102=over 4 1364=over 4
1156 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1157 1419
1158 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1159} 1421}
1160 1422
1423use File::Glob ();
1424
1161cf::player->attach ( 1425cf::player->attach (
1162 on_command => sub { 1426 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1164 1428
1165 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1166 or return; 1430 or return;
1167 1431
1175 my ($pl, $buf) = @_; 1439 my ($pl, $buf) = @_;
1176 1440
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1442
1179 if (ref $msg) { 1443 if (ref $msg) {
1444 my ($type, $reply, @payload) =
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448
1449 my @reply;
1450
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1451 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1452 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
1185 } else { 1458 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1460 }
1188 1461
1189 cf::override; 1462 cf::override;
1190 }, 1463 },
1191); 1464);
1192 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
1193sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1194 cf::sync_job { 1482 cf::sync_job {
1195 my %todo; 1483 my %todo;
1196 1484
1197 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1198 next unless -r $path; 1486 next unless -r $path;
1216 1504
1217 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1218 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1219 1507
1220 $ext{source} = 1508 $ext{source} =
1221 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1222 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1223 . $source 1511 . $source
1224 . "\n};\n1"; 1512 . "\n};\n1";
1225 1513
1226 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1227 } 1515 }
1228 1516
1517 my $pass = 0;
1229 my %done; 1518 my %done;
1230 while (%todo) { 1519 while (%todo) {
1231 my $progress; 1520 my $progress;
1232 1521
1522 ++$pass;
1523
1524 ext:
1233 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1234 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1235 goto skip 1527 next ext
1236 unless exists $done{$_}; 1528 unless exists $done{$_};
1237 } 1529 }
1238 1530
1239 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1240 1532
1241 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1242 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1243 : "$v->{base}: extension inactive.\n";
1244 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1245 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1246 warn $msg; 1540
1247 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1248 exit 1; 1542 delete $todo{$k};
1249 } 1543 } else {
1250 1544 $done{$k} = delete $todo{$k};
1251 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1252 } 1550 }
1253
1254 $done{$k} = delete $todo{$k};
1255 push @EXTS, $v->{pkg};
1256 $progress = 1;
1257 } 1551 }
1258 1552
1259 skip: 1553 unless ($progress) {
1260 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1261 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 }
1262 } 1563 }
1263 }; 1564 };
1264} 1565}
1265 1566
1266############################################################################# 1567#############################################################################
1267 1568
1268=back 1569=back
1269 1570
1270=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1271 1572
1272Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1273 1574
1274=cut 1575=cut
1275 1576
1276package cf::player; 1577package cf::player;
1277 1578
1278use Coro::AIO; 1579use Coro::AIO;
1279 1580
1280=head3 cf::player 1581=head3 cf::player
1281 1582
1282=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}
1283 1598
1284=item cf::player::find $login 1599=item cf::player::find $login
1285 1600
1286Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1287 1602
1306 1621
1307sub exists($) { 1622sub exists($) {
1308 my ($login) = @_; 1623 my ($login) = @_;
1309 1624
1310 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1311 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1312} 1627}
1313 1628
1314sub find($) { 1629sub find($) {
1315 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1316 my $login = $_[0]; 1631 my $login = $_[0];
1323 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1324 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1325 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1326 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1327 1642
1328 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1329 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;
1330 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1331 } 1652 }
1332 } 1653 }
1333} 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);
1334 1668
1335sub save($) { 1669sub save($) {
1336 my ($pl) = @_; 1670 my ($pl) = @_;
1337 1671
1338 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1343 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1344 1678
1345 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1347 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
1348 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1349 Coro::cede; 1688 cf::cede_to_tick;
1350} 1689}
1351 1690
1352sub new($) { 1691sub new($) {
1353 my ($login) = @_; 1692 my ($login) = @_;
1354 1693
1360 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1361 1700
1362 $self 1701 $self
1363} 1702}
1364 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
1365=item $pl->quit_character 1714=item $pl->quit_character
1366 1715
1367Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1368be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1369 1718
1373 my ($pl) = @_; 1722 my ($pl) = @_;
1374 1723
1375 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1376 1725
1377 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1378 $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
1379 1728
1380 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1381 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1382 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1383 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1384 1737
1385 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1386 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1387 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1422 or return []; 1775 or return [];
1423 1776
1424 my @logins; 1777 my @logins;
1425 1778
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1430 1789
1431 utf8::decode $login; 1790 utf8::decode $login;
1432 push @logins, $login; 1791 push @logins, $login;
1433 } 1792 }
1434 1793
1435 \@logins 1794 \@logins
1436} 1795}
1437 1796
1438=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1439 1800
1440Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1441player. May block. 1802player. May block.
1442 1803
1443=cut 1804=cut
1461 } 1822 }
1462 1823
1463 \@paths 1824 \@paths
1464} 1825}
1465 1826
1466=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1467 1828
1468Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1469 1830
1470=cut
1471
1472sub expand_cfpod {
1473 ((my $self), (local $_)) = @_;
1474
1475 # escape & and <
1476 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g;
1478
1479 # this is buggy, it needs to properly take care of nested <'s
1480
1481 1 while
1482 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/
1486 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1
1489 }ge
1490 # replace H<hint text>
1491 || s{H<([^\>]*)>}
1492 {
1493 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1494 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1495 "")
1496 [$self->{hintmode}]
1497 }ge;
1498
1499 # create single paragraphs (very hackish)
1500 s/(?<=\S)\n(?=\w)/ /g;
1501
1502 # compress some whitespace
1503 s/\s+\n/\n/g; # ws line-ends
1504 s/\n\n+/\n/g; # double lines
1505 s/^\n+//; # beginning lines
1506 s/\n+$//; # ending lines
1507
1508 $_
1509}
1510
1511sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode}
1514}
1515
1516=item $player->ext_reply ($msgid, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1517 1832
1518Sends an ext reply to the player. 1833Sends an ext reply to the player.
1519 1834
1520=cut 1835=cut
1521 1836
1522sub ext_reply($$%) { 1837sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1524 1839
1525 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1841}
1528 1842
1529=item $player->ext_event ($type, %msg) 1843=item $player->ext_msg ($type, @msg)
1530 1844
1531Sends an ext event to the client. 1845Sends an ext event to the client.
1532 1846
1533=cut 1847=cut
1534 1848
1535sub ext_event($$%) { 1849sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1850 my ($self, $type, @msg) = @_;
1537 1851
1538 $self->ns->ext_event ($type, %msg); 1852 $self->ns->ext_msg ($type, @msg);
1539} 1853}
1540 1854
1541=head3 cf::region 1855=head3 cf::region
1542 1856
1543=over 4 1857=over 4
1552 1866
1553=cut 1867=cut
1554 1868
1555sub find_by_path($) { 1869sub find_by_path($) {
1556 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1557 1873
1558 my ($match, $specificity); 1874 my ($match, $specificity);
1559 1875
1560 for my $region (list) { 1876 for my $region (list) {
1561 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1587our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1588our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1589 1905
1590sub generate_random_map { 1906sub generate_random_map {
1591 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1592 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1593 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1594 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1595 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1596 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1597 $rmp->{exit_on_final_map},
1598 $rmp->{xsize}, $rmp->{ysize},
1599 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1600 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1601 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1602 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1603 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1604 (cf::region::find $rmp->{region}), $rmp->{custom}
1605 )
1606} 1912}
1607 1913
1608=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1609 1915
1610Register 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
1615 1921
1616sub register { 1922sub register {
1617 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1618 my $pkg = caller; 1924 my $pkg = caller;
1619 1925
1620 no strict;
1621 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1622 1927
1623 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1624} 1929}
1625 1930
1626# also paths starting with '/' 1931# also paths starting with '/'
1627$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1628 1933
1629sub thawer_merge { 1934sub thawer_merge {
1630 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1631 1936
1632 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1637} 1942}
1638 1943
1639sub normalise { 1944sub normalise {
1640 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1641 1946
1642 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1643 1948
1644 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1645 1950
1646 # map plan: 1951 # map plan:
1647 # 1952 #
1662 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1663 $path = "$base/$path"; 1968 $path = "$base/$path";
1664 } 1969 }
1665 1970
1666 for ($path) { 1971 for ($path) {
1667 redo if s{//}{/};
1668 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1669 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1670 } 1974 }
1671 1975
1672 $path 1976 $path
1686 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1687 return $self; 1991 return $self;
1688 } 1992 }
1689 } 1993 }
1690 1994
1691 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1692 () 1996 ()
1693} 1997}
1694 1998
1999# may re-bless or do other evil things
1695sub init { 2000sub init {
1696 my ($self) = @_; 2001 my ($self) = @_;
1697 2002
1698 $self 2003 $self
1699} 2004}
1718 2023
1719# the temporary/swap location 2024# the temporary/swap location
1720sub save_path { 2025sub save_path {
1721 my ($self) = @_; 2026 my ($self) = @_;
1722 2027
1723 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1724 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1725} 2030}
1726 2031
1727# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1728sub uniq_path { 2033sub uniq_path {
1729 my ($self) = @_; 2034 my ($self) = @_;
1730 2035
1731 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1732 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1733}
1734
1735# and all this just because we cannot iterate over
1736# all maps in C++...
1737sub change_all_map_light {
1738 my ($change) = @_;
1739
1740 $_->change_map_light ($change)
1741 for grep $_->outdoor, values %cf::MAP;
1742} 2038}
1743 2039
1744sub decay_objects { 2040sub decay_objects {
1745 my ($self) = @_; 2041 my ($self) = @_;
1746 2042
1759 2055
1760sub load_header_from($) { 2056sub load_header_from($) {
1761 my ($self, $path) = @_; 2057 my ($self, $path) = @_;
1762 2058
1763 utf8::encode $path; 2059 utf8::encode $path;
1764 #aio_open $path, O_RDONLY, 0 2060 my $f = new_from_file cf::object::thawer $path
1765 # or return;
1766
1767 $self->_load_header ($path)
1768 or return; 2061 or return;
1769 2062
2063 $self->_load_header ($f)
2064 or return;
2065
2066 local $MAP_LOADING{$self->{path}} = $self;
2067 $f->resolve_delayed_derefs;
2068
1770 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1771 2070
1772 1 2071 1
1773} 2072}
1774 2073
2074# used to laod the header of an original map
1775sub load_header_orig { 2075sub load_header_orig {
1776 my ($self) = @_; 2076 my ($self) = @_;
1777 2077
1778 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1779} 2079}
1780 2080
2081# used to laod the header of an instantiated map
1781sub load_header_temp { 2082sub load_header_temp {
1782 my ($self) = @_; 2083 my ($self) = @_;
1783 2084
1784 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1785} 2086}
1786 2087
2088# called after loading the header from an instantiated map
1787sub prepare_temp { 2089sub prepare_temp {
1788 my ($self) = @_; 2090 my ($self) = @_;
1789 2091
1790 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1791 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1792 # safety 2094 # safety
1793 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1794 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1795} 2097}
1796 2098
2099# called after loading the header from an original map
1797sub prepare_orig { 2100sub prepare_orig {
1798 my ($self) = @_; 2101 my ($self) = @_;
1799 2102
1800 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1801 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1825 2128
1826sub find; 2129sub find;
1827sub find { 2130sub find {
1828 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1829 2132
2133 cf::cede_to_tick;
2134
1830 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1831 2136
2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1832 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1833 2139
1834 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1835 my $guard = cf::lock_acquire "map_find:$path";
1836 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1837 or return; 2142 or return;
1838 2143
1839 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1840 2145
1842 or return; 2147 or return;
1843 2148
1844 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1845 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
1846 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
2153 undef $guard1;
1847 $map->reset; 2154 $map->reset;
1848 undef $guard;
1849 return find $path; 2155 return find $path;
1850 } 2156 }
1851 2157
1852 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1853 } 2159 }
1854} 2160}
1855 2161
1856sub pre_load { } 2162sub pre_load { }
1857sub post_load { } 2163#sub post_load { } # XS
1858 2164
1859sub load { 2165sub load {
1860 my ($self) = @_; 2166 my ($self) = @_;
1861 2167
1862 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1863 2169
1864 my $path = $self->{path}; 2170 my $path = $self->{path};
1865 2171
1866 { 2172 {
1867 my $guard = cf::lock_acquire "map_load:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
1868 2174
2175 return unless $self->valid;
1869 return if $self->in_memory != cf::MAP_SWAPPED; 2176 return unless $self->state == cf::MAP_SWAPPED;
1870
1871 $self->in_memory (cf::MAP_LOADING);
1872 2177
1873 $self->alloc; 2178 $self->alloc;
1874 2179
1875 $self->pre_load; 2180 $self->pre_load;
1876 Coro::cede; 2181 cf::cede_to_tick;
1877 2182
1878 $self->_load_objects ($self->{load_path}, 1) 2183 if (exists $self->{load_path}) {
2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2185 $f->skip_block;
2186 $self->_load_objects ($f)
1879 or return; 2187 or return;
1880 2188
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2189 $self->post_load_original
1882 if delete $self->{load_original}; 2190 if delete $self->{load_original};
1883 2191
1884 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
1885 utf8::encode $uniq; 2193 utf8::encode $uniq;
1886 if (aio_open $uniq, O_RDONLY, 0) { 2194 unless (aio_stat $uniq) {
2195 if (my $f = new_from_file cf::object::thawer $uniq) {
1887 $self->clear_unique_items; 2196 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 2197 $self->_load_objects ($f);
2198 $f->resolve_delayed_derefs;
2199 }
2200 }
1889 } 2201 }
1890 }
1891 2202
1892 Coro::cede; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->state (cf::MAP_INACTIVE);
2210
2211 cf::cede_to_tick;
1893 # now do the right thing for maps 2212 # now do the right thing for maps
1894 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 2215 unless $self->difficulty;
1897 Coro::cede; 2216 cf::cede_to_tick;
1898 2217
1899 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 2219 $self->decay_objects;
1901 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
1902 $self->update_buttons; 2221 $self->update_buttons;
1903 Coro::cede; 2222 cf::cede_to_tick;
1904 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
1905 Coro::cede;
1906 $self->activate;
1907 } 2224 }
1908 2225
1909 $self->in_memory (cf::MAP_IN_MEMORY); 2226 $self->{last_save} = $cf::RUNTIME;
2227 $self->last_access ($cf::RUNTIME);
1910 } 2228 }
1911 2229
1912 $self->post_load; 2230 $self->post_load;
1913}
1914 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
1915sub customise_for { 2238sub customise_for {
1916 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
1917 2240
1918 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
1919 if $self->per_player; 2242 if $self->per_player;
1923 2246
1924 $self 2247 $self
1925} 2248}
1926 2249
1927# find and load all maps in the 3x3 area around a map 2250# find and load all maps in the 3x3 area around a map
1928sub load_diag { 2251sub load_neighbours {
1929 my ($map) = @_; 2252 my ($map) = @_;
1930 2253
1931 my @diag; # diagonal neighbours 2254 my @neigh; # diagonal neighbours
1932 2255
1933 for (0 .. 3) { 2256 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 2257 my $neigh = $map->tile_path ($_)
1935 or next; 2258 or next;
1936 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
1937 or next; 2260 or next;
1938 $neigh->load; 2261 $neigh->load;
1939 2262
2263 # now find the diagonal neighbours
2264 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 2267 }
1943 2268
1944 for (@diag) { 2269 for (grep defined $_->[0], @neigh) {
2270 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 2271 my $neigh = find $path, $origin
1946 or next; 2272 or next;
1947 $neigh->load; 2273 $neigh->load;
1948 } 2274 }
1949} 2275}
1950 2276
1951sub find_sync { 2277sub find_sync {
1952 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
1953 2279
1954 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
1955} 2285}
1956 2286
1957sub do_load_sync { 2287sub do_load_sync {
1958 my ($map) = @_; 2288 my ($map) = @_;
1959 2289
1960 cf::sync_job { $map->load }; 2290 # it's a bug to call this from the main context
2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2292 if $Coro::current == $Coro::main;
2293
2294 $map->load;
1961} 2295}
1962 2296
1963our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
1965 2299
1966sub find_async { 2300sub find_async {
1967 my ($path, $origin) = @_; 2301 my ($path, $origin, $load) = @_;
1968 2302
1969 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
1970 2304
1971 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->linkable;
1973 } 2307 }
1974 2308
1975 undef $MAP_PREFETCH{$path}; 2309 $MAP_PREFETCH{$path} |= $load;
2310
1976 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2312 $Coro::current->{desc} = "map prefetcher";
2313
1977 while (%MAP_PREFETCH) { 2314 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 2315 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 2316 if (my $map = find $k) {
1980 $map->load; 2317 $map->load if $v;
1981 } 2318 }
1982 2319
1983 delete $MAP_PREFETCH{$path}; 2320 delete $MAP_PREFETCH{$k};
1984 } 2321 }
1985 } 2322 }
1986 undef $MAP_PREFETCHER; 2323 undef $MAP_PREFETCHER;
1987 }; 2324 };
1988 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
1989 2326
1990 () 2327 ()
1991} 2328}
1992 2329
2330# common code, used by both ->save and ->swapout
1993sub save { 2331sub _save {
1994 my ($self) = @_; 2332 my ($self) = @_;
1995
1996 my $lock = cf::lock_acquire "map_data:" . $self->path;
1997 2333
1998 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
1999 2335
2000 return unless $self->dirty; 2336 return unless $self->dirty;
2001 2337
2007 return if $self->{deny_save}; 2343 return if $self->{deny_save};
2008 2344
2009 local $self->{last_access} = $self->last_access;#d# 2345 local $self->{last_access} = $self->last_access;#d#
2010 2346
2011 cf::async { 2347 cf::async {
2348 $Coro::current->{desc} = "map player save";
2012 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
2013 }; 2350 };
2351
2352 cf::get_slot 0.02;
2014 2353
2015 if ($uniq) { 2354 if ($uniq) {
2016 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2017 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2018 } else { 2357 } else {
2019 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2020 } 2359 }
2021} 2360}
2022 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2023sub swap_out { 2370sub swap_out {
2024 my ($self) = @_; 2371 my ($self) = @_;
2025 2372
2026 # save first because save cedes
2027 $self->save;
2028
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2031 return if $self->players; 2377 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save};
2034 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->state (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2035 $self->clear; 2388 $self->clear;
2036 $self->in_memory (cf::MAP_SWAPPED);
2037} 2389}
2038 2390
2039sub reset_at { 2391sub reset_at {
2040 my ($self) = @_; 2392 my ($self) = @_;
2041 2393
2059 2411
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2413
2062 return if $self->players; 2414 return if $self->players;
2063 2415
2064 warn "resetting map ", $self->path; 2416 cf::trace "resetting map ", $self->path, "\n";
2065 2417
2066 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->state (cf::MAP_SWAPPED);
2067 2419
2068 # need to save uniques path 2420 # need to save uniques path
2069 unless ($self->{deny_save}) { 2421 unless ($self->{deny_save}) {
2070 my $uniq = $self->uniq_path; utf8::encode $uniq; 2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2071 2423
2073 if $uniq; 2425 if $uniq;
2074 } 2426 }
2075 2427
2076 delete $cf::MAP{$self->path}; 2428 delete $cf::MAP{$self->path};
2077 2429
2430 $self->deactivate;
2431 $_->clear_links_to ($self) for values %cf::MAP;
2078 $self->clear; 2432 $self->clear;
2079
2080 $_->clear_links_to ($self) for values %cf::MAP;
2081 2433
2082 $self->unlink_save; 2434 $self->unlink_save;
2083 $self->destroy; 2435 $self->destroy;
2084} 2436}
2085 2437
2086my $nuke_counter = "aaaa"; 2438my $nuke_counter = "aaaa";
2087 2439
2088sub nuke { 2440sub nuke {
2089 my ($self) = @_; 2441 my ($self) = @_;
2090 2442
2443 {
2444 my $lock = cf::lock_acquire "map_data:$self->{path}";
2445
2091 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2092 2447
2093 $self->unlink_save; 2448 $self->unlink_save;
2094 2449
2095 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2096 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2455
2101 $cf::MAP{$self->path} = $self; 2456 $cf::MAP{$self->path} = $self;
2457 }
2102 2458
2103 $self->reset; # polite request, might not happen 2459 $self->reset; # polite request, might not happen
2104} 2460}
2105 2461
2106=item $maps = cf::map::tmp_maps 2462=item $maps = cf::map::tmp_maps
2148 2504
2149sub unique_maps() { 2505sub unique_maps() {
2150 [ 2506 [
2151 map { 2507 map {
2152 utf8::decode $_; 2508 utf8::decode $_;
2153 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2154 ? normalise $_ 2512 : normalise $_
2155 : ()
2156 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2157 ] 2514 ]
2158} 2515}
2159 2516
2160package cf; 2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2161 2548
2162=back 2549=back
2163 2550
2164=head3 cf::object 2551=head3 cf::object
2165 2552
2169 2556
2170=over 4 2557=over 4
2171 2558
2172=item $ob->inv_recursive 2559=item $ob->inv_recursive
2173 2560
2174Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2175 2563
2176=cut 2564=cut
2177 2565
2178sub inv_recursive_; 2566sub inv_recursive_;
2179sub inv_recursive_ { 2567sub inv_recursive_ {
2182 2570
2183sub inv_recursive { 2571sub inv_recursive {
2184 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2185} 2573}
2186 2574
2575=item $ref = $ob->ref
2576
2577Creates and returns a persistent reference to an object that can be stored as a string.
2578
2579=item $ob = cf::object::deref ($refstring)
2580
2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2582even if the object actually exists. May block.
2583
2584=cut
2585
2586sub deref {
2587 my ($ref) = @_;
2588
2589 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2590 my ($uuid, $name) = ($1, $2);
2591 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2592 or return;
2593 $pl->ob->uuid eq $uuid
2594 or return;
2595
2596 $pl->ob
2597 } else {
2598 warn "$ref: cannot resolve object reference\n";
2599 undef
2600 }
2601}
2602
2187package cf; 2603package cf;
2188 2604
2189=back 2605=back
2190 2606
2191=head3 cf::object::player 2607=head3 cf::object::player
2197Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2613Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2198can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2199dialogue with the given NPC character. 2615dialogue with the given NPC character.
2200 2616
2201=cut 2617=cut
2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2202 2632
2203# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2204# with dialog boxes. 2634# with dialog boxes.
2205#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2206sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2213 2643
2214 } else { 2644 } else {
2215 my $pl = $self->contr; 2645 my $pl = $self->contr;
2216 2646
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2647 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2650
2226 } else { 2651 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2654 }
2230 } 2655 }
2656}
2657
2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2659
2660=cut
2661
2662sub cf::object::send_msg {
2663 my $pl = shift->contr
2664 or return;
2665 $pl->send_msg (@_);
2231} 2666}
2232 2667
2233=item $player_object->may ("access") 2668=item $player_object->may ("access")
2234 2669
2235Returns wether the given player is authorized to access resource "access" 2670Returns wether the given player is authorized to access resource "access"
2248 2683
2249=item $player_object->enter_link 2684=item $player_object->enter_link
2250 2685
2251Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2252 2687
2253The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2254I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2255 2692
2256Will never block. 2693Will never block.
2257 2694
2258=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2259 2696
2279sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2280 my ($self) = @_; 2717 my ($self) = @_;
2281 2718
2282 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2283 2720
2721 ++$self->{_link_recursion};
2722
2284 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2285 2724
2286 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2287 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2288 2727
2289 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2290} 2729}
2291 2730
2292sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2293 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2294 2733
2311 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2312 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2313 2752
2314 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2317 2756
2318 $map->load; 2757 $map->load;
2319 $map->load_diag; 2758 $map->load_neighbours;
2320 2759
2321 return unless $self->contr->active; 2760 return unless $self->contr->active;
2322 $self->activate_recursive;
2323 2761
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2325 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2326} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2327 2769
2770}
2771
2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2329 2773
2330Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2331her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2332that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2333the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process. 2778be called at the end of this process.
2335 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2336=cut 2783=cut
2337 2784
2338our $GOTOGEN; 2785our $GOTOGEN;
2339 2786
2340sub cf::object::player::goto { 2787sub cf::object::player::goto {
2341 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2342 2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2795
2343 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2345 2798
2346 $self->enter_link; 2799 $self->enter_link;
2347 2800
2348 (async { 2801 (async {
2802 $Coro::current->{desc} = "player::goto $path $x $y";
2803
2804 # *tag paths override both path and x|y
2805 if ($path =~ /^\*(.*)$/) {
2806 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2807 my $ob = $obs[rand @obs];
2808
2809 # see if we actually can go there
2810 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2811 $ob = $obs[rand @obs];
2812 } else {
2813 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2814 }
2815 # else put us there anyways for now #d#
2816
2817 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2818 } else {
2819 ($path, $x, $y) = (undef, undef, undef);
2820 }
2821 }
2822
2349 my $map = eval { 2823 my $map = eval {
2350 my $map = cf::map::find $path; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2351 2825
2352 if ($map) { 2826 if ($map) {
2353 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2354 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2355 } else { 2829 } else {
2356 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2357 } 2831 }
2358 2832
2359 $map 2833 $map
2360 }; 2834 };
2361 2835
2367 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2368 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2369 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2370 } 2844 }
2371 2845
2372 $done->() if $done; 2846 $done->($self) if $done;
2373 })->prio (1); 2847 })->prio (1);
2374} 2848}
2375 2849
2376=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2377 2851
2397} 2871}
2398 2872
2399sub prepare_random_map { 2873sub prepare_random_map {
2400 my ($exit) = @_; 2874 my ($exit) = @_;
2401 2875
2402 my $guard = cf::lock_acquire "exit_prepare:$exit";
2403
2404 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2405 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2406 # that depends on the exit object 2878 # that depends on the exit object
2407 2879
2408 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2410 if ($exit->map) { 2882 if ($exit->map) {
2411 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2412 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2413 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2414 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2415 } 2889 }
2416 2890
2417 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2418 2892
2419 my $data = cf::to_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2420 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2421 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2422 2896
2423 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2424 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2425 undef $fh; 2899 undef $fh;
2426 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2427 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2428 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2429 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2430 } 2908 }
2431} 2909}
2432 2910
2433sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2434 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2435 2913
2436 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2437 2915
2438 if ($exit->slaying eq "/!") {
2439 #TODO: this should de-fi-ni-te-ly not be a sync-job
2440 # the problem is that $exit might not survive long enough
2441 # so it needs to be done right now, right here
2442 cf::sync_job { prepare_random_map $exit };
2443 }
2444
2445 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2446 my $hp = $exit->stats->hp;
2447 my $sp = $exit->stats->sp;
2448
2449 $self->enter_link; 2916 $self->enter_link;
2450 2917
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2455 (async { 2918 (async {
2456 $self->deactivate_recursive; # just to be sure 2919 $Coro::current->{desc} = "enter_exit";
2920
2457 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2950
2458 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2459 2952
2953 # if exit is damned, update players death & WoR home-position
2954 $self->contr->savebed ($map, $x, $y)
2955 if $exit->flag (cf::FLAG_DAMNED);
2956
2460 1; 2957 1
2461 }) { 2958 }) {
2462 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2463 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2464 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2465 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2466 2963
2467 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2468 $self->leave_link; 2965 $self->leave_link;
2469 } 2966 }
2470 })->prio (1); 2967 })->prio (1);
2471} 2968}
2472 2969
2484sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2485 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2486 2983
2487 utf8::encode $text; 2984 utf8::encode $text;
2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
2489} 3011}
2490 3012
2491=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2492 3014
2493Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2495the message, with C<log> being the default. If C<$color> is negative, suppress 3017the message, with C<log> being the default. If C<$color> is negative, suppress
2496the message unless the client supports the msg packet. 3018the message unless the client supports the msg packet.
2497 3019
2498=cut 3020=cut
2499 3021
3022# non-persistent channels (usually the info channel)
3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
3030 "c/identify" => {
3031 id => "infobox",
3032 title => "Identify",
3033 reply => undef,
3034 tooltip => "Items recently identified",
3035 },
3036 "c/examine" => {
3037 id => "infobox",
3038 title => "Examine",
3039 reply => undef,
3040 tooltip => "Signs and other items you examined",
3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
3047 },
3048 "c/book" => {
3049 id => "infobox",
3050 title => "Book",
3051 reply => undef,
3052 tooltip => "The contents of a note or book",
3053 },
3054 "c/lookat" => {
3055 id => "infobox",
3056 title => "Look",
3057 reply => undef,
3058 tooltip => "What you saw there",
3059 },
3060 "c/who" => {
3061 id => "infobox",
3062 title => "Players",
3063 reply => undef,
3064 tooltip => "Shows players who are currently online",
3065 },
3066 "c/body" => {
3067 id => "infobox",
3068 title => "Body Parts",
3069 reply => undef,
3070 tooltip => "Shows which body parts you posess and are available",
3071 },
3072 "c/statistics" => {
3073 id => "infobox",
3074 title => "Statistics",
3075 reply => undef,
3076 tooltip => "Shows your primary statistics",
3077 },
3078 "c/skills" => {
3079 id => "infobox",
3080 title => "Skills",
3081 reply => undef,
3082 tooltip => "Shows your experience per skill and item power",
3083 },
3084 "c/shopitems" => {
3085 id => "infobox",
3086 title => "Shop Items",
3087 reply => undef,
3088 tooltip => "Shows the items currently for sale in this shop",
3089 },
3090 "c/resistances" => {
3091 id => "infobox",
3092 title => "Resistances",
3093 reply => undef,
3094 tooltip => "Shows your resistances",
3095 },
3096 "c/pets" => {
3097 id => "infobox",
3098 title => "Pets",
3099 reply => undef,
3100 tooltip => "Shows information abotu your pets/a specific pet",
3101 },
3102 "c/perceiveself" => {
3103 id => "infobox",
3104 title => "Perceive Self",
3105 reply => undef,
3106 tooltip => "You gained detailed knowledge about yourself",
3107 },
3108 "c/uptime" => {
3109 id => "infobox",
3110 title => "Uptime",
3111 reply => undef,
3112 tooltip => "How long the server has been running since last restart",
3113 },
3114 "c/mapinfo" => {
3115 id => "infobox",
3116 title => "Map Info",
3117 reply => undef,
3118 tooltip => "Information related to the maps",
3119 },
3120 "c/party" => {
3121 id => "party",
3122 title => "Party",
3123 reply => "gsay ",
3124 tooltip => "Messages and chat related to your party",
3125 },
3126 "c/death" => {
3127 id => "death",
3128 title => "Death",
3129 reply => undef,
3130 tooltip => "Reason for and more info about your most recent death",
3131 },
3132 "c/say" => $SAY_CHANNEL,
3133 "c/chat" => $CHAT_CHANNEL,
3134);
3135
2500sub cf::client::send_msg { 3136sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2502 3138
2503 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
2504 3141
2505 $color &= ~cf::NDI_UNIQUE; # just in case... 3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506 3143
3144 # check predefined channels, for the benefit of C
3145 if ($CHANNEL{$channel}) {
3146 $channel = $CHANNEL{$channel};
3147
3148 $self->ext_msg (channel_info => $channel);
3149 $channel = $channel->{id};
3150
2507 if (ref $channel) { 3151 } elsif (ref $channel) {
2508 # send meta info to client, if not yet sent 3152 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 3153 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 3154 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 3155 $self->ext_msg (channel_info => $channel);
2512 } 3156 }
2513 3157
2514 $channel = $channel->{id}; 3158 $channel = $channel->{id};
2515 } 3159 }
2516 3160
2517 return unless @extra || length $msg; 3161 return unless @extra || length $msg;
2518 3162
2519 if ($self->can_msg) { 3163 # default colour, mask it out
2520 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2521 } else { 3165 if $color & cf::NDI_DEF;
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531 3166
2532 if ($color >= 0) { 3167 my $pkt = "msg "
2533 if (0 && $msg =~ /\[/) { 3168 . $self->{json_coder}->encode (
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2535 } else { 3170 );
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg")
2538 }
2539 }
2540 }
2541}
2542 3171
3172 $self->send_big_packet ($pkt);
3173}
3174
2543=item $client->ext_event ($type, %msg) 3175=item $client->ext_msg ($type, @msg)
2544 3176
2545Sends an ext event to the client. 3177Sends an ext event to the client.
2546 3178
2547=cut 3179=cut
2548 3180
2549sub cf::client::ext_event($$%) { 3181sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 3182 my ($self, $type, @msg) = @_;
2551 3183
2552 return unless $self->extcmd; 3184 if ($self->extcmd == 2) {
2553 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 3187 push @msg, msgtype => "event_$type";
2555 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189 }
3190}
3191
3192=item $client->ext_reply ($msgid, @msg)
3193
3194Sends an ext reply to the client.
3195
3196=cut
3197
3198sub cf::client::ext_reply($$@) {
3199 my ($self, $id, @msg) = @_;
3200
3201 if ($self->extcmd == 2) {
3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203 } elsif ($self->extcmd == 1) {
3204 #TODO: version 1, remove
3205 unshift @msg, msgtype => "reply", msgid => $id;
3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207 }
2556} 3208}
2557 3209
2558=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2559 3211
2560Queues a query to the client, calling the given callback with 3212Queues a query to the client, calling the given callback with
2615 my ($ns, $buf) = @_; 3267 my ($ns, $buf) = @_;
2616 3268
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3269 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 3270
2619 if (ref $msg) { 3271 if (ref $msg) {
3272 my ($type, $reply, @payload) =
3273 "ARRAY" eq ref $msg
3274 ? @$msg
3275 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276
3277 my @reply;
3278
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3279 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 3280 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 3281 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
2626 } else { 3286 } else {
2627 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2628 } 3288 }
2629 3289
2630 cf::override; 3290 cf::override;
2631 }, 3291 },
2632); 3292);
2652 3312
2653 $coro 3313 $coro
2654} 3314}
2655 3315
2656cf::client->attach ( 3316cf::client->attach (
2657 on_destroy => sub { 3317 on_client_destroy => sub {
2658 my ($ns) = @_; 3318 my ($ns) = @_;
2659 3319
2660 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2661 }, 3321 },
2662); 3322);
2677our $safe = new Safe "safe"; 3337our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
2679 3339
2680$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
2681 3341
2682$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3342$safe->permit_only (Opcode::opset qw(
3343 :base_core :base_mem :base_orig :base_math :base_loop
3344 grepstart grepwhile mapstart mapwhile
3345 sort time
3346));
2683 3347
2684# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
2685 3349
2686=pod 3350=pod
2687 3351
2688The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
2689 3353
2690 cf::object 3354 cf::object
2691 contr pay_amount pay_player map x y force_find force_add 3355 contr pay_amount pay_player map x y force_find force_add destroy
2692 insert remove 3356 insert remove name archname title slaying race decrease split
3357 value
2693 3358
2694 cf::object::player 3359 cf::object::player
2695 player 3360 player
2696 3361
2697 cf::player 3362 cf::player
2702 3367
2703=cut 3368=cut
2704 3369
2705for ( 3370for (
2706 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2707 insert remove)], 3372 insert remove inv nrof name archname title slaying race
3373 decrease split destroy change_exp value msg lore send_msg)],
2708 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
2710 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
2711) { 3377) {
2712 no strict 'refs';
2713 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
2714 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2715 for @funs; 3380 for @funs;
2716} 3381}
2717 3382
2732 3397
2733 my $qcode = $code; 3398 my $qcode = $code;
2734 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2735 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
2736 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
2737 local $_; 3405 local $_;
2738 local @safe::cf::_safe_eval_args = values %vars;
2739 3406
2740 my $eval = 3407 my $eval =
2741 "do {\n" 3408 "do {\n"
2742 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2743 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
2744 . $code 3411 . $code
2745 . "\n}" 3412 . "\n}"
2746 ; 3413 ;
2747 3414
3415 if ($CFG{safe_eval}) {
2748 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
2749 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2750 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
2751 3424
2752 if ($@) { 3425 if ($@) {
2753 warn "$@"; 3426 warn "$@",
2754 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
2755 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
2756 } 3429 }
2757 3430
2758 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
2759} 3432}
2760 3433
2774=cut 3447=cut
2775 3448
2776sub register_script_function { 3449sub register_script_function {
2777 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
2778 3451
2779 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
2780 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
2781} 3454}
2782 3455
2783=back 3456=back
2784 3457
2785=cut 3458=cut
2788# the server's init and main functions 3461# the server's init and main functions
2789 3462
2790sub load_facedata($) { 3463sub load_facedata($) {
2791 my ($path) = @_; 3464 my ($path) = @_;
2792 3465
3466 # HACK to clear player env face cache, we need some signal framework
3467 # for this (global event?)
3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3469
3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471
2793 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
2794 3473
2795 my $facedata; 3474 my $facedata = decode_storable load_file $path;
2796 0 < aio_load $path, $facedata
2797 or die "$path: $!";
2798
2799 $facedata = Coro::Storable::thaw $facedata;
2800 3475
2801 $facedata->{version} == 2 3476 $facedata->{version} == 2
2802 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
2803 3478
3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3481 $facedata->{resource}{"res/exp_table"} = {
3482 type => FT_RSRC,
3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3485 };
3486 cf::cede_to_tick;
3487
2804 { 3488 {
2805 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
2806 3490
2807 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493
2809 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2813 3499
2814 cf::cede_to_tick; 3500 cf::cede_to_tick;
2815 } 3501 }
2816 3502
2817 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
2818 next unless $info->{smooth}; 3504 next unless $info->{smooth};
3505
2819 my $idx = cf::face::find $face 3506 my $idx = cf::face::find $face
2820 or next; 3507 or next;
3508
2821 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
2822 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
2823 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2824 } else { 3512 } else {
2825 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
2826 } 3514 }
2827 3515
2828 cf::cede_to_tick; 3516 cf::cede_to_tick;
2829 } 3517 }
2830 } 3518 }
2839 3527
2840 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
2841 } 3529 }
2842 3530
2843 { 3531 {
2844 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical;
2848 3533
2849 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({ 3535 if (defined $info->{type}) {
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2857 3537
2858 if ($name =~ /\.jpg$/) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2860 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3539 cf::face::set_type $idx, $info->{type};
2861 } else { 3540 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 3541 $RESOURCE{$name} = $info; # unused
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 3542 }
2868 3543
2869 cf::cede_to_tick; 3544 cf::cede_to_tick;
2870 } 3545 }
2871 } 3546 }
2872 3547
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3549
2873 1 3550 1
2874} 3551}
2875 3552
3553register_exticmd fx_want => sub {
3554 my ($ns, $want) = @_;
3555
3556 while (my ($k, $v) = each %$want) {
3557 $ns->fx_want ($k, $v);
3558 }
3559};
3560
3561sub load_resource_file($) {
3562 my $guard = lock_acquire "load_resource_file";
3563
3564 my $status = load_resource_file_ $_[0];
3565 get_slot 0.1, 100;
3566 cf::arch::commit_load;
3567
3568 $status
3569}
3570
2876sub reload_regions { 3571sub reload_regions {
3572 # HACK to clear player env face cache, we need some signal framework
3573 # for this (global event?)
3574 %ext::player_env::MUSIC_FACE_CACHE = ();
3575
2877 load_resource_file "$MAPDIR/regions" 3576 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 3577 or die "unable to load regions file\n";
2879 3578
2880 for (cf::region::list) { 3579 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3580 $_->{match} = qr/$_->{match}/
2889} 3588}
2890 3589
2891sub reload_archetypes { 3590sub reload_archetypes {
2892 load_resource_file "$DATADIR/archetypes" 3591 load_resource_file "$DATADIR/archetypes"
2893 or die "unable to load archetypes\n"; 3592 or die "unable to load archetypes\n";
2894 #d# NEED to laod twice to resolve forward references
2895 # this really needs to be done in an extra post-pass
2896 # (which needs to be synchronous, so solve it differently)
2897 load_resource_file "$DATADIR/archetypes"
2898 or die "unable to load archetypes\n";
2899} 3593}
2900 3594
2901sub reload_treasures { 3595sub reload_treasures {
2902 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
2903 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
2904} 3598}
2905 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
2906sub reload_resources { 3620sub reload_resources {
2907 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
2908 3622
3623 reload_exp_table;
3624 reload_materials;
3625 reload_facedata;
3626 reload_sound;
3627 reload_archetypes;
2909 reload_regions; 3628 reload_regions;
2910 reload_facedata;
2911 #reload_archetypes;#d#
2912 reload_archetypes;
2913 reload_treasures; 3629 reload_treasures;
2914 3630
2915 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
2916} 3632}
2917 3633
2918sub init { 3634sub reload_config {
2919 reload_resources; 3635 trace "reloading config file...\n";
2920}
2921 3636
2922sub cfg_load { 3637 my $config = load_file "$CONFDIR/config";
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3638 utf8::decode $config;
2924 or return; 3639 *CFG = decode_yaml $config;
2925 3640
2926 local $/;
2927 *CFG = YAML::Syck::Load <$fh>;
2928
2929 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2930 3642
2931 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2932 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2933 3645
2934 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
2938 }; 3650 };
2939 warn $@ if $@; 3651 warn $@ if $@;
2940 } 3652 }
2941} 3653}
2942 3654
3655sub pidfile() {
3656 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3657 or die "$PIDFILE: $!";
3658 flock $fh, &Fcntl::LOCK_EX
3659 or die "$PIDFILE: flock: $!";
3660 $fh
3661}
3662
3663# make sure only one server instance is running at any one time
3664sub atomic {
3665 my $fh = pidfile;
3666
3667 my $pid = <$fh>;
3668 kill 9, $pid if $pid > 0;
3669
3670 seek $fh, 0, 0;
3671 print $fh $$;
3672}
3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
2943sub main { 3683sub main {
3684 cf::init_globals; # initialise logging
3685
3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690
3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692
2944 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
2945 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
2946 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3695 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2947 (async { 3696 (async {
2948 Event::one_event; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT;
2949 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
2950 }; 3700 };
2951 3701
2952 cfg_load; 3702 evthread_start IO::AIO::poll_fileno;
3703
3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3713 reload_resources;
3714 reload_config;
2953 db_init; 3715 db_init;
3716
3717 cf::init_uuid;
3718 cf::init_signals;
3719 cf::init_skills;
3720
3721 cf::init_beforeplay;
3722
3723 atomic;
3724
2954 load_extensions; 3725 load_extensions;
2955 3726
2956 $TICK_WATCHER->start; 3727 utime time, time, $RUNTIMEFILE;
2957 Event::loop; 3728
3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3732
3733 cf::_post_init 0;
3734 };
3735
3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
2958} 3745}
2959 3746
2960############################################################################# 3747#############################################################################
2961# initialisation and cleanup 3748# initialisation and cleanup
2962 3749
2963# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
2964BEGIN { 3751BEGIN {
3752 our %SIGWATCHER = ();
2965 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
2966 Event->signal ( 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2967 reentrant => 0,
2968 data => WF_AUTOCANCEL,
2969 signal => $signal,
2970 prio => 0,
2971 cb => sub {
2972 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
2973 },
2974 ); 3756 };
2975 } 3757 }
2976} 3758}
2977 3759
2978sub write_runtime { 3760sub write_runtime_sync {
2979 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
2980 3762
2981 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
2982 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
2983 3765
2984 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2985 3767
2986 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
2987 3769
2988 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2989 or return; 3771 or return;
2990 3772
2991 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
2992 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
2993 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3003 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
3004 3786
3005 close $fh 3787 close $fh
3006 or return; 3788 or return;
3007 3789
3008 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3009 and return; 3791 and return;
3010 3792
3011 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3012 3794
3013 1 3795 1
3796}
3797
3798our $uuid_lock;
3799our $uuid_skip;
3800
3801sub write_uuid_sync($) {
3802 $uuid_skip ||= $_[0];
3803
3804 return if $uuid_lock;
3805 local $uuid_lock = 1;
3806
3807 my $uuid = "$LOCALDIR/uuid";
3808
3809 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3810 or return;
3811
3812 my $value = uuid_seq uuid_cur;
3813
3814 unless ($value) {
3815 info "cowardly refusing to write zero uuid value!\n";
3816 return;
3817 }
3818
3819 my $value = uuid_str $value + $uuid_skip;
3820 $uuid_skip = 0;
3821
3822 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3823 and return;
3824
3825 # always fsync - this file is important
3826 aio_fsync $fh
3827 and return;
3828
3829 close $fh
3830 or return;
3831
3832 aio_rename "$uuid~", $uuid
3833 and return;
3834
3835 trace "uuid file written ($value).\n";
3836
3837 1
3838
3839}
3840
3841sub write_uuid($$) {
3842 my ($skip, $sync) = @_;
3843
3844 $sync ? write_uuid_sync $skip
3845 : async { write_uuid_sync $skip };
3014} 3846}
3015 3847
3016sub emergency_save() { 3848sub emergency_save() {
3017 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3018 3850
3019 warn "enter emergency perl save\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3020 3857
3021 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3022 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3023 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3024 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3025 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3026 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3027 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3028 $pl->valid or next; 3867 $pl->valid or next;
3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3029 $pl->save; 3869 $pl->save;
3030 } 3870 }
3031 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
3032 3872
3033 warn "begin emergency map save\n"; 3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3875 info "emergency_perl_save: begin map save\n";
3034 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3035 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3036 $map->valid or next; 3878 $map->valid or next;
3037 $map->save; 3879 $map->save;
3038 } 3880 }
3039 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
3040 3882
3041 warn "begin emergency database checkpoint\n"; 3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3885 info "emergency_perl_save: begin database checkpoint\n";
3042 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3043 warn "end emergency database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3888
3889 info "emergency_perl_save: begin write uuid\n";
3890 write_uuid_sync 1;
3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3044 }; 3911 };
3045 3912
3046 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
3047} 3914}
3048 3915
3049sub post_cleanup { 3916sub post_cleanup {
3050 my ($make_core) = @_; 3917 my ($make_core) = @_;
3051 3918
3919 IO::AIO::flush;
3920
3052 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3053 if $make_core; 3922 if $make_core;
3923
3924 my $fh = pidfile;
3925 unlink $PIDFILE if <$fh> == $$;
3926}
3927
3928# a safer delete_package, copied from Symbol
3929sub clear_package($) {
3930 my $pkg = shift;
3931
3932 # expand to full symbol table name if needed
3933 unless ($pkg =~ /^main::.*::$/) {
3934 $pkg = "main$pkg" if $pkg =~ /^::/;
3935 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3936 $pkg .= '::' unless $pkg =~ /::$/;
3937 }
3938
3939 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3940 my $stem_symtab = *{$stem}{HASH};
3941
3942 defined $stem_symtab and exists $stem_symtab->{$leaf}
3943 or return;
3944
3945 # clear all symbols
3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3947 for my $name (keys %$leaf_symtab) {
3948 _gv_clear *{"$pkg$name"};
3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3950 }
3054} 3951}
3055 3952
3056sub do_reload_perl() { 3953sub do_reload_perl() {
3057 # can/must only be called in main 3954 # can/must only be called in main
3058 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3059 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3060 return; 3957 return;
3061 } 3958 }
3062 3959
3063 warn "reloading..."; 3960 return if $RELOAD++;
3064 3961
3065 warn "entering sync_job"; 3962 my $t1 = AE::time;
3066 3963
3964 while ($RELOAD) {
3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3967
3968 trace "perl_reload: entering sync_job";
3969
3067 cf::sync_job { 3970 cf::sync_job {
3068 cf::write_runtime; # external watchdog should not bark
3069 cf::emergency_save; 3971 #cf::emergency_save;
3070 cf::write_runtime; # external watchdog should not bark
3071 3972
3072 warn "syncing database to disk";
3073 BDB::db_env_txn_checkpoint $DB_ENV;
3074
3075 # if anything goes wrong in here, we should simply crash as we already saved
3076
3077 warn "cancelling all WF_AUTOCANCEL watchers";
3078 for (Event::all_watchers) {
3079 $_->cancel if $_->data & WF_AUTOCANCEL;
3080 }
3081
3082 warn "flushing outstanding aio requests";
3083 for (;;) {
3084 BDB::flush;
3085 IO::AIO::flush;
3086 Coro::cede;
3087 last unless IO::AIO::nreqs || BDB::nreqs;
3088 warn "iterate...";
3089 }
3090
3091 ++$RELOAD;
3092
3093 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3094 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3095 %EXT_CORO = (); 3975 %EXT_CORO = ();
3096 3976
3097 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3098 %COMMAND = (); 3978 %COMMAND = ();
3099 3979
3100 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3101 %EXTCMD = (); 3981 %EXTCMD = ();
3102 %EXTICMD = (); 3982 %EXTICMD = ();
3103 3983
3104 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3105 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3106 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3107 3987
3108 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3109 eval { 3989 eval {
3110 $cb->($pkg); 3990 $cb->($pkg);
3111 1 3991 1
3112 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3993 }
3994
3995 trace "... clearing $pkg";
3996 clear_package $pkg;
3113 } 3997 }
3114 3998
3115 warn "... nuking $pkg";
3116 Symbol::delete_package $pkg;
3117 }
3118
3119 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3120 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3121 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3122 4002
3123 warn "... unloading $k"; 4003 trace "... unloading $k";
3124 delete $INC{$k}; 4004 delete $INC{$k};
3125 4005
3126 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3127 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3128 4008
3129 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
3130 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
3131 } 4014 }
3132 4015
3133 Symbol::delete_package $k;
3134 }
3135
3136 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3137 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
3138 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3139 4019
3140 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3141 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3142 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3143 4023
3144 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3145 # and global variables created in xs 4025 # and global variables created in xs
3146 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3147 4027
3148 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3149 4029
3150 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3151 require cf; 4031 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3153 4033
3154 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3155 cf::cfg_load; 4035 cf::reload_config;
3156 4036
3157 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3158 cf::load_extensions; 4038 cf::load_extensions;
3159 4039
4040 if ($REATTACH_ON_RELOAD) {
3160 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3161 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3162 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3163 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3164 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3165 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
3166 4048
3167 warn "leaving sync_job"; 4049 cf::_post_init 1;
3168 4050
4051 trace "perl_reload: leaving sync_job";
4052
3169 1 4053 1
3170 } or do { 4054 } or do {
3171 warn $@; 4055 error $@;
3172 warn "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3173 exit 1; 4057 };
4058
4059 --$RELOAD;
3174 }; 4060 }
3175 4061
3176 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
3177}; 4064};
3178 4065
3179our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3180 4067
3181sub reload_perl() { 4068sub reload_perl() {
3182 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
3183 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3184 4071
3185 $RELOAD_WATCHER ||= Event->timer ( 4072 $RELOAD_WATCHER ||= cf::async {
3186 reentrant => 0, 4073 Coro::AIO::aio_wait cache_extensions;
3187 after => 0, 4074
3188 data => WF_AUTOCANCEL, 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3189 cb => sub {
3190 do_reload_perl; 4076 do_reload_perl;
3191 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3192 }, 4078 };
3193 ); 4079 };
3194} 4080}
3195 4081
3196register_command "reload" => sub { 4082register_command "reload" => sub {
3197 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
3198 4084
3199 if ($who->flag (FLAG_WIZ)) { 4085 if ($who->flag (FLAG_WIZ)) {
3200 $who->message ("reloading server."); 4086 $who->message ("reloading server.");
4087 async {
4088 $Coro::current->{desc} = "perl_reload";
3201 async { reload_perl }; 4089 reload_perl;
4090 };
3202 } 4091 }
3203}; 4092};
3204 4093
3205unshift @INC, $LIBDIR; 4094#############################################################################
3206 4095
3207my $bug_warning = 0; 4096my $bug_warning = 0;
3208 4097
3209our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3210our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3211 4100
3212sub wait_for_tick { 4101sub wait_for_tick() {
3213 return unless $TICK_WATCHER->is_active;
3214 return if $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3215 4103
3216 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3217 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3218 $signal->wait; 4106 $signal->wait;
3219} 4107}
3220 4108
3221sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3222 return unless $TICK_WATCHER->is_active;
3223 return if $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3224 4111
3225 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3226 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3227 $signal->wait; 4114 $signal->wait;
3228} 4115}
3229 4116
3230 my $min = 1e6;#d# 4117sub tick {
3231 my $avg = 10;
3232$TICK_WATCHER = Event->timer (
3233 reentrant => 0,
3234 parked => 1,
3235 prio => 0,
3236 at => $NEXT_TICK || $TICK,
3237 data => WF_AUTOCANCEL,
3238 cb => sub {
3239 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
3240 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4119 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3241 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
3242 return; 4121 return;
3243 } 4122 }
3244 4123
3245 $NOW = $tick_start = Event::time;
3246
3247 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3248 4125
3249 0 && sync_job {#d# 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3250 for(1..10) {
3251 my $t = Event::time;
3252 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3253 or die;
3254 4127
3255 $map->width (50); 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 $map->height (50); 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 $map->alloc; 4130 Coro::async_pool {
3258 $map->_load_objects ("/tmp/x.map", 1); 4131 $Coro::current->{desc} = "runtime saver";
3259 my $t = Event::time - $t; 4132 write_runtime_sync
3260 4133 or error "ERROR: unable to write runtime file: $!";
3261 #next unless $t < 0.0013;#d#
3262 if ($t < $min) {
3263 $min = $t;
3264 }
3265 $avg = $avg * 0.99 + $t * 0.01;
3266 }
3267 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3268 exit 0;
3269 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3270 }; 4134 };
4135 }
3271 4136
3272 $RUNTIME += $TICK;
3273 $NEXT_TICK += $TICK;
3274
3275 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3276 $NEXT_RUNTIME_WRITE = $NOW + 10;
3277 Coro::async_pool {
3278 write_runtime
3279 or warn "ERROR: unable to write runtime file: $!";
3280 };
3281 }
3282
3283# my $AFTER = Event::time;
3284# warn $AFTER - $NOW;#d#
3285
3286 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3287 $sig->send; 4138 $sig->send;
3288 } 4139 }
3289 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
3290 $sig->send; 4141 $sig->send;
3291 } 4142 }
3292 4143
3293 $NOW = Event::time; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
3294
3295 # if we are delayed by four ticks or more, skip them all
3296 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3297
3298 $TICK_WATCHER->at ($NEXT_TICK);
3299 $TICK_WATCHER->start;
3300
3301 $LOAD = ($NOW - $tick_start) / $TICK;
3302 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3303 4146
3304 _post_tick; 4147 if (0) {
3305 4148 if ($NEXT_TICK) {
3306 4149 my $jitter = $TICK_START - $NEXT_TICK;
4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4151 debug "jitter $JITTER\n";#d#
4152 }
3307 }, 4153 }
3308); 4154}
3309 4155
3310{ 4156{
3311 BDB::max_poll_time $TICK * 0.1; 4157 # configure BDB
3312 $BDB_POLL_WATCHER = Event->io ( 4158
3313 reentrant => 0,
3314 fd => BDB::poll_fileno,
3315 poll => 'r',
3316 prio => 0,
3317 data => WF_AUTOCANCEL,
3318 cb => \&BDB::poll_cb,
3319 );
3320 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3321 4160 BDB::max_poll_reqs $TICK * 0.1;
3322 BDB::set_sync_prepare { 4161 $AnyEvent::BDB::WATCHER->priority (1);
3323 my $status;
3324 my $current = $Coro::current;
3325 (
3326 sub {
3327 $status = $!;
3328 $current->ready; undef $current;
3329 },
3330 sub {
3331 Coro::schedule while defined $current;
3332 $! = $status;
3333 },
3334 )
3335 };
3336 4162
3337 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3338 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
4165 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4166 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4167 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4168 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4169 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3339 4170
3340 cf::sync_job { 4171 cf::sync_job {
3341 eval { 4172 eval {
3342 BDB::db_env_open 4173 BDB::db_env_open
3343 $DB_ENV, 4174 $DB_ENV,
3345 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4176 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3346 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4177 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3347 0666; 4178 0666;
3348 4179
3349 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4180 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3350
3351 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3352 $DB_ENV->set_lk_detect;
3353 }; 4181 };
3354 4182
3355 cf::cleanup "db_env_open(db): $@" if $@; 4183 cf::cleanup "db_env_open(db): $@" if $@;
3356 }; 4184 };
3357 } 4185 }
4186
4187 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4188 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4189 };
4190 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4191 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192 };
4193 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195 };
3358} 4196}
3359 4197
3360{ 4198{
4199 # configure IO::AIO
4200
3361 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3362
3363 undef $Coro::AIO::WATCHER;
3364 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3365 $AIO_POLL_WATCHER = Event->io ( 4203 undef $AnyEvent::AIO::WATCHER;
3366 reentrant => 0,
3367 data => WF_AUTOCANCEL,
3368 fd => IO::AIO::poll_fileno,
3369 poll => 'r',
3370 prio => 6,
3371 cb => \&IO::AIO::poll_cb,
3372 );
3373} 4204}
3374 4205
3375my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3376 4208
3377sub _log_backtrace { 4209sub _log_backtrace {
3378 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3379 4211
3380 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3381 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3382 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3383 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3384 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3385 async { 4222 async {
4223 $Coro::current->{desc} = "abt $msg";
4224
3386 my @bt = fork_call { 4225 my @bt = fork_call {
3387 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3388 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4227 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3389 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4228 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3390 or die "addr2line: $!"; 4229 or die "addr2line: $!";
3398 } 4237 }
3399 4238
3400 @funcs 4239 @funcs
3401 }; 4240 };
3402 4241
3403 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3404 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3405 --$_log_backtrace; 4245 --$_log_backtrace;
3406 }; 4246 };
3407 } else { 4247 } else {
3408 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3409 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3410 } 4250 }
3411} 4251}
3412 4252
3413# load additional modules 4253# load additional modules
3414use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3415 4256
3416END { cf::emergency_save } 4257END { cf::emergency_save }
3417 4258
34181 42591
3419 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines