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.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 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
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::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";
38Compress::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
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $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;
71 120
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 123our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
79 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
82 132
83our %CFG; 133our %CFG;
84 134
85our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 136our $RUNTIME;
137our $NOW;
87 138
88our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
91 142
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 145
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
97our $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 :)
98 155
99binmode STDOUT; 156binmode STDOUT;
100binmode STDERR; 157binmode STDERR;
101 158
102# read virtual server time, if available 159# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
107} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
108 167
109mkdir $_ 168mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 170
112our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
113 172
114sub 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::"} };
115 189
116############################################################################# 190#############################################################################
117 191
118=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
119 193
… …
155 229
156The raw value load value from the last tick. 230The raw value load value from the last tick.
157 231
158=item %cf::CFG 232=item %cf::CFG
159 233
160Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 235from wherever your confdir points to.
162 236
163=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
164 238
165These 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
166returns 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
167per 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.
168 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
248=item @cf::INVOKE_RESULTS
249
250This array contains the results of the last C<invoke ()> call. When
251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252that call.
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
169=back 260=back
170 261
171=cut 262=cut
172 263
173BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
174 *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 {
175 my $msg = join "", @_; 271 my $msg = join "", @_;
176 272
177 $msg .= "\n" 273 $msg .= "\n"
178 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
179 275
180 $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;
181 277
182 utf8::encode $msg;
183 LOG llevError, $msg; 278 LOG llevWarn, $msg;
184 }; 279};
185} 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};
186 294
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 305for my $pkg (qw(
198 cf::global cf::attachable 306 cf::global cf::attachable
199 cf::object cf::object::player 307 cf::object cf::object::player
200 cf::client cf::player 308 cf::client cf::player
201 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
202 cf::map cf::party cf::region 311 cf::party cf::region
203)) { 312)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 314}
207 315
208$Event::DIED = sub { 316$EV::DIED = sub {
209 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
210}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
211 324
212############################################################################# 325#############################################################################
213 326
214=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
215 328
… …
236 $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;
237 $d 350 $d
238 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
239} 352}
240 353
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working 354=item $scalar = load_file $path
242 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
243=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
244 369
245Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
246 371
247=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
248 373
249Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
250 375
376=cut
377
378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
379
380sub encode_json($) { $json_coder->encode ($_[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}
444
251=item cf::lock_wait $string 445=item cf::lock_wait $string
252 446
253Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
254 448
255=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
256 450
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
260returned. 454returned.
261 455
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
262Lock 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
263uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
264 461
265=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
266 463
267Return 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.
268 465
269=cut 466=cut
270 467
271our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
272 469
273sub lock_wait($) { 470sub lock_wait($) {
274 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
275
276 # wait for lock, if any
277 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule;
280 }
281} 472}
282 473
283sub lock_acquire($) { 474sub lock_acquire($) {
284 my ($key) = @_; 475 $LOCKS->guard ($_[0])
285
286 # wait, to be sure we are not locked
287 lock_wait $key;
288
289 $LOCK{$key} = [];
290
291 Coro::guard {
292 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} };
294 }
295} 476}
296 477
297sub lock_active($) { 478sub lock_active($) {
298 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
299
300 ! ! $LOCK{$key}
301} 480}
302 481
303sub freeze_mainloop { 482sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
305 484
306 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
307 $TICK_WATCHER->start; 486}
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
503=item cf::get_slot $time[, $priority[, $name]]
504
505Allocate $time seconds of blocking CPU time at priority C<$priority>
506(default: 0): This call blocks and returns only when you have at least
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.
515
516Useful for short background jobs.
517
518=cut
519
520our @SLOT_QUEUE;
521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
523
524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
528 my $signal = new Coro::Signal;
529 my $busy;
530
531 while () {
532 next_job:
533
534 my $avail = cf::till_tick;
535
536 for (0 .. $#SLOT_QUEUE) {
537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
539 my $job = splice @SLOT_QUEUE, $_, 1, ();
540 $job->[2]->send;
541 Coro::cede;
542 goto next_job;
543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545 }
546 }
547
548 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal;
551 $signal->wait;
552 } else {
553 $busy = 0;
554 Coro::schedule;
555 }
308 }; 556 }
309 $TICK_WATCHER->stop; 557};
310 $guard 558
559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
562 my ($time, $pri, $name) = @_;
563
564 $time = clamp $time, 0.01, $TICK * .6;
565
566 my $sig = new Coro::Signal;
567
568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
570 $SLOT_QUEUE->ready;
571 $sig->wait;
311} 572}
312 573
313=item cf::async { BLOCK } 574=item cf::async { BLOCK }
314 575
315Currently the same as Coro::async_pool, meaning you cannot use 576Currently the same as Coro::async_pool, meaning you cannot use
… …
320 581
321BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
322 583
323=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
324 585
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
327partly 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
328acceptable. 589acceptable.
329 590
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
… …
335=cut 596=cut
336 597
337sub sync_job(&) { 598sub sync_job(&) {
338 my ($job) = @_; 599 my ($job) = @_;
339 600
340 if ($Coro::current == $Coro::main) { 601 if (in_main) {
341 my $time = Event::time; 602 my $time = AE::time;
342 603
343 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
345 606
346 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 608
348 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
349 610
350 my $busy = 1; 611 my $busy = 1;
351 my @res; 612 my @res;
352 613
353 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 616 @res = eval { $job->() };
355 warn $@ if $@; 617 error $@ if $@;
356 undef $busy; 618 undef $busy;
357 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
358 620
359 while ($busy) { 621 while ($busy) {
360 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
361 } 626 }
627 }
362 628
363 $time = Event::time - $time; 629 my $time = AE::time - $time;
364 630
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
369 632
370 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
371 } else { 634 } else {
372 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
373 636
… …
393 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
394 657
395 $coro 658 $coro
396} 659}
397 660
398=item fork_call { }, $args 661=item fork_call { }, @args
399 662
400Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
404 667
405=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
406 673
407sub fork_call(&@) { 674sub fork_call(&@) {
408 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
409 676
410# 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,
411# or die "socketpair: $!"; 678 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 679 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 680
415 if (my $pid = fork) { 681 my @res = Coro::Util::fork_eval {
416 close $fh2; 682 cf::post_fork;
683 &$cb
684 } @args;
417 685
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 686 wantarray ? @res : $res[-1]
419 $res = Coro::Storable::thaw $res; 687}
420 688
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 689sub objinfo {
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals;
428 local $SIG{__WARN__};
429 local $SIG{__DIE__};
430 eval {
431 close $fh1;
432
433 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 } 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
440} 725}
441 726
442=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
443 728
444Returns a single value from the environment database. 729Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
447 732
448Stores 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
449data 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).
450 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
451=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}
452 762
453our $DB; 763our $DB;
454 764
455sub db_init { 765sub db_init {
456 unless ($DB) { 766 $DB ||= db_table "db";
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job {
460 eval {
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 }
470} 767}
471 768
472sub db_get($$) { 769sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
474 771
475 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
476 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
477 776
478 $! ? () 777 $! ? ()
479 : $data 778 : $data
480 }
481} 779}
482 780
483sub db_put($$$) { 781sub db_put($$$) {
484 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
485 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
513 811
514 my @data; 812 my @data;
515 my $md5; 813 my $md5;
516 814
517 for (0 .. $#$src) { 815 for (0 .. $#$src) {
518 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
519 or Carp::croak "$src->[$_]: $!";
520 } 817 }
521 818
522 # if processing is expensive, check 819 # if processing is expensive, check
523 # checksum first 820 # checksum first
524 if (1) { 821 if (1) {
525 $md5 = 822 $md5 =
526 join "\x00", 823 join "\x00",
527 $processversion, 824 $processversion,
528 map { 825 map {
529 Coro::cede; 826 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 828 } 0.. $#$src;
532 829
533 830
534 my $dbmd5 = db_get cache => "$id/md5"; 831 my $dbmd5 = db_get cache => "$id/md5";
… …
541 838
542 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
543 my $data = $process->(\@data); 840 my $data = $process->(\@data);
544 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
545 842
546 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
547 844
548 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
549 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
550 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
551 848
… …
561 858
562=cut 859=cut
563 860
564sub datalog($@) { 861sub datalog($@) {
565 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
566 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
567} 864}
568 865
569=back 866=back
570 867
571=cut 868=cut
572 869
573############################################################################# 870#############################################################################
574 871
575=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
576 873
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
580 877
581In 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>
582C<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
583Crossfire TRT). 880Deliantra).
584 881
585=over 4 882=over 4
586 883
587=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
588 885
… …
632=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
633 930
634Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
636 933
637Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 936
640These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
641 938
642=over 4 939=over 4
… …
766 1063
767 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
768 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
769 1066
770 } elsif (ref $type) { 1067 } elsif (ref $type) {
771 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
772 1069
773 } else { 1070 } else {
774 shift @arg; 1071 shift @arg;
775 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
776 } 1073 }
777 } 1074 }
778} 1075}
779 1076
780sub _object_attach { 1077sub _object_attach {
… …
790 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
791 } 1088 }
792 1089
793 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
794 } else { 1091 } else {
795 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
796 } 1093 }
797 1094
798 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
799} 1096}
800 1097
… …
840 "; 1137 ";
841 die if $@; 1138 die if $@;
842} 1139}
843 1140
844our $override; 1141our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1142our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 1143
847sub override { 1144sub override {
848 $override = 1; 1145 $override = 1;
849 @invoke_results = (); 1146 @INVOKE_RESULTS = (@_);
850} 1147}
851 1148
852sub do_invoke { 1149sub do_invoke {
853 my $event = shift; 1150 my $event = shift;
854 my $callbacks = shift; 1151 my $callbacks = shift;
855 1152
856 @invoke_results = (); 1153 @INVOKE_RESULTS = ();
857 1154
858 local $override; 1155 local $override;
859 1156
860 for (@$callbacks) { 1157 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
862 1159
863 if ($@) { 1160 if ($@) {
864 warn "$@";
865 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
866 override; 1162 override;
867 } 1163 }
868 1164
869 return 1 if $override; 1165 return 1 if $override;
870 } 1166 }
871 1167
872 0 1168 0
873} 1169}
874 1170
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1172
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1174
879Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
880 1176
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1177This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 1178removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 1179results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1180
885=back 1181=back
886 1182
887=cut 1183=cut
888 1184
889############################################################################# 1185#############################################################################
890# object support 1186# object support
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#
1221sub _can_merge {
1222 my ($ob1, $ob2) = @_;
1223
1224 ++$SLOW_MERGES;#d#
1225
1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
1228}
891 1229
892sub reattach { 1230sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1232 my ($obj) = @_;
895 1233
1234 # no longer needed after getting rid of delete_package?
896 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
897 1236
898 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
899 1238
900 @$registry = (); 1239 @$registry = ();
901 1240
… …
906 for (@$attach) { 1245 for (@$attach) {
907 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
908 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
909 } 1248 }
910 } else { 1249 } else {
911 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
912 } 1251 }
913 } 1252 }
914} 1253}
915 1254
916cf::attachable->attach ( 1255cf::attachable->attach (
917 prio => -1000000, 1256 prio => -1000000,
918 on_instantiate => sub { 1257 on_instantiate => sub {
919 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
920 1259
921 $data = from_json $data; 1260 $data = decode_json $data;
922 1261
923 for (@$data) { 1262 for (@$data) {
924 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
925 1264
926 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1281sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
944 1283
945 sync_job { 1284 sync_job {
946 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
949 1290
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 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 }
954 close $fh; 1298 aio_close $fh;
955 1299
956 if (@$objs) { 1300 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
961 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 }
962 close $fh; 1309 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
964 } 1311 }
965 } else { 1312 } else {
966 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
967 } 1314 }
968 1315
969 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1320 } else {
971 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
972 } 1322 }
973 } else { 1323 } else {
974 aio_unlink $filename; 1324 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
976 } 1326 }
977 } 1327 };
978} 1328}
979 1329
980sub object_freezer_as_string { 1330sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
982 1332
… …
994 or return; 1344 or return;
995 1345
996 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
998 or return; 1348 or return;
1349
999 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1000 } 1352 }
1001 1353
1354 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
1004 return ($data, $av); 1359 ($data, $av)
1005} 1360}
1006 1361
1007=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1008 1363
1009=over 4 1364=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1384 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1385}
1031 1386
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1387=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1388
1034Register a callback fro execution when the client sends an extcmd packet. 1389Register a callback for execution when the client sends an (synchronous)
1390extcmd packet. Ext commands will be processed in the order they are
1391received by the server, like other user commands. The first argument is
1392the logged-in player. Ext commands can only be processed after a player
1393has logged in successfully.
1035 1394
1036If the callback returns something, it is sent back as if reply was being 1395If the callback returns something, it is sent back as if reply was being
1037called. 1396called.
1038 1397
1398=item cf::register_exticmd $name => \&callback($ns,$packet);
1399
1400Register a callback for execution when the client sends an (asynchronous)
1401exticmd packet. Exti commands are processed by the server as soon as they
1402are received, i.e. out of order w.r.t. other commands. The first argument
1403is a client socket. Exti commands can be received anytime, even before
1404log-in.
1405
1406If the callback returns something, it is sent back as if reply was being
1407called.
1408
1039=cut 1409=cut
1040 1410
1041sub register_extcmd { 1411sub register_extcmd {
1042 my ($name, $cb) = @_; 1412 my ($name, $cb) = @_;
1043 1413
1044 $EXTCMD{$name} = $cb; 1414 $EXTCMD{$name} = $cb;
1045} 1415}
1046 1416
1417sub register_exticmd {
1418 my ($name, $cb) = @_;
1419
1420 $EXTICMD{$name} = $cb;
1421}
1422
1423use File::Glob ();
1424
1047cf::player->attach ( 1425cf::player->attach (
1048 on_command => sub { 1426 on_unknown_command => sub {
1049 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1050 1428
1051 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1052 or return; 1430 or return;
1053 1431
… …
1058 cf::override; 1436 cf::override;
1059 }, 1437 },
1060 on_extcmd => sub { 1438 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1439 my ($pl, $buf) = @_;
1062 1440
1063 my $msg = eval { from_json $buf }; 1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1442
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1451 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1452 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
1071 } else { 1458 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1460 }
1074 1461
1075 cf::override; 1462 cf::override;
1076 }, 1463 },
1077); 1464);
1078 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
1079sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1080 cf::sync_job { 1482 cf::sync_job {
1081 my %todo; 1483 my %todo;
1082 1484
1083 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1084 next unless -r $path; 1486 next unless -r $path;
… …
1102 1504
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1507
1106 $ext{source} = 1508 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1108 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1109 . $source 1511 . $source
1110 . "\n};\n1"; 1512 . "\n};\n1";
1111 1513
1112 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1113 } 1515 }
1114 1516
1517 my $pass = 0;
1115 my %done; 1518 my %done;
1116 while (%todo) { 1519 while (%todo) {
1117 my $progress; 1520 my $progress;
1118 1521
1522 ++$pass;
1523
1524 ext:
1119 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1120 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1121 goto skip 1527 next ext
1122 unless exists $done{$_}; 1528 unless exists $done{$_};
1123 } 1529 }
1124 1530
1125 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1126 1532
1127 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1128 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1129 : "$v->{base}: extension inactive.\n";
1130 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1131 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1132 warn $msg; 1540
1133 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1134 exit 1; 1542 delete $todo{$k};
1135 } 1543 } else {
1136 1544 $done{$k} = delete $todo{$k};
1137 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1138 } 1550 }
1139
1140 $done{$k} = delete $todo{$k};
1141 push @EXTS, $v->{pkg};
1142 $progress = 1;
1143 } 1551 }
1144 1552
1145 skip: 1553 unless ($progress) {
1146 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1147 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 }
1148 } 1563 }
1149 }; 1564 };
1150} 1565}
1151 1566
1152############################################################################# 1567#############################################################################
1153 1568
1154=back 1569=back
1155 1570
1156=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1157 1572
1158Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1159 1574
1160=cut 1575=cut
1161 1576
1162package cf::player; 1577package cf::player;
1163 1578
1164use Coro::AIO; 1579use Coro::AIO;
1165 1580
1166=head3 cf::player 1581=head3 cf::player
1167 1582
1168=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}
1169 1598
1170=item cf::player::find $login 1599=item cf::player::find $login
1171 1600
1172Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1173 1602
… …
1192 1621
1193sub exists($) { 1622sub exists($) {
1194 my ($login) = @_; 1623 my ($login) = @_;
1195 1624
1196 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1198} 1627}
1199 1628
1200sub find($) { 1629sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1631 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1642
1214 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1217 } 1652 }
1218 } 1653 }
1219} 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);
1220 1668
1221sub save($) { 1669sub save($) {
1222 my ($pl) = @_; 1670 my ($pl) = @_;
1223 1671
1224 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
… …
1229 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1230 1678
1231 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1233 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
1234 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1235 Coro::cede; 1688 cf::cede_to_tick;
1236} 1689}
1237 1690
1238sub new($) { 1691sub new($) {
1239 my ($login) = @_; 1692 my ($login) = @_;
1240 1693
… …
1246 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1247 1700
1248 $self 1701 $self
1249} 1702}
1250 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
1251=item $pl->quit_character 1714=item $pl->quit_character
1252 1715
1253Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1255 1718
… …
1259 my ($pl) = @_; 1722 my ($pl) = @_;
1260 1723
1261 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1262 1725
1263 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1264 $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
1265 1728
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1267 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1269 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1270 1737
1271 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1273 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1308 or return []; 1775 or return [];
1309 1776
1310 my @logins; 1777 my @logins;
1311 1778
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1316 1789
1317 utf8::decode $login; 1790 utf8::decode $login;
1318 push @logins, $login; 1791 push @logins, $login;
1319 } 1792 }
1320 1793
1321 \@logins 1794 \@logins
1322} 1795}
1323 1796
1324=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1325 1800
1326Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1327player. May block. 1802player. May block.
1328 1803
1329=cut 1804=cut
… …
1347 } 1822 }
1348 1823
1349 \@paths 1824 \@paths
1350} 1825}
1351 1826
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1828
1354Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1355 1830
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1385=item $player->ext_reply ($msgid, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1386 1832
1387Sends an ext reply to the player. 1833Sends an ext reply to the player.
1388 1834
1389=cut 1835=cut
1390 1836
1391sub ext_reply($$%) { 1837sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1393 1839
1394 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1841}
1398 1842
1399=item $player->ext_event ($type, %msg) 1843=item $player->ext_msg ($type, @msg)
1400 1844
1401Sends an ext event to the client. 1845Sends an ext event to the client.
1402 1846
1403=cut 1847=cut
1404 1848
1405sub ext_event($$%) { 1849sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1850 my ($self, $type, @msg) = @_;
1407 1851
1408 $self->ns->ext_event ($type, %msg); 1852 $self->ns->ext_msg ($type, @msg);
1409} 1853}
1410 1854
1411=head3 cf::region 1855=head3 cf::region
1412 1856
1413=over 4 1857=over 4
… …
1423=cut 1867=cut
1424 1868
1425sub find_by_path($) { 1869sub find_by_path($) {
1426 my ($path) = @_; 1870 my ($path) = @_;
1427 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1428 my ($match, $specificity); 1874 my ($match, $specificity);
1429 1875
1430 for my $region (list) { 1876 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1879 if $region->specificity > $specificity;
1434 } 1880 }
1435 } 1881 }
1436 1882
… …
1457our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1459 1905
1460sub generate_random_map { 1906sub generate_random_map {
1461 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1462 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1463 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1467 $rmp->{exit_on_final_map},
1468 $rmp->{xsize}, $rmp->{ysize},
1469 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1470 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1471 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1472 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1473 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1474 (cf::region::find $rmp->{region}), $rmp->{custom}
1475 )
1476} 1912}
1477 1913
1478=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1479 1915
1480Register 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
… …
1485 1921
1486sub register { 1922sub register {
1487 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1488 my $pkg = caller; 1924 my $pkg = caller;
1489 1925
1490 no strict;
1491 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1492 1927
1493 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1494} 1929}
1495 1930
1496# also paths starting with '/' 1931# also paths starting with '/'
1497$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1498 1933
1499sub thawer_merge { 1934sub thawer_merge {
1500 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1501 1936
1502 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1507} 1942}
1508 1943
1509sub normalise { 1944sub normalise {
1510 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1511 1946
1512 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1513 1948
1514 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1515 1950
1516 # map plan: 1951 # map plan:
1517 # 1952 #
… …
1519 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1520 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1521 # ?random/... random maps 1956 # ?random/... random maps
1522 # /... normal maps 1957 # /... normal maps
1523 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1524 1960
1525 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1526 1962
1527 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1528 # something that looks reasonable 1964 # something that looks reasonable
1529 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1530 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1531 1967
1532 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1533 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1534 } 1984 }
1535 1985
1536 for ($path) { 1986 for ($path) {
1537 redo if s{//}{/};
1538 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1539 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1540 } 1989 }
1541 1990
1542 $path 1991 $path
… …
1556 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1557 return $self; 2006 return $self;
1558 } 2007 }
1559 } 2008 }
1560 2009
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1562 () 2011 ()
1563} 2012}
1564 2013
2014# may re-bless or do other evil things
1565sub init { 2015sub init {
1566 my ($self) = @_; 2016 my ($self) = @_;
1567 2017
1568 $self 2018 $self
1569} 2019}
… …
1588 2038
1589# the temporary/swap location 2039# the temporary/swap location
1590sub save_path { 2040sub save_path {
1591 my ($self) = @_; 2041 my ($self) = @_;
1592 2042
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1595} 2045}
1596 2046
1597# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1598sub uniq_path { 2048sub uniq_path {
1599 my ($self) = @_; 2049 my ($self) = @_;
1600 2050
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1603}
1604
1605# and all this just because we cannot iterate over
1606# all maps in C++...
1607sub change_all_map_light {
1608 my ($change) = @_;
1609
1610 $_->change_map_light ($change)
1611 for grep $_->outdoor, values %cf::MAP;
1612} 2053}
1613 2054
1614sub decay_objects { 2055sub decay_objects {
1615 my ($self) = @_; 2056 my ($self) = @_;
1616 2057
… …
1629 2070
1630sub load_header_from($) { 2071sub load_header_from($) {
1631 my ($self, $path) = @_; 2072 my ($self, $path) = @_;
1632 2073
1633 utf8::encode $path; 2074 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 2075 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 2076 or return;
1639 2077
2078 $self->_load_header ($f)
2079 or return;
2080
2081 local $MAP_LOADING{$self->{path}} = $self;
2082 $f->resolve_delayed_derefs;
2083
1640 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1641 2085
1642 1 2086 1
1643} 2087}
1644 2088
2089# used to laod the header of an original map
1645sub load_header_orig { 2090sub load_header_orig {
1646 my ($self) = @_; 2091 my ($self) = @_;
1647 2092
1648 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1649} 2094}
1650 2095
2096# used to laod the header of an instantiated map
1651sub load_header_temp { 2097sub load_header_temp {
1652 my ($self) = @_; 2098 my ($self) = @_;
1653 2099
1654 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1655} 2101}
1656 2102
2103# called after loading the header from an instantiated map
1657sub prepare_temp { 2104sub prepare_temp {
1658 my ($self) = @_; 2105 my ($self) = @_;
1659 2106
1660 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1661 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1662 # safety 2109 # safety
1663 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1664 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1665} 2112}
1666 2113
2114# called after loading the header from an original map
1667sub prepare_orig { 2115sub prepare_orig {
1668 my ($self) = @_; 2116 my ($self) = @_;
1669 2117
1670 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1671 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
… …
1695 2143
1696sub find; 2144sub find;
1697sub find { 2145sub find {
1698 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1699 2147
2148 cf::cede_to_tick;
2149
1700 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1701 2151
2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1703 2154
1704 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path";
1706 my $map = new_from_path cf::map $path 2156 my $map = new_from_path cf::map $path
1707 or return; 2157 or return;
1708 2158
1709 $map->{last_save} = $cf::RUNTIME; 2159 $map->{last_save} = $cf::RUNTIME;
1710 2160
… …
1712 or return; 2162 or return;
1713 2163
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2164 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2165 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2166 #$cf::WAIT_FOR_TICK->wait;
2167 undef $guard2;
2168 undef $guard1;
1717 $map->reset; 2169 $map->reset;
1718 undef $guard;
1719 return find $path; 2170 return find $path;
1720 } 2171 }
1721 2172
1722 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
1723 } 2174 }
1724} 2175}
1725 2176
1726sub pre_load { } 2177sub pre_load { }
1727sub post_load { } 2178#sub post_load { } # XS
1728 2179
1729sub load { 2180sub load {
1730 my ($self) = @_; 2181 my ($self) = @_;
1731 2182
1732 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
1733 2184
1734 my $path = $self->{path}; 2185 my $path = $self->{path};
1735 2186
1736 { 2187 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2188 my $guard = cf::lock_acquire "map_data:$path";
1738 2189
2190 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2191 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2192
1741 $self->in_memory (cf::MAP_LOADING); 2193 $self->in_memory (cf::MAP_LOADING);
1742 2194
1743 $self->alloc; 2195 $self->alloc;
1744 2196
1745 $self->pre_load; 2197 $self->pre_load;
1746 Coro::cede; 2198 cf::cede_to_tick;
1747 2199
1748 $self->_load_objects ($self->{load_path}, 1) 2200 if (exists $self->{load_path}) {
2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2202 $f->skip_block;
2203 $self->_load_objects ($f)
1749 or return; 2204 or return;
1750 2205
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2206 $self->post_load_original
1752 if delete $self->{load_original}; 2207 if delete $self->{load_original};
1753 2208
1754 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2210 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2211 unless (aio_stat $uniq) {
2212 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2213 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2214 $self->_load_objects ($f);
2215 $f->resolve_delayed_derefs;
2216 }
2217 }
1759 } 2218 }
1760 }
1761 2219
1762 Coro::cede; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2225
2226 cf::cede_to_tick;
1763 # now do the right thing for maps 2227 # now do the right thing for maps
1764 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2230 unless $self->difficulty;
1767 Coro::cede; 2231 cf::cede_to_tick;
1768 2232
1769 unless ($self->{deny_activate}) { 2233 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2234 $self->decay_objects;
1771 $self->fix_auto_apply; 2235 $self->fix_auto_apply;
1772 $self->update_buttons; 2236 $self->update_buttons;
1773 Coro::cede; 2237 cf::cede_to_tick;
1774 $self->set_darkness_map;
1775 Coro::cede;
1776 $self->activate; 2238 $self->activate;
1777 } 2239 }
1778 2240
2241 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME);
2243
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2244 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2245 }
1781 2246
1782 $self->post_load; 2247 $self->post_load;
1783}
1784 2248
2249 1
2250}
2251
2252# customize the map for a given player, i.e.
2253# return the _real_ map. used by e.g. per-player
2254# maps to change the path to ~playername/mappath
1785sub customise_for { 2255sub customise_for {
1786 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
1787 2257
1788 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
1789 if $self->per_player; 2259 if $self->per_player;
… …
1793 2263
1794 $self 2264 $self
1795} 2265}
1796 2266
1797# find and load all maps in the 3x3 area around a map 2267# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2268sub load_neighbours {
1799 my ($map) = @_; 2269 my ($map) = @_;
1800 2270
1801 my @diag; # diagonal neighbours 2271 my @neigh; # diagonal neighbours
1802 2272
1803 for (0 .. 3) { 2273 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2274 my $neigh = $map->tile_path ($_)
1805 or next; 2275 or next;
1806 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
1807 or next; 2277 or next;
1808 $neigh->load; 2278 $neigh->load;
1809 2279
2280 # now find the diagonal neighbours
2281 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2284 }
1813 2285
1814 for (@diag) { 2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2288 my $neigh = find $path, $origin
1816 or next; 2289 or next;
1817 $neigh->load; 2290 $neigh->load;
1818 } 2291 }
1819} 2292}
1820 2293
1821sub find_sync { 2294sub find_sync {
1822 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
1823 2296
1824 cf::sync_job { find $path, $origin } 2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main;
2299
2300 find $path, $origin
1825} 2301}
1826 2302
1827sub do_load_sync { 2303sub do_load_sync {
1828 my ($map) = @_; 2304 my ($map) = @_;
1829 2305
1830 cf::sync_job { $map->load }; 2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2307 if $Coro::current == $Coro::main;
2308
2309 $map->load;
1831} 2310}
1832 2311
1833our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
1835 2314
1836sub find_async { 2315sub find_async {
1837 my ($path, $origin) = @_; 2316 my ($path, $origin, $load) = @_;
1838 2317
1839 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
1840 2319
1841 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2322 }
1844 2323
1845 undef $MAP_PREFETCH{$path}; 2324 $MAP_PREFETCH{$path} |= $load;
2325
1846 $MAP_PREFETCHER ||= cf::async { 2326 $MAP_PREFETCHER ||= cf::async {
2327 $Coro::current->{desc} = "map prefetcher";
2328
1847 while (%MAP_PREFETCH) { 2329 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2330 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2331 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2332 $map->load if $v;
2333 }
1852 2334
1853 delete $MAP_PREFETCH{$path}; 2335 delete $MAP_PREFETCH{$k};
1854 } 2336 }
1855 } 2337 }
1856 undef $MAP_PREFETCHER; 2338 undef $MAP_PREFETCHER;
1857 }; 2339 };
1858 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
1859 2341
1860 () 2342 ()
1861} 2343}
1862 2344
2345# common code, used by both ->save and ->swapout
1863sub save { 2346sub _save {
1864 my ($self) = @_; 2347 my ($self) = @_;
1865
1866 my $lock = cf::lock_acquire "map_data:" . $self->path;
1867 2348
1868 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
1869 2350
1870 return unless $self->dirty; 2351 return unless $self->dirty;
1871 2352
… …
1877 return if $self->{deny_save}; 2358 return if $self->{deny_save};
1878 2359
1879 local $self->{last_access} = $self->last_access;#d# 2360 local $self->{last_access} = $self->last_access;#d#
1880 2361
1881 cf::async { 2362 cf::async {
2363 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2364 $_->contr->save for $self->players;
1883 }; 2365 };
2366
2367 cf::get_slot 0.02;
1884 2368
1885 if ($uniq) { 2369 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2370 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2371 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2372 } else {
1889 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2373 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1890 } 2374 }
1891} 2375}
1892 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
1893sub swap_out { 2385sub swap_out {
1894 my ($self) = @_; 2386 my ($self) = @_;
1895 2387
1896 # save first because save cedes
1897 $self->save;
1898
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2389
2390 return if $self->in_memory != cf::MAP_ACTIVE;
2391 return if $self->{deny_save};
1901 return if $self->players; 2392 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY;
1903 return if $self->{deny_save};
1904 2393
2394 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP;
2397 $self->in_memory (cf::MAP_SWAPPED);
2398
2399 # then atomically save
2400 $self->_save;
2401
2402 # then free the map
1905 $self->clear; 2403 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2404}
1908 2405
1909sub reset_at { 2406sub reset_at {
1910 my ($self) = @_; 2407 my ($self) = @_;
1911 2408
… …
1929 2426
1930 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2427 my $lock = cf::lock_acquire "map_data:$self->{path}";
1931 2428
1932 return if $self->players; 2429 return if $self->players;
1933 2430
1934 warn "resetting map ", $self->path; 2431 cf::trace "resetting map ", $self->path, "\n";
1935 2432
1936 $self->in_memory (cf::MAP_SWAPPED); 2433 $self->in_memory (cf::MAP_SWAPPED);
1937 2434
1938 # need to save uniques path 2435 # need to save uniques path
1939 unless ($self->{deny_save}) { 2436 unless ($self->{deny_save}) {
… …
1943 if $uniq; 2440 if $uniq;
1944 } 2441 }
1945 2442
1946 delete $cf::MAP{$self->path}; 2443 delete $cf::MAP{$self->path};
1947 2444
2445 $self->deactivate;
2446 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2447 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2448
1952 $self->unlink_save; 2449 $self->unlink_save;
1953 $self->destroy; 2450 $self->destroy;
1954} 2451}
1955 2452
1956my $nuke_counter = "aaaa"; 2453my $nuke_counter = "aaaa";
1957 2454
1958sub nuke { 2455sub nuke {
1959 my ($self) = @_; 2456 my ($self) = @_;
1960 2457
2458 {
2459 my $lock = cf::lock_acquire "map_data:$self->{path}";
2460
1961 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
1962 2462
1963 $self->unlink_save; 2463 $self->unlink_save;
1964 2464
1965 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
1966 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2470
1971 $cf::MAP{$self->path} = $self; 2471 $cf::MAP{$self->path} = $self;
2472 }
1972 2473
1973 $self->reset; # polite request, might not happen 2474 $self->reset; # polite request, might not happen
1974} 2475}
1975 2476
1976=item $maps = cf::map::tmp_maps 2477=item $maps = cf::map::tmp_maps
… …
2018 2519
2019sub unique_maps() { 2520sub unique_maps() {
2020 [ 2521 [
2021 map { 2522 map {
2022 utf8::decode $_; 2523 utf8::decode $_;
2023 /\.map$/ 2524 s/\.map$//; # TODO future compatibility hack
2525 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2526 ? ()
2024 ? normalise $_ 2527 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2528 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2529 ]
2028} 2530}
2029 2531
2030package cf; 2532=item cf::map::static_maps
2533
2534Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2535file in the shared directory excluding F</styles> and F</editor>). May
2536block.
2537
2538=cut
2539
2540sub static_maps() {
2541 my @dirs = "";
2542 my @maps;
2543
2544 while (@dirs) {
2545 my $dir = shift @dirs;
2546
2547 next if $dir eq "/styles" || $dir eq "/editor";
2548
2549 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2550 or return;
2551
2552 for (@$files) {
2553 s/\.map$// or next;
2554 utf8::decode $_;
2555 push @maps, "$dir/$_";
2556 }
2557
2558 push @dirs, map "$dir/$_", @$dirs;
2559 }
2560
2561 \@maps
2562}
2031 2563
2032=back 2564=back
2033 2565
2034=head3 cf::object 2566=head3 cf::object
2035 2567
… …
2039 2571
2040=over 4 2572=over 4
2041 2573
2042=item $ob->inv_recursive 2574=item $ob->inv_recursive
2043 2575
2044Returns the inventory of the object _and_ their inventories, recursively. 2576Returns the inventory of the object I<and> their inventories, recursively,
2577but I<not> the object itself.
2045 2578
2046=cut 2579=cut
2047 2580
2048sub inv_recursive_; 2581sub inv_recursive_;
2049sub inv_recursive_ { 2582sub inv_recursive_ {
… …
2052 2585
2053sub inv_recursive { 2586sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2587 inv_recursive_ inv $_[0]
2055} 2588}
2056 2589
2590=item $ref = $ob->ref
2591
2592Creates and returns a persistent reference to an object that can be stored as a string.
2593
2594=item $ob = cf::object::deref ($refstring)
2595
2596returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2597even if the object actually exists. May block.
2598
2599=cut
2600
2601sub deref {
2602 my ($ref) = @_;
2603
2604 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2605 my ($uuid, $name) = ($1, $2);
2606 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2607 or return;
2608 $pl->ob->uuid eq $uuid
2609 or return;
2610
2611 $pl->ob
2612 } else {
2613 warn "$ref: cannot resolve object reference\n";
2614 undef
2615 }
2616}
2617
2057package cf; 2618package cf;
2058 2619
2059=back 2620=back
2060 2621
2061=head3 cf::object::player 2622=head3 cf::object::player
… …
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2628Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2068can be C<undef>. Does the right thing when the player is currently in a 2629can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2630dialogue with the given NPC character.
2070 2631
2071=cut 2632=cut
2633
2634our $SAY_CHANNEL = {
2635 id => "say",
2636 title => "Map",
2637 reply => "say ",
2638 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2639};
2640
2641our $CHAT_CHANNEL = {
2642 id => "chat",
2643 title => "Chat",
2644 reply => "chat ",
2645 tooltip => "Player chat and shouts, global to the server.",
2646};
2072 2647
2073# rough implementation of a future "reply" method that works 2648# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2649# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2650#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2651sub cf::object::player::reply($$$;$) {
… …
2083 2658
2084 } else { 2659 } else {
2085 my $pl = $self->contr; 2660 my $pl = $self->contr;
2086 2661
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2662 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2663 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2664 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2665
2096 } else { 2666 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2667 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2668 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2669 }
2100 } 2670 }
2671}
2672
2673=item $object->send_msg ($channel, $msg, $color, [extra...])
2674
2675=cut
2676
2677sub cf::object::send_msg {
2678 my $pl = shift->contr
2679 or return;
2680 $pl->send_msg (@_);
2101} 2681}
2102 2682
2103=item $player_object->may ("access") 2683=item $player_object->may ("access")
2104 2684
2105Returns wether the given player is authorized to access resource "access" 2685Returns wether the given player is authorized to access resource "access"
… …
2118 2698
2119=item $player_object->enter_link 2699=item $player_object->enter_link
2120 2700
2121Freezes the player and moves him/her to a special map (C<{link}>). 2701Freezes the player and moves him/her to a special map (C<{link}>).
2122 2702
2123The player should be reasonably safe there for short amounts of time. You 2703The player should be reasonably safe there for short amounts of time (e.g.
2124I<MUST> call C<leave_link> as soon as possible, though. 2704for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2705though, as the player cannot control the character while it is on the link
2706map.
2125 2707
2126Will never block. 2708Will never block.
2127 2709
2128=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
2129 2711
… …
2149sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
2150 my ($self) = @_; 2732 my ($self) = @_;
2151 2733
2152 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
2153 2735
2736 ++$self->{_link_recursion};
2737
2154 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
2155 2739
2156 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2157 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
2158 2742
2159 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2160} 2744}
2161 2745
2162sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
2163 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
2164 2748
… …
2181 ($x, $y) = (-1, -1) 2765 ($x, $y) = (-1, -1)
2182 unless (defined $x) && (defined $y); 2766 unless (defined $x) && (defined $y);
2183 2767
2184 # use -1 or undef as default coordinates, not 0, 0 2768 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2769 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2770 if $x <= 0 && $y <= 0;
2187 2771
2188 $map->load; 2772 $map->load;
2189 $map->load_diag; 2773 $map->load_neighbours;
2190 2774
2191 return unless $self->contr->active; 2775 return unless $self->contr->active;
2192 $self->activate_recursive;
2193 2776
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2196} 2779 # entering was successful
2780 delete $self->{_link_recursion};
2781 # only activate afterwards, to support waiting in hooks
2782 $self->activate_recursive;
2783 }
2197 2784
2785}
2786
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2787=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2199 2788
2200Moves the player to the given map-path and coordinates by first freezing 2789Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2791that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2792the new (success) or old (failed) map position. In either case, $done will
2793be called at the end of this process.
2794
2795Note that $check will be called with a potentially non-loaded map, so if
2796it needs a loaded map it has to call C<< ->load >>.
2204 2797
2205=cut 2798=cut
2206 2799
2207our $GOTOGEN; 2800our $GOTOGEN;
2208 2801
2209sub cf::object::player::goto { 2802sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2803 my ($self, $path, $x, $y, $check, $done) = @_;
2804
2805 if ($self->{_link_recursion} >= $MAX_LINKS) {
2806 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2807 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2808 ($path, $x, $y) = @$EMERGENCY_POSITION;
2809 }
2211 2810
2212 # do generation counting so two concurrent goto's will be executed in-order 2811 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2813
2215 $self->enter_link; 2814 $self->enter_link;
2216 2815
2217 (async { 2816 (async {
2817 $Coro::current->{desc} = "player::goto $path $x $y";
2818
2819 # *tag paths override both path and x|y
2820 if ($path =~ /^\*(.*)$/) {
2821 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2822 my $ob = $obs[rand @obs];
2823
2824 # see if we actually can go there
2825 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2826 $ob = $obs[rand @obs];
2827 } else {
2828 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2829 }
2830 # else put us there anyways for now #d#
2831
2832 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2833 } else {
2834 ($path, $x, $y) = (undef, undef, undef);
2835 }
2836 }
2837
2218 my $map = eval { 2838 my $map = eval {
2219 my $map = cf::map::find $path; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2220 2840
2221 if ($map) { 2841 if ($map) {
2222 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2224 } else { 2844 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2845 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2846 }
2227 2847
2228 $map 2848 $map
2229 }; 2849 };
2230 2850
… …
2235 2855
2236 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2239 } 2859 }
2860
2861 $done->($self) if $done;
2240 })->prio (1); 2862 })->prio (1);
2241} 2863}
2242 2864
2243=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2244 2866
… …
2264} 2886}
2265 2887
2266sub prepare_random_map { 2888sub prepare_random_map {
2267 my ($exit) = @_; 2889 my ($exit) = @_;
2268 2890
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2891 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2892 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2893 # that depends on the exit object
2274 2894
2275 my $rmp = parse_random_map_params $exit->msg; 2895 my $rmp = parse_random_map_params $exit->msg;
… …
2277 if ($exit->map) { 2897 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2898 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2899 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2900 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2901 $rmp->{origin_y} = $exit->y;
2902
2903 $exit->map->touch;
2282 } 2904 }
2283 2905
2284 $rmp->{random_seed} ||= $exit->random_seed; 2906 $rmp->{random_seed} ||= $exit->random_seed;
2285 2907
2286 my $data = cf::to_json $rmp; 2908 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2909 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2910 my $meta = "$RANDOMDIR/$md5.meta";
2289 2911
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2912 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2913 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2914 undef $fh;
2293 aio_rename "$meta~", $meta; 2915 aio_rename "$meta~", $meta;
2294 2916
2917 my $slaying = "?random/$md5";
2918
2919 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2920 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2921 $exit->msg (undef);
2922 }
2297 } 2923 }
2298} 2924}
2299 2925
2300sub cf::object::player::enter_exit { 2926sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2927 my ($self, $exit) = @_;
2302 2928
2303 return unless $self->type == cf::PLAYER; 2929 return unless $self->type == cf::PLAYER;
2304 2930
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2931 $self->enter_link;
2317 2932
2318 (async { 2933 (async {
2319 $self->deactivate_recursive; # just to be sure 2934 $Coro::current->{desc} = "enter_exit";
2935
2320 unless (eval { 2936 unless (eval {
2937 $self->deactivate_recursive; # just to be sure
2938
2939 # random map handling
2940 {
2941 my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943 prepare_random_map $exit
2944 if $exit->slaying eq "/!";
2945 }
2946
2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2948 my $x = $exit->stats->hp;
2949 my $y = $exit->stats->sp;
2950
2321 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2322 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
2323 1; 2957 1
2324 }) { 2958 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "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. "
2327 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2963
2330 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2331 $self->leave_link; 2965 $self->leave_link;
2332 } 2966 }
2333 })->prio (1); 2967 })->prio (1);
2334} 2968}
2335 2969
… …
2349 2983
2350 utf8::encode $text; 2984 utf8::encode $text;
2351 $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);
2352} 2986}
2353 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);
3011}
3012
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 3014
2356Send 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
2357client if neccessary. C<$type> should be a string identifying the type of 3016client if neccessary. C<$type> should be a string identifying the type of
2358the 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
2359the message unless the client supports the msg packet. 3018the message unless the client supports the msg packet.
2360 3019
2361=cut 3020=cut
2362 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
2363sub cf::client::send_msg { 3136sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 3137 my ($self, $channel, $msg, $color, @extra) = @_;
2365 3138
2366 $msg = $self->pl->expand_cfpod ($msg); 3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
2367 3141
2368 if ($self->can_msg) { 3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380 3143
2381 if ($color >= 0) { 3144 # check predefined channels, for the benefit of C
2382 if (0 && $msg =~ /\[/) { 3145 if ($CHANNEL{$channel}) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 3146 $channel = $CHANNEL{$channel};
2384 } else { 3147
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3148 $self->ext_msg (channel_info => $channel);
2386 $self->send_packet ("drawinfo $color $msg") 3149 $channel = $channel->{id};
3150
3151 } elsif (ref $channel) {
3152 # send meta info to client, if not yet sent
3153 unless (exists $self->{channel}{$channel->{id}}) {
3154 $self->{channel}{$channel->{id}} = $channel;
3155 $self->ext_msg (channel_info => $channel);
2387 } 3156 }
2388 }
2389 }
2390}
2391 3157
3158 $channel = $channel->{id};
3159 }
3160
3161 return unless @extra || length $msg;
3162
3163 # default colour, mask it out
3164 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3165 if $color & cf::NDI_DEF;
3166
3167 my $pkt = "msg "
3168 . $self->{json_coder}->encode (
3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3170 );
3171
3172 $self->send_big_packet ($pkt);
3173}
3174
2392=item $client->ext_event ($type, %msg) 3175=item $client->ext_msg ($type, @msg)
2393 3176
2394Sends an exti event to the client. 3177Sends an ext event to the client.
2395 3178
2396=cut 3179=cut
2397 3180
2398sub cf::client::ext_event($$%) { 3181sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 3182 my ($self, $type, @msg) = @_;
2400 3183
3184 if ($self->extcmd == 2) {
3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 3187 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%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 }
2403} 3208}
2404 3209
2405=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2406 3211
2407Queues a query to the client, calling the given callback with 3212Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3213the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3214C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 3215
2411Queries can fail, so check the return code. Or don't, as queries will become 3216Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 3217become reliable at some point in the future.
2413 3218
2414=cut 3219=cut
2415 3220
2416sub cf::client::query { 3221sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 3222 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 3230 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3231 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 3232
2428 $self->send_packet ($self->{query_queue}[0][0]) 3233 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 3234 if @{ $self->{query_queue} } == 1;
3235
3236 1
2430} 3237}
2431 3238
2432cf::client->attach ( 3239cf::client->attach (
3240 on_connect => sub {
3241 my ($ns) = @_;
3242
3243 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3244 },
2433 on_reply => sub { 3245 on_reply => sub {
2434 my ($ns, $msg) = @_; 3246 my ($ns, $msg) = @_;
2435 3247
2436 # this weird shuffling is so that direct followup queries 3248 # this weird shuffling is so that direct followup queries
2437 # get handled first 3249 # get handled first
… …
2449 } else { 3261 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3262 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 3263 }
2452 } 3264 }
2453 }, 3265 },
3266 on_exticmd => sub {
3267 my ($ns, $buf) = @_;
3268
3269 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270
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
3279 if (my $cb = $EXTICMD{$type}) {
3280 @reply = $cb->($ns, @payload);
3281 }
3282
3283 $ns->ext_reply ($reply, @reply)
3284 if $reply;
3285
3286 } else {
3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288 }
3289
3290 cf::override;
3291 },
2454); 3292);
2455 3293
2456=item $client->async (\&cb) 3294=item $client->async (\&cb)
2457 3295
2458Create a new coroutine, running the specified callback. The coroutine will 3296Create a new coroutine, running the specified callback. The coroutine will
… …
2474 3312
2475 $coro 3313 $coro
2476} 3314}
2477 3315
2478cf::client->attach ( 3316cf::client->attach (
2479 on_destroy => sub { 3317 on_client_destroy => sub {
2480 my ($ns) = @_; 3318 my ($ns) = @_;
2481 3319
2482 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2483 }, 3321 },
2484); 3322);
… …
2499our $safe = new Safe "safe"; 3337our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
2501 3339
2502$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
2503 3341
2504$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));
2505 3347
2506# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
2507 3349
2508=pod 3350=pod
2509 3351
2510The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
2511 3353
2512 cf::object contr pay_amount pay_player map 3354 cf::object
3355 contr pay_amount pay_player map x y force_find force_add destroy
3356 insert remove name archname title slaying race decrease split
3357 value
3358
2513 cf::object::player player 3359 cf::object::player
2514 cf::player peaceful 3360 player
2515 cf::map trigger 3361
3362 cf::player
3363 peaceful
3364
3365 cf::map
3366 trigger
2516 3367
2517=cut 3368=cut
2518 3369
2519for ( 3370for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3371 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3372 insert remove inv nrof name archname title slaying race
3373 decrease split destroy change_exp value msg lore send_msg)],
2521 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
2523 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
2524) { 3377) {
2525 no strict 'refs';
2526 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
2527 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2528 for @funs; 3380 for @funs;
2529} 3381}
2530 3382
… …
2545 3397
2546 my $qcode = $code; 3398 my $qcode = $code;
2547 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2548 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
2549 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
2550 local $_; 3405 local $_;
2551 local @safe::cf::_safe_eval_args = values %vars;
2552 3406
2553 my $eval = 3407 my $eval =
2554 "do {\n" 3408 "do {\n"
2555 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2556 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
2557 . $code 3411 . $code
2558 . "\n}" 3412 . "\n}"
2559 ; 3413 ;
2560 3414
3415 if ($CFG{safe_eval}) {
2561 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
2562 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2563 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 }
2564 3424
2565 if ($@) { 3425 if ($@) {
2566 warn "$@"; 3426 warn "$@",
2567 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
2568 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
2569 } 3429 }
2570 3430
2571 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
2572} 3432}
2573 3433
… …
2587=cut 3447=cut
2588 3448
2589sub register_script_function { 3449sub register_script_function {
2590 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
2591 3451
2592 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
2593 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
2594} 3454}
2595 3455
2596=back 3456=back
2597 3457
2598=cut 3458=cut
… …
2601# the server's init and main functions 3461# the server's init and main functions
2602 3462
2603sub load_facedata($) { 3463sub load_facedata($) {
2604 my ($path) = @_; 3464 my ($path) = @_;
2605 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
2606 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
2607 3473
2608 my $facedata; 3474 my $facedata = decode_storable load_file $path;
2609 0 < aio_load $path, $facedata
2610 or die "$path: $!";
2611
2612 $facedata = Coro::Storable::thaw $facedata;
2613 3475
2614 $facedata->{version} == 2 3476 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 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
2617 { 3488 {
2618 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
2619 3490
2620 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2625 Coro::cede; 3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3499
3500 cf::cede_to_tick;
2626 } 3501 }
2627 3502
2628 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3504 next unless $info->{smooth};
3505
2630 my $idx = cf::face::find $face 3506 my $idx = cf::face::find $face
2631 or next; 3507 or next;
3508
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3510 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3512 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3514 }
2637 Coro::cede; 3515
3516 cf::cede_to_tick;
2638 } 3517 }
2639 } 3518 }
2640 3519
2641 { 3520 {
2642 my $anims = $facedata->{animinfo}; 3521 my $anims = $facedata->{animinfo};
2643 3522
2644 while (my ($anim, $info) = each %$anims) { 3523 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3524 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3525 cf::cede_to_tick;
2647 } 3526 }
2648 3527
2649 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
2650 } 3529 }
2651 3530
3531 {
3532 my $res = $facedata->{resource};
3533
3534 while (my ($name, $info) = each %$res) {
3535 if (defined $info->{type}) {
3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3537
3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539 cf::face::set_type $idx, $info->{type};
3540 } else {
3541 $RESOURCE{$name} = $info; # unused
3542 }
3543
3544 cf::cede_to_tick;
3545 }
3546 }
3547
3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3549
2652 1 3550 1
2653} 3551}
2654 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
2655sub 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
2656 load_resource_file "$MAPDIR/regions" 3576 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3577 or die "unable to load regions file\n";
3578
3579 for (cf::region::list) {
3580 $_->{match} = qr/$_->{match}/
3581 if exists $_->{match};
3582 }
2658} 3583}
2659 3584
2660sub reload_facedata { 3585sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3586 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3587 or die "unable to load facedata\n";
… …
2670sub reload_treasures { 3595sub reload_treasures {
2671 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
2672 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
2673} 3598}
2674 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
2675sub reload_resources { 3620sub reload_resources {
2676 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
2677 3622
3623 reload_exp_table;
3624 reload_materials;
3625 reload_facedata;
3626 reload_sound;
3627 reload_archetypes;
2678 reload_regions; 3628 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3629 reload_treasures;
2683 3630
2684 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
2685} 3632}
2686 3633
2687sub init { 3634sub reload_config {
2688 reload_resources; 3635 trace "reloading config file...\n";
2689}
2690 3636
2691sub cfg_load { 3637 my $config = load_file "$CONFDIR/config";
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3638 utf8::decode $config;
2693 or return; 3639 *CFG = decode_yaml $config;
2694 3640
2695 local $/;
2696 *CFG = YAML::Syck::Load <$fh>;
2697
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2699 3642
2700 $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};
2701 $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};
2702 3645
2703 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
2707 }; 3650 };
2708 warn $@ if $@; 3651 warn $@ if $@;
2709 } 3652 }
2710} 3653}
2711 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
2712sub 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
2713 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
2715 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#
2716 (async { 3696 (async {
2717 Event::one_event; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
2719 }; 3700 };
2720 3701
2721 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;
2722 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
2723 load_extensions; 3725 load_extensions;
2724 3726
2725 $TICK_WATCHER->start; 3727 utime time, time, $RUNTIMEFILE;
2726 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;
2727} 3745}
2728 3746
2729############################################################################# 3747#############################################################################
2730# initialisation and cleanup 3748# initialisation and cleanup
2731 3749
2732# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
2733BEGIN { 3751BEGIN {
3752 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
2742 },
2743 ); 3756 };
2744 } 3757 }
2745} 3758}
2746 3759
2747sub write_runtime { 3760sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime"; 3761 my $t0 = AE::time;
2749 3762
2750 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
2752 3765
2753 IO::AIO::aio_utime $runtime, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2754 3767
2755 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
2756 3769
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2758 or return; 3771 or return;
2759 3772
2760 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
… …
2772 aio_utime $fh, undef, undef; 3785 aio_utime $fh, undef, undef;
2773 3786
2774 close $fh 3787 close $fh
2775 or return; 3788 or return;
2776 3789
2777 aio_rename "$runtime~", $runtime 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2778 and return; 3791 and return;
2779 3792
2780 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2781 3794
2782 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 };
2783} 3846}
2784 3847
2785sub emergency_save() { 3848sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
2787 3850
2788 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;
2789 3857
2790 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
2791 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
2792 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
2793 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
2795 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3867 $pl->valid or next;
3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3869 $pl->save;
2799 } 3870 }
2800 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
2801 3872
2802 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";
2803 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
2804 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
2805 $map->valid or next; 3878 $map->valid or next;
2806 $map->save; 3879 $map->save;
2807 } 3880 }
2808 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
2809 3882
2810 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";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
2812 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
2813 }; 3911 };
2814 3912
2815 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
2816} 3914}
2817 3915
2818sub post_cleanup { 3916sub post_cleanup {
2819 my ($make_core) = @_; 3917 my ($make_core) = @_;
2820 3918
3919 IO::AIO::flush;
3920
2821 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
2822 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 }
2823} 3951}
2824 3952
2825sub do_reload_perl() { 3953sub do_reload_perl() {
2826 # can/must only be called in main 3954 # can/must only be called in main
2827 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
2828 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
2829 return; 3957 return;
2830 } 3958 }
2831 3959
2832 warn "reloading..."; 3960 return if $RELOAD++;
2833 3961
2834 warn "entering sync_job"; 3962 my $t1 = AE::time;
2835 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
2836 cf::sync_job { 3970 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark
2838 cf::emergency_save; 3971 #cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark
2840 3972
2841 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV;
2843
2844 # if anything goes wrong in here, we should simply crash as we already saved
2845
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs;
2857 warn "iterate...";
2858 }
2859
2860 ++$RELOAD;
2861
2862 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
2863 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
2864 %EXT_CORO = (); 3975 %EXT_CORO = ();
2865 3976
2866 warn "removing commands"; 3977 trace "perl_reload: removing commands";
2867 %COMMAND = (); 3978 %COMMAND = ();
2868 3979
2869 warn "removing ext commands"; 3980 trace "perl_reload: removing ext/exti commands";
2870 %EXTCMD = (); 3981 %EXTCMD = ();
3982 %EXTICMD = ();
2871 3983
2872 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
2875 3987
2876 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
2877 eval { 3989 eval {
2878 $cb->($pkg); 3990 $cb->($pkg);
2879 1 3991 1
2880 } 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;
2881 } 3997 }
2882 3998
2883 warn "... nuking $pkg";
2884 Symbol::delete_package $pkg;
2885 }
2886
2887 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2888 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2890 4002
2891 warn "... unloading $k"; 4003 trace "... unloading $k";
2892 delete $INC{$k}; 4004 delete $INC{$k};
2893 4005
2894 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
2895 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
2896 4008
2897 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
2898 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
2899 } 4014 }
2900 4015
2901 Symbol::delete_package $k;
2902 }
2903
2904 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
2905 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
2906 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);
2907 4019
2908 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
2909 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2911 4023
2912 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
2913 # and global variables created in xs 4025 # and global variables created in xs
2914 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
2915 4027
2916 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
2917 4029
2918 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
2919 require cf; 4031 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
2921 4033
2922 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
2923 cf::cfg_load; 4035 cf::reload_config;
2924 4036
2925 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
2926 cf::load_extensions; 4038 cf::load_extensions;
2927 4039
4040 if ($REATTACH_ON_RELOAD) {
2928 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
2929 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
2930 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
2931 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
2932 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
2933 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
2934 4048
2935 warn "leaving sync_job"; 4049 cf::_post_init 1;
2936 4050
4051 trace "perl_reload: leaving sync_job";
4052
2937 1 4053 1
2938 } or do { 4054 } or do {
2939 warn $@; 4055 error $@;
2940 warn "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
2941 exit 1; 4057 };
4058
4059 --$RELOAD;
2942 }; 4060 }
2943 4061
2944 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
2945}; 4064};
2946 4065
2947our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
2948 4067
2949sub reload_perl() { 4068sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
2952 4071
2953 $RELOAD_WATCHER ||= Event->timer ( 4072 $RELOAD_WATCHER ||= cf::async {
2954 reentrant => 0, 4073 Coro::AIO::aio_wait cache_extensions;
2955 after => 0, 4074
2956 data => WF_AUTOCANCEL, 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2957 cb => sub {
2958 do_reload_perl; 4076 do_reload_perl;
2959 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
2960 }, 4078 };
2961 ); 4079 };
2962} 4080}
2963 4081
2964register_command "reload" => sub { 4082register_command "reload" => sub {
2965 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
2966 4084
2967 if ($who->flag (FLAG_WIZ)) { 4085 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 4086 $who->message ("reloading server.");
4087 async {
4088 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 4089 reload_perl;
4090 };
2970 } 4091 }
2971}; 4092};
2972 4093
2973unshift @INC, $LIBDIR; 4094#############################################################################
2974 4095
2975my $bug_warning = 0; 4096my $bug_warning = 0;
2976 4097
2977our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
2979 4100
2980sub wait_for_tick { 4101sub wait_for_tick() {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2983 4103
2984 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 4106 $signal->wait;
2987} 4107}
2988 4108
2989sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2992 4111
2993 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 4114 $signal->wait;
2996} 4115}
2997 4116
2998 my $min = 1e6;#d# 4117sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
3008 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"
3009 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
3010 return; 4121 return;
3011 } 4122 }
3012 4123
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3016 4125
3017 0 && sync_job {#d# 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3018 for(1..10) {
3019 my $t = Event::time;
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3021 or die;
3022 4127
3023 $map->width (50); 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3024 $map->height (50); 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3025 $map->alloc; 4130 Coro::async_pool {
3026 $map->_load_objects ("/tmp/x.map", 1); 4131 $Coro::current->{desc} = "runtime saver";
3027 my $t = Event::time - $t; 4132 write_runtime_sync
3028 4133 or error "ERROR: unable to write runtime file: $!";
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 4134 };
4135 }
3039 4136
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 4138 $sig->send;
3056 } 4139 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 4141 $sig->send;
3059 } 4142 }
3060 4143
3061 $NOW = Event::time; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 4146
3072 _post_tick; 4147 if (0) {
3073 4148 if ($NEXT_TICK) {
3074 4149 my $jitter = $TICK_START - $NEXT_TICK;
4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4151 debug "jitter $JITTER\n";#d#
4152 }
3075 }, 4153 }
3076); 4154}
3077 4155
3078{ 4156{
3079 BDB::max_poll_time $TICK * 0.1; 4157 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 4158
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3089 4160 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 4161 $AnyEvent::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 4162
3105 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3106 $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);
3107 4170
3108 cf::sync_job { 4171 cf::sync_job {
3109 eval { 4172 eval {
3110 BDB::db_env_open 4173 BDB::db_env_open
3111 $DB_ENV, 4174 $DB_ENV,
… …
3113 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
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4177 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 4178 0666;
3116 4179
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4180 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 4181 };
3122 4182
3123 cf::cleanup "db_env_open(db): $@" if $@; 4183 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 4184 };
3125 } 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 };
3126} 4196}
3127 4197
3128{ 4198{
4199 # configure IO::AIO
4200
3129 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 4203 undef $AnyEvent::AIO::WATCHER;
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 4204}
3142 4205
3143my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3144 4208
3145sub _log_backtrace { 4209sub _log_backtrace {
3146 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3147 4211
3148 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3149 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3150 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3152 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3153 async { 4222 async {
4223 $Coro::current->{desc} = "abt $msg";
4224
3154 my @bt = fork_call { 4225 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4227 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 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 |"
3158 or die "addr2line: $!"; 4229 or die "addr2line: $!";
… …
3166 } 4237 }
3167 4238
3168 @funcs 4239 @funcs
3169 }; 4240 };
3170 4241
3171 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace; 4245 --$_log_backtrace;
3174 }; 4246 };
3175 } else { 4247 } else {
3176 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3177 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3178 } 4250 }
3179} 4251}
3180 4252
3181# load additional modules 4253# load additional modules
3182use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3183 4256
3184END { cf::emergency_save } 4257END { cf::emergency_save }
3185 4258
31861 42591
3187 4260

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines