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.278 by root, Mon Jun 11 21:38:14 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($;$$);
324
325#############################################################################
211 326
212=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
213 328
214=over 4 329=over 4
215 330
… …
234 $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;
235 $d 350 $d
236 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
237} 352}
238 353
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working 354=item $scalar = load_file $path
240 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
241=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
242 369
243Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
244 371
245=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
246 373
247Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
248 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
249=item cf::lock_wait $string 445=item cf::lock_wait $string
250 446
251Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
252 448
253=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
254 450
255Wait 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
256a 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,
257for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
258returned. 454returned.
259 455
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
260Lock 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
261uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
262 461
263=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
264 463
265Return 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.
266 465
267=cut 466=cut
268 467
269our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
270 469
271sub lock_wait($) { 470sub lock_wait($) {
272 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
273
274 # wait for lock, if any
275 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule;
278 }
279} 472}
280 473
281sub lock_acquire($) { 474sub lock_acquire($) {
282 my ($key) = @_; 475 $LOCKS->guard ($_[0])
283
284 # wait, to be sure we are not locked
285 lock_wait $key;
286
287 $LOCK{$key} = [];
288
289 Coro::guard {
290 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} };
292 }
293} 476}
294 477
295sub lock_active($) { 478sub lock_active($) {
296 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 480}
300 481
301sub freeze_mainloop { 482sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
303 484
304 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
305 $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 }
306 }; 556 }
307 $TICK_WATCHER->stop; 557};
308 $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;
309} 572}
310 573
311=item cf::async { BLOCK } 574=item cf::async { BLOCK }
312 575
313Currently the same as Coro::async_pool, meaning you cannot use 576Currently the same as Coro::async_pool, meaning you cannot use
… …
318 581
319BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
320 583
321=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
322 585
323The design of crossfire+ requires that the main coro ($Coro::main) is 586The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 587is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
589acceptable.
326 590
327If 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
328the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 593server will be frozen during this time, so the block should either finish
330fast or be very important. 594fast or be very important.
… …
332=cut 596=cut
333 597
334sub sync_job(&) { 598sub sync_job(&) {
335 my ($job) = @_; 599 my ($job) = @_;
336 600
337 if ($Coro::current == $Coro::main) { 601 if (in_main) {
338 my $time = Event::time; 602 my $time = AE::time;
339 603
340 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
342 606
343 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 608
345 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
346 610
347 my $busy = 1; 611 my $busy = 1;
348 my @res; 612 my @res;
349 613
350 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 616 @res = eval { $job->() };
352 warn $@ if $@; 617 error $@ if $@;
353 undef $busy; 618 undef $busy;
354 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
355 620
356 while ($busy) { 621 while ($busy) {
357 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
358 } 626 }
627 }
359 628
360 $time = Event::time - $time; 629 my $time = AE::time - $time;
361 630
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
366 632
367 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
368 } else { 634 } else {
369 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
370 636
… …
390 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
391 657
392 $coro 658 $coro
393} 659}
394 660
395sub write_runtime { 661=item fork_call { }, @args
396 my $runtime = "$LOCALDIR/runtime";
397 662
398 # first touch the runtime file to show we are still running: 663Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 664process, returning the results. Everything must be serialisable with
665Coro::Storable. May, of course, block. Note that the executed sub may
666never block itself or use any form of event handling.
400 667
401 IO::AIO::aio_utime $runtime, undef, undef; 668=cut
402 669
403 my $guard = cf::lock_acquire "write_runtime"; 670sub post_fork {
671 reset_signals;
672}
404 673
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 674sub fork_call(&@) {
406 or return; 675 my ($cb, @args) = @_;
407 676
408 my $value = $cf::RUNTIME + 90 + 10; 677 # we seemingly have to make a local copy of the whole thing,
409 # 10 is the runtime save interval, for a monotonic clock 678 # otherwise perl prematurely frees the stuff :/
410 # 60 allows for the watchdog to kill the server. 679 # TODO: investigate and fix (likely this will be rather laborious)
411 680
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 681 my @res = Coro::Util::fork_eval {
413 and return; 682 cf::post_fork;
683 &$cb
684 } @args;
414 685
415 # always fsync - this file is important 686 wantarray ? @res : $res[-1]
416 aio_fsync $fh 687}
417 and return;
418 688
419 # touch it again to show we are up-to-date 689sub objinfo {
420 aio_utime $fh, undef, undef;
421
422 close $fh
423 or return;
424
425 aio_rename "$runtime~", $runtime
426 and return;
427
428 warn "runtime file written.\n";
429
430 1 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
725}
726
727=item $value = cf::db_get $family => $key
728
729Returns a single value from the environment database.
730
731=item cf::db_put $family => $key => $value
732
733Stores the given C<$value> in the family. It can currently store binary
734data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
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
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}
762
763our $DB;
764
765sub db_init {
766 $DB ||= db_table "db";
767}
768
769sub db_get($$) {
770 my $key = "$_[0]/$_[1]";
771
772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
775 BDB::db_get $DB, undef, $key, my $data;
776
777 $! ? ()
778 : $data
779}
780
781sub db_put($$$) {
782 BDB::dbreq_pri 4;
783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
784}
785
786=item cf::cache $id => [$paths...], $processversion => $process
787
788Generic caching function that returns the value of the resource $id,
789caching and regenerating as required.
790
791This function can block.
792
793=cut
794
795sub cache {
796 my ($id, $src, $processversion, $process) = @_;
797
798 my $meta =
799 join "\x00",
800 $processversion,
801 map {
802 aio_stat $_
803 and Carp::croak "$_: $!";
804
805 ($_, (stat _)[7,9])
806 } @$src;
807
808 my $dbmeta = db_get cache => "$id/meta";
809 if ($dbmeta ne $meta) {
810 # changed, we may need to process
811
812 my @data;
813 my $md5;
814
815 for (0 .. $#$src) {
816 $data[$_] = load_file $src->[$_];
817 }
818
819 # if processing is expensive, check
820 # checksum first
821 if (1) {
822 $md5 =
823 join "\x00",
824 $processversion,
825 map {
826 cf::cede_to_tick;
827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
828 } 0.. $#$src;
829
830
831 my $dbmd5 = db_get cache => "$id/md5";
832 if ($dbmd5 eq $md5) {
833 db_put cache => "$id/meta", $meta;
834
835 return db_get cache => "$id/data";
836 }
837 }
838
839 my $t1 = Time::HiRes::time;
840 my $data = $process->(\@data);
841 my $t2 = Time::HiRes::time;
842
843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844
845 db_put cache => "$id/data", $data;
846 db_put cache => "$id/md5" , $md5;
847 db_put cache => "$id/meta", $meta;
848
849 return $data;
850 }
851
852 db_get cache => "$id/data"
431} 853}
432 854
433=item cf::datalog type => key => value, ... 855=item cf::datalog type => key => value, ...
434 856
435Log a datalog packet of the given type with the given key-value pairs. 857Log a datalog packet of the given type with the given key-value pairs.
436 858
437=cut 859=cut
438 860
439sub datalog($@) { 861sub datalog($@) {
440 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
442} 864}
443 865
444=back 866=back
445 867
446=cut 868=cut
447 869
448############################################################################# 870#############################################################################
449 871
450=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
451 873
452Many 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
453attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
455 877
456In 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>
457C<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
458crossfire+). 880Deliantra).
459 881
460=over 4 882=over 4
461 883
462=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
463 885
… …
507=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
508 930
509Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
511 933
512Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
513that 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.
514 936
515These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
516 938
517=over 4 939=over 4
… …
641 1063
642 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
643 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
644 1066
645 } elsif (ref $type) { 1067 } elsif (ref $type) {
646 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
647 1069
648 } else { 1070 } else {
649 shift @arg; 1071 shift @arg;
650 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
651 } 1073 }
652 } 1074 }
653} 1075}
654 1076
655sub _object_attach { 1077sub _object_attach {
… …
665 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
666 } 1088 }
667 1089
668 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
669 } else { 1091 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
671 } 1093 }
672 1094
673 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
674} 1096}
675 1097
… …
715 "; 1137 ";
716 die if $@; 1138 die if $@;
717} 1139}
718 1140
719our $override; 1141our $override;
720our @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?
721 1143
722sub override { 1144sub override {
723 $override = 1; 1145 $override = 1;
724 @invoke_results = (); 1146 @INVOKE_RESULTS = (@_);
725} 1147}
726 1148
727sub do_invoke { 1149sub do_invoke {
728 my $event = shift; 1150 my $event = shift;
729 my $callbacks = shift; 1151 my $callbacks = shift;
730 1152
731 @invoke_results = (); 1153 @INVOKE_RESULTS = ();
732 1154
733 local $override; 1155 local $override;
734 1156
735 for (@$callbacks) { 1157 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
737 1159
738 if ($@) { 1160 if ($@) {
739 warn "$@";
740 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
741 override; 1162 override;
742 } 1163 }
743 1164
744 return 1 if $override; 1165 return 1 if $override;
745 } 1166 }
746 1167
747 0 1168 0
748} 1169}
749 1170
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1172
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1174
754Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
755 1176
756This 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
757removed 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
758results (if you must, access C<@cf::invoke_results> directly). 1179results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1180
760=back 1181=back
761 1182
762=cut 1183=cut
763 1184
764############################################################################# 1185#############################################################################
765# 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}
766 1229
767sub reattach { 1230sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1232 my ($obj) = @_;
770 1233
1234 # no longer needed after getting rid of delete_package?
771 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
772 1236
773 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
774 1238
775 @$registry = (); 1239 @$registry = ();
776 1240
… …
781 for (@$attach) { 1245 for (@$attach) {
782 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
783 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
784 } 1248 }
785 } else { 1249 } else {
786 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
787 } 1251 }
788 } 1252 }
789} 1253}
790 1254
791cf::attachable->attach ( 1255cf::attachable->attach (
792 prio => -1000000, 1256 prio => -1000000,
793 on_instantiate => sub { 1257 on_instantiate => sub {
794 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
795 1259
796 $data = from_json $data; 1260 $data = decode_json $data;
797 1261
798 for (@$data) { 1262 for (@$data) {
799 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
800 1264
801 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
… …
817sub object_freezer_save { 1281sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
819 1283
820 sync_job { 1284 sync_job {
821 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
824 1290
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 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 }
829 close $fh; 1298 aio_close $fh;
830 1299
831 if (@$objs) { 1300 if (@$objs) {
832 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) {
833 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
836 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 }
837 close $fh; 1309 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
839 } 1311 }
840 } else { 1312 } else {
841 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
842 } 1314 }
843 1315
844 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1320 } else {
846 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
847 } 1322 }
848 } else { 1323 } else {
849 aio_unlink $filename; 1324 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
851 } 1326 }
852 } 1327 };
853} 1328}
854 1329
855sub object_freezer_as_string { 1330sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
857 1332
… …
869 or return; 1344 or return;
870 1345
871 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
873 or return; 1348 or return;
1349
874 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
875 } 1352 }
876 1353
1354 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
879 return ($data, $av); 1359 ($data, $av)
880} 1360}
1361
1362=head2 COMMAND CALLBACKS
1363
1364=over 4
1365
1366=cut
881 1367
882############################################################################# 1368#############################################################################
883# command handling &c 1369# command handling &c
884 1370
885=item cf::register_command $name => \&callback($ob,$args); 1371=item cf::register_command $name => \&callback($ob,$args);
… …
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1384 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1385}
900 1386
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1387=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1388
903Register a callbackf ro 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.
904 1394
905If 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
906called. 1396called.
907 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
908=cut 1409=cut
909 1410
910sub register_extcmd { 1411sub register_extcmd {
911 my ($name, $cb) = @_; 1412 my ($name, $cb) = @_;
912 1413
913 $EXTCMD{$name} = $cb; 1414 $EXTCMD{$name} = $cb;
914} 1415}
915 1416
1417sub register_exticmd {
1418 my ($name, $cb) = @_;
1419
1420 $EXTICMD{$name} = $cb;
1421}
1422
1423use File::Glob ();
1424
916cf::player->attach ( 1425cf::player->attach (
917 on_command => sub { 1426 on_unknown_command => sub {
918 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
919 1428
920 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
921 or return; 1430 or return;
922 1431
… …
927 cf::override; 1436 cf::override;
928 }, 1437 },
929 on_extcmd => sub { 1438 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1439 my ($pl, $buf) = @_;
931 1440
932 my $msg = eval { from_json $buf }; 1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1442
934 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
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1451 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1452 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
940 } else { 1458 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1460 }
943 1461
944 cf::override; 1462 cf::override;
945 }, 1463 },
946); 1464);
947 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
948sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
949 cf::sync_job { 1482 cf::sync_job {
950 my %todo; 1483 my %todo;
951 1484
952 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
953 next unless -r $path; 1486 next unless -r $path;
… …
967 path => $path, 1500 path => $path,
968 base => $base, 1501 base => $base,
969 pkg => $pkg, 1502 pkg => $pkg,
970 ); 1503 );
971 1504
972 $ext{meta} = { map { split /=/, $_, 2 } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
973 if $source =~ /^#!.*?perl.*?#\s*(.*)$/; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
974 1507
975 $ext{source} = 1508 $ext{source} =
976 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
977 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
978 . $source 1511 . $source
979 . "\n};\n1"; 1512 . "\n};\n1";
980 1513
981 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
982 } 1515 }
983 1516
1517 my $pass = 0;
984 my %done; 1518 my %done;
985 while (%todo) { 1519 while (%todo) {
986 my $progress; 1520 my $progress;
987 1521
1522 ++$pass;
1523
1524 ext:
988 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
989 for (split /,\s*/, $ext{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
990 goto skip 1527 next ext
991 unless exists $done{$_}; 1528 unless exists $done{$_};
992 } 1529 }
993 1530
994 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
995 1532
996 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
997 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
998 : "extension disabled.\n";
999 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1000 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1001 warn $msg; 1540
1002 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1003 exit 1; 1542 delete $todo{$k};
1004 } 1543 } else {
1005 1544 $done{$k} = delete $todo{$k};
1006 die $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1007 } 1550 }
1008
1009 $done{$k} = delete $todo{$k};
1010 push @EXTS, $v->{pkg};
1011 } 1551 }
1012 1552
1013 skip: 1553 unless ($progress) {
1014 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1015 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 }
1016 } 1563 }
1017 }; 1564 };
1018} 1565}
1019 1566
1020############################################################################# 1567#############################################################################
1021 1568
1569=back
1570
1022=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1023 1572
1024Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1025 1574
1026=cut 1575=cut
1027 1576
1028package cf::player; 1577package cf::player;
1029 1578
1030use Coro::AIO; 1579use Coro::AIO;
1031 1580
1032=head3 cf::player 1581=head3 cf::player
1033 1582
1034=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}
1035 1598
1036=item cf::player::find $login 1599=item cf::player::find $login
1037 1600
1038Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1039 1602
… …
1058 1621
1059sub exists($) { 1622sub exists($) {
1060 my ($login) = @_; 1623 my ($login) = @_;
1061 1624
1062 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1063 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1064} 1627}
1065 1628
1066sub find($) { 1629sub find($) {
1067 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1068 my $login = $_[0]; 1631 my $login = $_[0];
… …
1075 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1076 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1077 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1078 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1079 1642
1080 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1081 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;
1082 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1083 } 1652 }
1084 } 1653 }
1085} 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);
1086 1668
1087sub save($) { 1669sub save($) {
1088 my ($pl) = @_; 1670 my ($pl) = @_;
1089 1671
1090 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
… …
1095 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1096 1678
1097 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1098 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1099 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
1100 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1101 Coro::cede; 1688 cf::cede_to_tick;
1102} 1689}
1103 1690
1104sub new($) { 1691sub new($) {
1105 my ($login) = @_; 1692 my ($login) = @_;
1106 1693
… …
1112 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1113 1700
1114 $self 1701 $self
1115} 1702}
1116 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
1117=item $pl->quit_character 1714=item $pl->quit_character
1118 1715
1119Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1120be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1121 1718
… …
1125 my ($pl) = @_; 1722 my ($pl) = @_;
1126 1723
1127 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1128 1725
1129 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1130 $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
1131 1728
1132 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1133 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1134 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1135 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1136 1737
1137 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1138 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1139 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1174 or return []; 1775 or return [];
1175 1776
1176 my @logins; 1777 my @logins;
1177 1778
1178 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") {
1179 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1180 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1181 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1182 1789
1183 utf8::decode $login; 1790 utf8::decode $login;
1184 push @logins, $login; 1791 push @logins, $login;
1185 } 1792 }
1186 1793
1187 \@logins 1794 \@logins
1188} 1795}
1189 1796
1190=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1191 1800
1192Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1193player. May block. 1802player. May block.
1194 1803
1195=cut 1804=cut
… …
1213 } 1822 }
1214 1823
1215 \@paths 1824 \@paths
1216} 1825}
1217 1826
1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828
1829Expand deliantra pod fragments into protocol xml.
1830
1218=item $player->ext_reply ($msgid, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1219 1832
1220Sends an ext reply to the player. 1833Sends an ext reply to the player.
1221 1834
1222=cut 1835=cut
1223 1836
1224sub ext_reply($$%) { 1837sub ext_reply($$@) {
1225 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1226 1839
1227 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1228
1229 $self->send ("ext " . cf::to_json \%msg);
1230} 1841}
1231 1842
1232=item $player->ext_event ($type, %msg) 1843=item $player->ext_msg ($type, @msg)
1233 1844
1234Sends an ext event to the client. 1845Sends an ext event to the client.
1235 1846
1236=cut 1847=cut
1237 1848
1238sub ext_event($$%) { 1849sub ext_msg($$@) {
1239 my ($self, $type, %msg) = @_; 1850 my ($self, $type, @msg) = @_;
1240 1851
1241 $self->ns->ext_event ($type, %msg); 1852 $self->ns->ext_msg ($type, @msg);
1242} 1853}
1243 1854
1244=head3 cf::region 1855=head3 cf::region
1245 1856
1246=over 4 1857=over 4
… …
1249 1860
1250package cf::region; 1861package cf::region;
1251 1862
1252=item cf::region::find_by_path $path 1863=item cf::region::find_by_path $path
1253 1864
1254Tries to decuce the probable region for a map knowing only its path. 1865Tries to decuce the likely region for a map knowing only its path.
1255 1866
1256=cut 1867=cut
1257 1868
1258sub find_by_path($) { 1869sub find_by_path($) {
1259 my ($path) = @_; 1870 my ($path) = @_;
1260 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1261 my ($match, $specificity); 1874 my ($match, $specificity);
1262 1875
1263 for my $region (list) { 1876 for my $region (list) {
1264 if ($region->match && $path =~ $region->match) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1265 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1266 if $region->specificity > $specificity; 1879 if $region->specificity > $specificity;
1267 } 1880 }
1268 } 1881 }
1269 1882
… …
1290our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1291our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1292 1905
1293sub generate_random_map { 1906sub generate_random_map {
1294 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1295 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1296 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1297 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1298 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1299 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1300 $rmp->{exit_on_final_map},
1301 $rmp->{xsize}, $rmp->{ysize},
1302 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1303 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1304 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1305 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1306 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1307 (cf::region::find $rmp->{region}), $rmp->{custom}
1308 )
1309} 1912}
1310 1913
1311=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1312 1915
1313Register 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
… …
1318 1921
1319sub register { 1922sub register {
1320 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1321 my $pkg = caller; 1924 my $pkg = caller;
1322 1925
1323 no strict;
1324 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1325 1927
1326 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1327} 1929}
1328 1930
1329# also paths starting with '/' 1931# also paths starting with '/'
1330$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1331 1933
1332sub thawer_merge { 1934sub thawer_merge {
1333 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1334 1936
1335 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1340} 1942}
1341 1943
1342sub normalise { 1944sub normalise {
1343 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1344 1946
1345 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1346 1948
1347 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1348 1950
1349 # map plan: 1951 # map plan:
1350 # 1952 #
… …
1352 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1353 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1354 # ?random/... random maps 1956 # ?random/... random maps
1355 # /... normal maps 1957 # /... normal maps
1356 # ~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
1357 1960
1358 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1359 1962
1360 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1361 # something that looks reasonable 1964 # something that looks reasonable
1362 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1363 $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'";
1364 1967
1365 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1366 $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;
1367 } 1984 }
1368 1985
1369 for ($path) { 1986 for ($path) {
1370 redo if s{//}{/};
1371 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1372 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1373 } 1989 }
1374 1990
1375 $path 1991 $path
… …
1389 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1390 return $self; 2006 return $self;
1391 } 2007 }
1392 } 2008 }
1393 2009
1394 Carp::carp "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1395 () 2011 ()
1396} 2012}
1397 2013
2014# may re-bless or do other evil things
1398sub init { 2015sub init {
1399 my ($self) = @_; 2016 my ($self) = @_;
1400 2017
1401 $self 2018 $self
1402} 2019}
… …
1421 2038
1422# the temporary/swap location 2039# the temporary/swap location
1423sub save_path { 2040sub save_path {
1424 my ($self) = @_; 2041 my ($self) = @_;
1425 2042
1426 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2043 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1427 "$TMPDIR/$path.map" 2044 "$TMPDIR/$path.map"
1428} 2045}
1429 2046
1430# the unique path, undef == no special unique path 2047# the unique path, undef == no special unique path
1431sub uniq_path { 2048sub uniq_path {
1432 my ($self) = @_; 2049 my ($self) = @_;
1433 2050
1434 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2051 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1435 "$UNIQUEDIR/$path" 2052 "$UNIQUEDIR/$path"
1436}
1437
1438# and all this just because we cannot iterate over
1439# all maps in C++...
1440sub change_all_map_light {
1441 my ($change) = @_;
1442
1443 $_->change_map_light ($change)
1444 for grep $_->outdoor, values %cf::MAP;
1445} 2053}
1446 2054
1447sub decay_objects { 2055sub decay_objects {
1448 my ($self) = @_; 2056 my ($self) = @_;
1449 2057
… …
1462 2070
1463sub load_header_from($) { 2071sub load_header_from($) {
1464 my ($self, $path) = @_; 2072 my ($self, $path) = @_;
1465 2073
1466 utf8::encode $path; 2074 utf8::encode $path;
1467 #aio_open $path, O_RDONLY, 0 2075 my $f = new_from_file cf::object::thawer $path
1468 # or return;
1469
1470 $self->_load_header ($path)
1471 or return; 2076 or return;
1472 2077
2078 $self->_load_header ($f)
2079 or return;
2080
2081 local $MAP_LOADING{$self->{path}} = $self;
2082 $f->resolve_delayed_derefs;
2083
1473 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1474 2085
1475 1 2086 1
1476} 2087}
1477 2088
2089# used to laod the header of an original map
1478sub load_header_orig { 2090sub load_header_orig {
1479 my ($self) = @_; 2091 my ($self) = @_;
1480 2092
1481 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1482} 2094}
1483 2095
2096# used to laod the header of an instantiated map
1484sub load_header_temp { 2097sub load_header_temp {
1485 my ($self) = @_; 2098 my ($self) = @_;
1486 2099
1487 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1488} 2101}
1489 2102
2103# called after loading the header from an instantiated map
1490sub prepare_temp { 2104sub prepare_temp {
1491 my ($self) = @_; 2105 my ($self) = @_;
1492 2106
1493 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1494 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1495 # safety 2109 # safety
1496 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1497 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1498} 2112}
1499 2113
2114# called after loading the header from an original map
1500sub prepare_orig { 2115sub prepare_orig {
1501 my ($self) = @_; 2116 my ($self) = @_;
1502 2117
1503 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1504 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
… …
1528 2143
1529sub find; 2144sub find;
1530sub find { 2145sub find {
1531 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1532 2147
2148 cf::cede_to_tick;
2149
1533 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1534 2151
2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1535 cf::lock_wait "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1536 2154
1537 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
1538 my $guard = cf::lock_acquire "map_find:$path";
1539 my $map = new_from_path cf::map $path 2156 my $map = new_from_path cf::map $path
1540 or return; 2157 or return;
1541 2158
1542 $map->{last_save} = $cf::RUNTIME; 2159 $map->{last_save} = $cf::RUNTIME;
1543 2160
… …
1545 or return; 2162 or return;
1546 2163
1547 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2164 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1548 # doing this can freeze the server in a sync job, obviously 2165 # doing this can freeze the server in a sync job, obviously
1549 #$cf::WAIT_FOR_TICK->wait; 2166 #$cf::WAIT_FOR_TICK->wait;
2167 undef $guard2;
2168 undef $guard1;
1550 $map->reset; 2169 $map->reset;
1551 undef $guard;
1552 return find $path; 2170 return find $path;
1553 } 2171 }
1554 2172
1555 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
1556 } 2174 }
1557} 2175}
1558 2176
1559sub pre_load { } 2177sub pre_load { }
1560sub post_load { } 2178#sub post_load { } # XS
1561 2179
1562sub load { 2180sub load {
1563 my ($self) = @_; 2181 my ($self) = @_;
1564 2182
1565 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
1566 2184
1567 my $path = $self->{path}; 2185 my $path = $self->{path};
1568 2186
1569 { 2187 {
1570 my $guard = cf::lock_acquire "map_load:$path"; 2188 my $guard = cf::lock_acquire "map_data:$path";
1571 2189
2190 return unless $self->valid;
1572 return if $self->in_memory != cf::MAP_SWAPPED; 2191 return unless $self->in_memory == cf::MAP_SWAPPED;
1573 2192
1574 $self->in_memory (cf::MAP_LOADING); 2193 $self->in_memory (cf::MAP_LOADING);
1575 2194
1576 $self->alloc; 2195 $self->alloc;
1577 2196
1578 $self->pre_load; 2197 $self->pre_load;
1579 Coro::cede; 2198 cf::cede_to_tick;
1580 2199
1581 $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)
1582 or return; 2204 or return;
1583 2205
1584 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2206 $self->post_load_original
1585 if delete $self->{load_original}; 2207 if delete $self->{load_original};
1586 2208
1587 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
1588 utf8::encode $uniq; 2210 utf8::encode $uniq;
1589 if (aio_open $uniq, O_RDONLY, 0) { 2211 unless (aio_stat $uniq) {
2212 if (my $f = new_from_file cf::object::thawer $uniq) {
1590 $self->clear_unique_items; 2213 $self->clear_unique_items;
1591 $self->_load_objects ($uniq, 0); 2214 $self->_load_objects ($f);
2215 $f->resolve_delayed_derefs;
2216 }
2217 }
1592 } 2218 }
1593 }
1594 2219
1595 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;
1596 # now do the right thing for maps 2227 # now do the right thing for maps
1597 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
1598 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
1599 unless $self->difficulty; 2230 unless $self->difficulty;
1600 Coro::cede; 2231 cf::cede_to_tick;
1601 2232
1602 unless ($self->{deny_activate}) { 2233 unless ($self->{deny_activate}) {
1603 $self->decay_objects; 2234 $self->decay_objects;
1604 $self->fix_auto_apply; 2235 $self->fix_auto_apply;
1605 $self->update_buttons; 2236 $self->update_buttons;
1606 Coro::cede; 2237 cf::cede_to_tick;
1607 $self->set_darkness_map;
1608 Coro::cede;
1609 $self->activate; 2238 $self->activate;
1610 } 2239 }
1611 2240
2241 $self->{last_save} = $cf::RUNTIME;
2242 $self->last_access ($cf::RUNTIME);
2243
1612 $self->in_memory (cf::MAP_IN_MEMORY); 2244 $self->in_memory (cf::MAP_ACTIVE);
1613 } 2245 }
1614 2246
1615 $self->post_load; 2247 $self->post_load;
1616}
1617 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
1618sub customise_for { 2255sub customise_for {
1619 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
1620 2257
1621 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
1622 if $self->per_player; 2259 if $self->per_player;
… …
1626 2263
1627 $self 2264 $self
1628} 2265}
1629 2266
1630# 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
1631sub load_diag { 2268sub load_neighbours {
1632 my ($map) = @_; 2269 my ($map) = @_;
1633 2270
1634 my @diag; # diagonal neighbours 2271 my @neigh; # diagonal neighbours
1635 2272
1636 for (0 .. 3) { 2273 for (0 .. 3) {
1637 my $neigh = $map->tile_path ($_) 2274 my $neigh = $map->tile_path ($_)
1638 or next; 2275 or next;
1639 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
1640 or next; 2277 or next;
1641 $neigh->load; 2278 $neigh->load;
1642 2279
2280 # now find the diagonal neighbours
2281 push @neigh,
1643 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1644 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1645 } 2284 }
1646 2285
1647 for (@diag) { 2286 for (grep defined $_->[0], @neigh) {
2287 my ($path, $origin) = @$_;
1648 my $neigh = find @$_ 2288 my $neigh = find $path, $origin
1649 or next; 2289 or next;
1650 $neigh->load; 2290 $neigh->load;
1651 } 2291 }
1652} 2292}
1653 2293
1654sub find_sync { 2294sub find_sync {
1655 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
1656 2296
1657 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
1658} 2301}
1659 2302
1660sub do_load_sync { 2303sub do_load_sync {
1661 my ($map) = @_; 2304 my ($map) = @_;
1662 2305
1663 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;
1664} 2310}
1665 2311
1666our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
1667our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
1668 2314
1669sub find_async { 2315sub find_async {
1670 my ($path, $origin) = @_; 2316 my ($path, $origin, $load) = @_;
1671 2317
1672 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
1673 2319
1674 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
1675 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1676 } 2322 }
1677 2323
1678 undef $MAP_PREFETCH{$path}; 2324 $MAP_PREFETCH{$path} |= $load;
2325
1679 $MAP_PREFETCHER ||= cf::async { 2326 $MAP_PREFETCHER ||= cf::async {
2327 $Coro::current->{desc} = "map prefetcher";
2328
1680 while (%MAP_PREFETCH) { 2329 while (%MAP_PREFETCH) {
1681 for my $path (keys %MAP_PREFETCH) { 2330 while (my ($k, $v) = each %MAP_PREFETCH) {
1682 my $map = find $path 2331 if (my $map = find $k) {
1683 or next;
1684 $map->load; 2332 $map->load if $v;
2333 }
1685 2334
1686 delete $MAP_PREFETCH{$path}; 2335 delete $MAP_PREFETCH{$k};
1687 } 2336 }
1688 } 2337 }
1689 undef $MAP_PREFETCHER; 2338 undef $MAP_PREFETCHER;
1690 }; 2339 };
1691 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
1692 2341
1693 () 2342 ()
1694} 2343}
1695 2344
2345# common code, used by both ->save and ->swapout
1696sub save { 2346sub _save {
1697 my ($self) = @_; 2347 my ($self) = @_;
1698
1699 my $lock = cf::lock_acquire "map_data:" . $self->path;
1700 2348
1701 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
1702 2350
1703 return unless $self->dirty; 2351 return unless $self->dirty;
1704 2352
… …
1710 return if $self->{deny_save}; 2358 return if $self->{deny_save};
1711 2359
1712 local $self->{last_access} = $self->last_access;#d# 2360 local $self->{last_access} = $self->last_access;#d#
1713 2361
1714 cf::async { 2362 cf::async {
2363 $Coro::current->{desc} = "map player save";
1715 $_->contr->save for $self->players; 2364 $_->contr->save for $self->players;
1716 }; 2365 };
2366
2367 cf::get_slot 0.02;
1717 2368
1718 if ($uniq) { 2369 if ($uniq) {
1719 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2370 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1720 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2371 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1721 } else { 2372 } else {
1722 $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);
1723 } 2374 }
1724} 2375}
1725 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
1726sub swap_out { 2385sub swap_out {
1727 my ($self) = @_; 2386 my ($self) = @_;
1728 2387
1729 # save first because save cedes
1730 $self->save;
1731
1732 my $lock = cf::lock_acquire "map_data:" . $self->path; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
1733 2389
2390 return if $self->in_memory != cf::MAP_ACTIVE;
2391 return if $self->{deny_save};
1734 return if $self->players; 2392 return if $self->players;
1735 return if $self->in_memory != cf::MAP_IN_MEMORY;
1736 return if $self->{deny_save};
1737 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
1738 $self->clear; 2403 $self->clear;
1739 $self->in_memory (cf::MAP_SWAPPED);
1740} 2404}
1741 2405
1742sub reset_at { 2406sub reset_at {
1743 my ($self) = @_; 2407 my ($self) = @_;
1744 2408
… …
1762 2426
1763 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2427 my $lock = cf::lock_acquire "map_data:$self->{path}";
1764 2428
1765 return if $self->players; 2429 return if $self->players;
1766 2430
1767 warn "resetting map ", $self->path; 2431 cf::trace "resetting map ", $self->path, "\n";
1768 2432
1769 $self->in_memory (cf::MAP_SWAPPED); 2433 $self->in_memory (cf::MAP_SWAPPED);
1770 2434
1771 # need to save uniques path 2435 # need to save uniques path
1772 unless ($self->{deny_save}) { 2436 unless ($self->{deny_save}) {
… …
1776 if $uniq; 2440 if $uniq;
1777 } 2441 }
1778 2442
1779 delete $cf::MAP{$self->path}; 2443 delete $cf::MAP{$self->path};
1780 2444
2445 $self->deactivate;
2446 $_->clear_links_to ($self) for values %cf::MAP;
1781 $self->clear; 2447 $self->clear;
1782
1783 $_->clear_links_to ($self) for values %cf::MAP;
1784 2448
1785 $self->unlink_save; 2449 $self->unlink_save;
1786 $self->destroy; 2450 $self->destroy;
1787} 2451}
1788 2452
1789my $nuke_counter = "aaaa"; 2453my $nuke_counter = "aaaa";
1790 2454
1791sub nuke { 2455sub nuke {
1792 my ($self) = @_; 2456 my ($self) = @_;
1793 2457
2458 {
2459 my $lock = cf::lock_acquire "map_data:$self->{path}";
2460
1794 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
1795 2462
1796 $self->unlink_save; 2463 $self->unlink_save;
1797 2464
1798 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
1799 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
1800 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
1801 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
1802 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1803 2470
1804 $cf::MAP{$self->path} = $self; 2471 $cf::MAP{$self->path} = $self;
2472 }
1805 2473
1806 $self->reset; # polite request, might not happen 2474 $self->reset; # polite request, might not happen
1807} 2475}
1808 2476
1809=item $maps = cf::map::tmp_maps 2477=item $maps = cf::map::tmp_maps
… …
1851 2519
1852sub unique_maps() { 2520sub unique_maps() {
1853 [ 2521 [
1854 map { 2522 map {
1855 utf8::decode $_; 2523 utf8::decode $_;
1856 /\.map$/ 2524 s/\.map$//; # TODO future compatibility hack
2525 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2526 ? ()
1857 ? normalise $_ 2527 : normalise $_
1858 : ()
1859 } @{ aio_readdir $UNIQUEDIR or [] } 2528 } @{ aio_readdir $UNIQUEDIR or [] }
1860 ] 2529 ]
1861} 2530}
1862 2531
1863package 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}
1864 2563
1865=back 2564=back
1866 2565
1867=head3 cf::object 2566=head3 cf::object
1868 2567
… …
1872 2571
1873=over 4 2572=over 4
1874 2573
1875=item $ob->inv_recursive 2574=item $ob->inv_recursive
1876 2575
1877Returns 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.
1878 2578
1879=cut 2579=cut
1880 2580
1881sub inv_recursive_; 2581sub inv_recursive_;
1882sub inv_recursive_ { 2582sub inv_recursive_ {
… …
1885 2585
1886sub inv_recursive { 2586sub inv_recursive {
1887 inv_recursive_ inv $_[0] 2587 inv_recursive_ inv $_[0]
1888} 2588}
1889 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
1890package cf; 2618package cf;
1891 2619
1892=back 2620=back
1893 2621
1894=head3 cf::object::player 2622=head3 cf::object::player
… …
1900Sends 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>
1901can 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
1902dialogue with the given NPC character. 2630dialogue with the given NPC character.
1903 2631
1904=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};
1905 2647
1906# rough implementation of a future "reply" method that works 2648# rough implementation of a future "reply" method that works
1907# with dialog boxes. 2649# with dialog boxes.
1908#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
1909sub cf::object::player::reply($$$;$) { 2651sub cf::object::player::reply($$$;$) {
… …
1911 2653
1912 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2654 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1913 2655
1914 if ($self->{record_replies}) { 2656 if ($self->{record_replies}) {
1915 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2657 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2658
1916 } else { 2659 } else {
2660 my $pl = $self->contr;
2661
2662 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2663 my $dialog = $pl->{npc_dialog};
2664 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2665
2666 } else {
1917 $msg = $npc->name . " says: $msg" if $npc; 2667 $msg = $npc->name . " says: $msg" if $npc;
1918 $self->message ($msg, $flags); 2668 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2669 }
1919 } 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 (@_);
1920} 2681}
1921 2682
1922=item $player_object->may ("access") 2683=item $player_object->may ("access")
1923 2684
1924Returns wether the given player is authorized to access resource "access" 2685Returns wether the given player is authorized to access resource "access"
… …
1937 2698
1938=item $player_object->enter_link 2699=item $player_object->enter_link
1939 2700
1940Freezes 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}>).
1941 2702
1942The 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.
1943I<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.
1944 2707
1945Will never block. 2708Will never block.
1946 2709
1947=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
1948 2711
… …
1968sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
1969 my ($self) = @_; 2732 my ($self) = @_;
1970 2733
1971 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
1972 2735
2736 ++$self->{_link_recursion};
2737
1973 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
1974 2739
1975 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1976 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
1977 2742
1978 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1979} 2744}
1980 2745
1981sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
1982 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
1983 2748
… …
2000 ($x, $y) = (-1, -1) 2765 ($x, $y) = (-1, -1)
2001 unless (defined $x) && (defined $y); 2766 unless (defined $x) && (defined $y);
2002 2767
2003 # use -1 or undef as default coordinates, not 0, 0 2768 # use -1 or undef as default coordinates, not 0, 0
2004 ($x, $y) = ($map->enter_x, $map->enter_y) 2769 ($x, $y) = ($map->enter_x, $map->enter_y)
2005 if $x <=0 && $y <= 0; 2770 if $x <= 0 && $y <= 0;
2006 2771
2007 $map->load; 2772 $map->load;
2008 $map->load_diag; 2773 $map->load_neighbours;
2009 2774
2010 return unless $self->contr->active; 2775 return unless $self->contr->active;
2011 $self->activate_recursive;
2012 2776
2013 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2014 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2015} 2779 # entering was successful
2780 delete $self->{_link_recursion};
2781 # only activate afterwards, to support waiting in hooks
2782 $self->activate_recursive;
2783 }
2016 2784
2785}
2786
2017=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2787=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2018 2788
2019Moves 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
2020her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2021that 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
2022the 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 >>.
2023 2797
2024=cut 2798=cut
2025 2799
2026our $GOTOGEN; 2800our $GOTOGEN;
2027 2801
2028sub cf::object::player::goto { 2802sub cf::object::player::goto {
2029 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 }
2030 2810
2031 # 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
2032 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2033 2813
2034 $self->enter_link; 2814 $self->enter_link;
2035 2815
2036 (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
2037 my $map = eval { 2838 my $map = eval {
2038 my $map = cf::map::find $path; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2039 2840
2040 if ($map) { 2841 if ($map) {
2041 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2042 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2043 } else { 2844 } else {
2044 $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);
2045 } 2846 }
2046 2847
2047 $map 2848 $map
2048 }; 2849 };
2049 2850
… …
2054 2855
2055 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2056 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2057 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2058 } 2859 }
2860
2861 $done->($self) if $done;
2059 })->prio (1); 2862 })->prio (1);
2060} 2863}
2061 2864
2062=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2063 2866
… …
2083} 2886}
2084 2887
2085sub prepare_random_map { 2888sub prepare_random_map {
2086 my ($exit) = @_; 2889 my ($exit) = @_;
2087 2890
2088 my $guard = cf::lock_acquire "exit_prepare:$exit";
2089
2090 # all this does is basically replace the /! path by 2891 # all this does is basically replace the /! path by
2091 # a new random map path (?random/...) with a seed 2892 # a new random map path (?random/...) with a seed
2092 # that depends on the exit object 2893 # that depends on the exit object
2093 2894
2094 my $rmp = parse_random_map_params $exit->msg; 2895 my $rmp = parse_random_map_params $exit->msg;
… …
2096 if ($exit->map) { 2897 if ($exit->map) {
2097 $rmp->{region} = $exit->region->name; 2898 $rmp->{region} = $exit->region->name;
2098 $rmp->{origin_map} = $exit->map->path; 2899 $rmp->{origin_map} = $exit->map->path;
2099 $rmp->{origin_x} = $exit->x; 2900 $rmp->{origin_x} = $exit->x;
2100 $rmp->{origin_y} = $exit->y; 2901 $rmp->{origin_y} = $exit->y;
2902
2903 $exit->map->touch;
2101 } 2904 }
2102 2905
2103 $rmp->{random_seed} ||= $exit->random_seed; 2906 $rmp->{random_seed} ||= $exit->random_seed;
2104 2907
2105 my $data = cf::to_json $rmp; 2908 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2106 my $md5 = Digest::MD5::md5_hex $data; 2909 my $md5 = Digest::MD5::md5_hex $data;
2107 my $meta = "$RANDOMDIR/$md5.meta"; 2910 my $meta = "$RANDOMDIR/$md5.meta";
2108 2911
2109 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2912 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2110 aio_write $fh, 0, (length $data), $data, 0; 2913 aio_write $fh, 0, (length $data), $data, 0;
2111 undef $fh; 2914 undef $fh;
2112 aio_rename "$meta~", $meta; 2915 aio_rename "$meta~", $meta;
2113 2916
2917 my $slaying = "?random/$md5";
2918
2919 if ($exit->valid) {
2114 $exit->slaying ("?random/$md5"); 2920 $exit->slaying ("?random/$md5");
2115 $exit->msg (undef); 2921 $exit->msg (undef);
2922 }
2116 } 2923 }
2117} 2924}
2118 2925
2119sub cf::object::player::enter_exit { 2926sub cf::object::player::enter_exit {
2120 my ($self, $exit) = @_; 2927 my ($self, $exit) = @_;
2121 2928
2122 return unless $self->type == cf::PLAYER; 2929 return unless $self->type == cf::PLAYER;
2123 2930
2124 if ($exit->slaying eq "/!") {
2125 #TODO: this should de-fi-ni-te-ly not be a sync-job
2126 # the problem is that $exit might not survive long enough
2127 # so it needs to be done right now, right here
2128 cf::sync_job { prepare_random_map $exit };
2129 }
2130
2131 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2132 my $hp = $exit->stats->hp;
2133 my $sp = $exit->stats->sp;
2134
2135 $self->enter_link; 2931 $self->enter_link;
2136 2932
2137 (async { 2933 (async {
2138 $self->deactivate_recursive; # just to be sure 2934 $Coro::current->{desc} = "enter_exit";
2935
2139 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
2140 $self->goto ($slaying, $hp, $sp); 2951 $self->goto ($map, $x, $y);
2141 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
2142 1; 2957 1
2143 }) { 2958 }) {
2144 $self->message ("Something went wrong deep within the crossfire server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2145 . "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. "
2146 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2147 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2148 2963
2149 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2150 $self->leave_link; 2965 $self->leave_link;
2151 } 2966 }
2152 })->prio (1); 2967 })->prio (1);
2153} 2968}
2154 2969
… …
2168 2983
2169 utf8::encode $text; 2984 utf8::encode $text;
2170 $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);
2171} 2986}
2172 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
3013=item $client->send_msg ($channel, $msg, $color, [extra...])
3014
3015Send a drawinfo or msg packet to the client, formatting the msg for the
3016client if neccessary. C<$type> should be a string identifying the type of
3017the message, with C<log> being the default. If C<$color> is negative, suppress
3018the message unless the client supports the msg packet.
3019
3020=cut
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
3136sub cf::client::send_msg {
3137 my ($self, $channel, $msg, $color, @extra) = @_;
3138
3139 $msg = $self->pl->expand_cfpod ($msg)
3140 unless $color & cf::NDI_VERBATIM;
3141
3142 $color &= cf::NDI_CLIENT_MASK; # just in case...
3143
3144 # check predefined channels, for the benefit of C
3145 if ($CHANNEL{$channel}) {
3146 $channel = $CHANNEL{$channel};
3147
3148 $self->ext_msg (channel_info => $channel);
3149 $channel = $channel->{id};
3150
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);
3156 }
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
2173=item $client->ext_event ($type, %msg) 3175=item $client->ext_msg ($type, @msg)
2174 3176
2175Sends an exti event to the client. 3177Sends an ext event to the client.
2176 3178
2177=cut 3179=cut
2178 3180
2179sub cf::client::ext_event($$%) { 3181sub cf::client::ext_msg($$@) {
2180 my ($self, $type, %msg) = @_; 3182 my ($self, $type, @msg) = @_;
2181 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
2182 $msg{msgtype} = "event_$type"; 3187 push @msg, msgtype => "event_$type";
2183 $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 }
2184} 3208}
2185 3209
2186=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2187 3211
2188Queues a query to the client, calling the given callback with 3212Queues a query to the client, calling the given callback with
2189the 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>,
2190C<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>.
2191 3215
2192Queries 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
2193reliable at some point in the future. 3217become reliable at some point in the future.
2194 3218
2195=cut 3219=cut
2196 3220
2197sub cf::client::query { 3221sub cf::client::query {
2198 my ($self, $flags, $text, $cb) = @_; 3222 my ($self, $flags, $text, $cb) = @_;
… …
2206 utf8::encode $text; 3230 utf8::encode $text;
2207 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3231 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2208 3232
2209 $self->send_packet ($self->{query_queue}[0][0]) 3233 $self->send_packet ($self->{query_queue}[0][0])
2210 if @{ $self->{query_queue} } == 1; 3234 if @{ $self->{query_queue} } == 1;
3235
3236 1
2211} 3237}
2212 3238
2213cf::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 },
2214 on_reply => sub { 3245 on_reply => sub {
2215 my ($ns, $msg) = @_; 3246 my ($ns, $msg) = @_;
2216 3247
2217 # this weird shuffling is so that direct followup queries 3248 # this weird shuffling is so that direct followup queries
2218 # get handled first 3249 # get handled first
… …
2230 } else { 3261 } else {
2231 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3262 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2232 } 3263 }
2233 } 3264 }
2234 }, 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 },
2235); 3292);
2236 3293
2237=item $client->async (\&cb) 3294=item $client->async (\&cb)
2238 3295
2239Create a new coroutine, running the specified callback. The coroutine will 3296Create a new coroutine, running the specified callback. The coroutine will
… …
2255 3312
2256 $coro 3313 $coro
2257} 3314}
2258 3315
2259cf::client->attach ( 3316cf::client->attach (
2260 on_destroy => sub { 3317 on_client_destroy => sub {
2261 my ($ns) = @_; 3318 my ($ns) = @_;
2262 3319
2263 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2264 }, 3321 },
2265); 3322);
… …
2280our $safe = new Safe "safe"; 3337our $safe = new Safe "safe";
2281our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
2282 3339
2283$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
2284 3341
2285$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));
2286 3347
2287# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
2288 3349
2289=pod 3350=pod
2290 3351
2291The following functions and methods are available within a safe environment: 3352The following functions and methods are available within a safe environment:
2292 3353
2293 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
2294 cf::object::player player 3359 cf::object::player
2295 cf::player peaceful 3360 player
2296 cf::map trigger 3361
3362 cf::player
3363 peaceful
3364
3365 cf::map
3366 trigger
2297 3367
2298=cut 3368=cut
2299 3369
2300for ( 3370for (
2301 ["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)],
2302 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
2303 ["cf::player" => qw(peaceful)], 3375 ["cf::player" => qw(peaceful send_msg)],
2304 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
2305) { 3377) {
2306 no strict 'refs';
2307 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
2308 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2309 for @funs; 3380 for @funs;
2310} 3381}
2311 3382
… …
2326 3397
2327 my $qcode = $code; 3398 my $qcode = $code;
2328 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2329 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
2330 3401
3402 %vars = (_dummy => 0) unless %vars;
3403
3404 my @res;
2331 local $_; 3405 local $_;
2332 local @safe::cf::_safe_eval_args = values %vars;
2333 3406
2334 my $eval = 3407 my $eval =
2335 "do {\n" 3408 "do {\n"
2336 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2337 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
2338 . $code 3411 . $code
2339 . "\n}" 3412 . "\n}"
2340 ; 3413 ;
2341 3414
3415 if ($CFG{safe_eval}) {
2342 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
2343 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2344 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 }
2345 3424
2346 if ($@) { 3425 if ($@) {
2347 warn "$@"; 3426 warn "$@",
2348 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
2349 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
2350 } 3429 }
2351 3430
2352 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
2353} 3432}
2354 3433
… …
2368=cut 3447=cut
2369 3448
2370sub register_script_function { 3449sub register_script_function {
2371 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
2372 3451
2373 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
2374 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
2375} 3454}
2376 3455
2377=back 3456=back
2378 3457
2379=cut 3458=cut
2380
2381#############################################################################
2382
2383=head2 EXTENSION DATABASE SUPPORT
2384
2385Crossfire maintains a very simple database for extension use. It can
2386currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2387convert to/from binary).
2388
2389The parameter C<$family> should best start with the name of the extension
2390using it, it should be unique.
2391
2392=over 4
2393
2394=item $value = cf::db_get $family => $key
2395
2396Returns a single value from the database.
2397
2398=item cf::db_put $family => $key => $value
2399
2400Stores the given C<$value> in the family.
2401
2402=cut
2403
2404our $DB;
2405
2406sub db_init {
2407 unless ($DB) {
2408 $DB = BDB::db_create $DB_ENV;
2409
2410 cf::sync_job {
2411 eval {
2412 $DB->set_flags (BDB::CHKSUM);
2413
2414 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2415 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2416 cf::cleanup "db_open(db): $!" if $!;
2417 };
2418 cf::cleanup "db_open(db): $@" if $@;
2419 };
2420 }
2421}
2422
2423sub db_get($$) {
2424 my $key = "$_[0]/$_[1]";
2425
2426 cf::sync_job {
2427 BDB::db_get $DB, undef, $key, my $data;
2428
2429 $! ? ()
2430 : $data
2431 }
2432}
2433
2434sub db_put($$$) {
2435 BDB::dbreq_pri 4;
2436 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2437}
2438
2439=item cf::cache $id => [$paths...], $processversion => $process
2440
2441Generic caching function that returns the value of the resource $id,
2442caching and regenerating as required.
2443
2444This function can block.
2445
2446=cut
2447
2448sub cache {
2449 my ($id, $src, $processversion, $process) = @_;
2450
2451 my $meta =
2452 join "\x00",
2453 $processversion,
2454 map {
2455 aio_stat $_
2456 and Carp::croak "$_: $!";
2457
2458 ($_, (stat _)[7,9])
2459 } @$src;
2460
2461 my $dbmeta = db_get cache => "$id/meta";
2462 if ($dbmeta ne $meta) {
2463 # changed, we may need to process
2464
2465 my @data;
2466 my $md5;
2467
2468 for (0 .. $#$src) {
2469 0 <= aio_load $src->[$_], $data[$_]
2470 or Carp::croak "$src->[$_]: $!";
2471 }
2472
2473 # if processing is expensive, check
2474 # checksum first
2475 if (1) {
2476 $md5 =
2477 join "\x00",
2478 $processversion,
2479 map {
2480 Coro::cede;
2481 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2482 } 0.. $#$src;
2483
2484
2485 my $dbmd5 = db_get cache => "$id/md5";
2486 if ($dbmd5 eq $md5) {
2487 db_put cache => "$id/meta", $meta;
2488
2489 return db_get cache => "$id/data";
2490 }
2491 }
2492
2493 my $t1 = Time::HiRes::time;
2494 my $data = $process->(\@data);
2495 my $t2 = Time::HiRes::time;
2496
2497 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2498
2499 db_put cache => "$id/data", $data;
2500 db_put cache => "$id/md5" , $md5;
2501 db_put cache => "$id/meta", $meta;
2502
2503 return $data;
2504 }
2505
2506 db_get cache => "$id/data"
2507}
2508
2509=item fork_call { }, $args
2510
2511Executes the given code block with the given arguments in a seperate
2512process, returning the results. Everything must be serialisable with
2513Coro::Storable. May, of course, block. Note that the executed sub may
2514never block itself or use any form of Event handling.
2515
2516=cut
2517
2518sub fork_call(&@) {
2519 my ($cb, @args) = @_;
2520
2521# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2522# or die "socketpair: $!";
2523 pipe my $fh1, my $fh2
2524 or die "pipe: $!";
2525
2526 if (my $pid = fork) {
2527 close $fh2;
2528
2529 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2530 $res = Coro::Storable::thaw $res;
2531
2532 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2533
2534 die $$res unless "ARRAY" eq ref $res;
2535
2536 return wantarray ? @$res : $res->[-1];
2537 } else {
2538 reset_signals;
2539 local $SIG{__WARN__};
2540 local $SIG{__DIE__};
2541 eval {
2542 close $fh1;
2543
2544 my @res = eval { $cb->(@args) };
2545 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2546 };
2547
2548 warn $@ if $@;
2549 _exit 0;
2550 }
2551}
2552 3459
2553############################################################################# 3460#############################################################################
2554# the server's init and main functions 3461# the server's init and main functions
2555 3462
2556sub load_facedata($) { 3463sub load_facedata($) {
2557 my ($path) = @_; 3464 my ($path) = @_;
2558 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
2559 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
2560 3473
2561 my $facedata; 3474 my $facedata = decode_storable load_file $path;
2562 0 < aio_load $path, $facedata
2563 or die "$path: $!";
2564
2565 $facedata = Coro::Storable::thaw $facedata;
2566 3475
2567 $facedata->{version} == 2 3476 $facedata->{version} == 2
2568 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
2569 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
2570 { 3488 {
2571 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
2572 3490
2573 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
2574 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3493
2575 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3495 cf::face::set_magicmap $idx, $info->{magicmap};
2576 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2577 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2578 Coro::cede; 3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3499
3500 cf::cede_to_tick;
2579 } 3501 }
2580 3502
2581 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
2582 next unless $info->{smooth}; 3504 next unless $info->{smooth};
3505
2583 my $idx = cf::face::find $face 3506 my $idx = cf::face::find $face
2584 or next; 3507 or next;
3508
2585 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3510 cf::face::set_smooth $idx, $smooth;
2586 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2587 } else { 3512 } else {
2588 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
2589 } 3514 }
2590 Coro::cede; 3515
3516 cf::cede_to_tick;
2591 } 3517 }
2592 } 3518 }
2593 3519
2594 { 3520 {
2595 my $anims = $facedata->{animinfo}; 3521 my $anims = $facedata->{animinfo};
2596 3522
2597 while (my ($anim, $info) = each %$anims) { 3523 while (my ($anim, $info) = each %$anims) {
2598 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3524 cf::anim::set $anim, $info->{frames}, $info->{facings};
2599 Coro::cede; 3525 cf::cede_to_tick;
2600 } 3526 }
2601 3527
2602 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
2603 } 3529 }
2604 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
2605 1 3550 1
2606} 3551}
2607 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
2608sub 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
2609 load_resource_file "$MAPDIR/regions" 3576 load_resource_file "$MAPDIR/regions"
2610 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 }
2611} 3583}
2612 3584
2613sub reload_facedata { 3585sub reload_facedata {
2614 load_facedata "$DATADIR/facedata" 3586 load_facedata "$DATADIR/facedata"
2615 or die "unable to load facedata\n"; 3587 or die "unable to load facedata\n";
… …
2623sub reload_treasures { 3595sub reload_treasures {
2624 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
2625 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
2626} 3598}
2627 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
2628sub reload_resources { 3620sub reload_resources {
2629 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
2630 3622
3623 reload_exp_table;
3624 reload_materials;
3625 reload_facedata;
3626 reload_sound;
3627 reload_archetypes;
2631 reload_regions; 3628 reload_regions;
2632 reload_facedata;
2633 #reload_archetypes;#d#
2634 reload_archetypes;
2635 reload_treasures; 3629 reload_treasures;
2636 3630
2637 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
2638} 3632}
2639 3633
2640sub init { 3634sub reload_config {
2641 reload_resources; 3635 trace "reloading config file...\n";
2642}
2643 3636
2644sub cfg_load { 3637 my $config = load_file "$CONFDIR/config";
2645 open my $fh, "<:utf8", "$CONFDIR/config" 3638 utf8::decode $config;
2646 or return; 3639 *CFG = decode_yaml $config;
2647 3640
2648 local $/;
2649 *CFG = YAML::Syck::Load <$fh>;
2650
2651 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2652 3642
2653 $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};
2654 $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};
2655 3645
2656 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
… …
2660 }; 3650 };
2661 warn $@ if $@; 3651 warn $@ if $@;
2662 } 3652 }
2663} 3653}
2664 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
2665sub 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
2666 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
2667 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
2668 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#
2669 (async { 3696 (async {
2670 Event::one_event; 3697 $Coro::current->{desc} = "IDLE BUG HANDLER";
3698 EV::loop EV::LOOP_ONESHOT;
2671 })->prio (Coro::PRIO_MAX); 3699 })->prio (Coro::PRIO_MAX);
2672 }; 3700 };
2673 3701
2674 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;
2675 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
2676 load_extensions; 3725 load_extensions;
2677 3726
2678 $TICK_WATCHER->start; 3727 utime time, time, $RUNTIMEFILE;
2679 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;
2680} 3745}
2681 3746
2682############################################################################# 3747#############################################################################
2683# initialisation and cleanup 3748# initialisation and cleanup
2684 3749
2685# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
2686BEGIN { 3751BEGIN {
3752 our %SIGWATCHER = ();
2687 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
2688 Event->signal ( 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2689 reentrant => 0,
2690 data => WF_AUTOCANCEL,
2691 signal => $signal,
2692 prio => 0,
2693 cb => sub {
2694 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
2695 },
2696 ); 3756 };
3757 }
3758}
3759
3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3763 # first touch the runtime file to show we are still running:
3764 # the fsync below can take a very very long time.
3765
3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3767
3768 my $guard = cf::lock_acquire "write_runtime";
3769
3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3771 or return;
3772
3773 my $value = $cf::RUNTIME + 90 + 10;
3774 # 10 is the runtime save interval, for a monotonic clock
3775 # 60 allows for the watchdog to kill the server.
3776
3777 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3778 and return;
3779
3780 # always fsync - this file is important
3781 aio_fsync $fh
3782 and return;
3783
3784 # touch it again to show we are up-to-date
3785 aio_utime $fh, undef, undef;
3786
3787 close $fh
3788 or return;
3789
3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3791 and return;
3792
3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3794
2697 } 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 };
2698} 3846}
2699 3847
2700sub emergency_save() { 3848sub emergency_save() {
2701 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
2702 3850
2703 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;
2704 3857
2705 cf::sync_job { 3858 cf::sync_job {
3859 cf::write_runtime_sync; # external watchdog should not bark
3860
2706 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
2707 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
2708 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
2709 warn "begin emergency player save\n"; 3864 info "emergency_perl_save: begin player save\n";
2710 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
2711 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
2712 $pl->valid or next; 3867 $pl->valid or next;
3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2713 $pl->save; 3869 $pl->save;
2714 } 3870 }
2715 warn "end emergency player save\n"; 3871 info "emergency_perl_save: end player save\n";
2716 3872
2717 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";
2718 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
2719 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
2720 $map->valid or next; 3878 $map->valid or next;
2721 $map->save; 3879 $map->save;
2722 } 3880 }
2723 warn "end emergency map save\n"; 3881 info "emergency_perl_save: end map save\n";
2724 3882
2725 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";
2726 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
2727 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
2728 }; 3911 };
2729 3912
2730 warn "leave emergency perl save\n"; 3913 info "emergency_perl_save: leave\n";
2731} 3914}
2732 3915
2733sub post_cleanup { 3916sub post_cleanup {
2734 my ($make_core) = @_; 3917 my ($make_core) = @_;
2735 3918
3919 IO::AIO::flush;
3920
2736 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
2737 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 }
2738} 3951}
2739 3952
2740sub do_reload_perl() { 3953sub do_reload_perl() {
2741 # can/must only be called in main 3954 # can/must only be called in main
2742 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
2743 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
2744 return; 3957 return;
2745 } 3958 }
2746 3959
2747 warn "reloading..."; 3960 return if $RELOAD++;
2748 3961
2749 warn "entering sync_job"; 3962 my $t1 = AE::time;
2750 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
2751 cf::sync_job { 3970 cf::sync_job {
2752 cf::write_runtime; # external watchdog should not bark
2753 cf::emergency_save; 3971 #cf::emergency_save;
2754 cf::write_runtime; # external watchdog should not bark
2755 3972
2756 warn "syncing database to disk";
2757 BDB::db_env_txn_checkpoint $DB_ENV;
2758
2759 # if anything goes wrong in here, we should simply crash as we already saved
2760
2761 warn "cancelling all WF_AUTOCANCEL watchers";
2762 for (Event::all_watchers) {
2763 $_->cancel if $_->data & WF_AUTOCANCEL;
2764 }
2765
2766 warn "flushing outstanding aio requests";
2767 for (;;) {
2768 BDB::flush;
2769 IO::AIO::flush;
2770 Coro::cede;
2771 last unless IO::AIO::nreqs || BDB::nreqs;
2772 warn "iterate...";
2773 }
2774
2775 ++$RELOAD;
2776
2777 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
2778 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
2779 %EXT_CORO = (); 3975 %EXT_CORO = ();
2780 3976
2781 warn "removing commands"; 3977 trace "perl_reload: removing commands";
2782 %COMMAND = (); 3978 %COMMAND = ();
2783 3979
2784 warn "removing ext commands"; 3980 trace "perl_reload: removing ext/exti commands";
2785 %EXTCMD = (); 3981 %EXTCMD = ();
3982 %EXTICMD = ();
2786 3983
2787 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
2790 3987
2791 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
2792 eval { 3989 eval {
2793 $cb->($pkg); 3990 $cb->($pkg);
2794 1 3991 1
2795 } 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;
2796 } 3997 }
2797 3998
2798 warn "... nuking $pkg";
2799 Symbol::delete_package $pkg;
2800 }
2801
2802 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2803 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
2804 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2805 4002
2806 warn "... unloading $k"; 4003 trace "... unloading $k";
2807 delete $INC{$k}; 4004 delete $INC{$k};
2808 4005
2809 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
2810 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
2811 4008
2812 if (my $cb = $k->can ("unload_module")) { 4009 if (my $cb = $k->can ("unload_module")) {
2813 $cb->(); 4010 $cb->();
4011 }
4012
4013 clear_package $k;
2814 } 4014 }
2815 4015
2816 Symbol::delete_package $k;
2817 }
2818
2819 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
2820 Symbol::delete_package "safe::$_" 4017 clear_package "safe::$_"
2821 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);
2822 4019
2823 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
2824 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
2825 delete $INC{"cf/pod.pm"}; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2826 4023
2827 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
2828 # and global variables created in xs 4025 # and global variables created in xs
2829 #Symbol::delete_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
2830 4027
2831 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
2832 4029
2833 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
2834 require cf; 4031 require cf;
2835 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
2836 4033
2837 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
2838 cf::cfg_load; 4035 cf::reload_config;
2839 4036
2840 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
2841 cf::load_extensions; 4038 cf::load_extensions;
2842 4039
4040 if ($REATTACH_ON_RELOAD) {
2843 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
2844 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
2845 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
2846 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
2847 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
2848 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
4047 }
2849 4048
2850 warn "leaving sync_job"; 4049 cf::_post_init 1;
2851 4050
4051 trace "perl_reload: leaving sync_job";
4052
2852 1 4053 1
2853 } or do { 4054 } or do {
2854 warn $@; 4055 error $@;
2855 warn "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
2856 exit 1; 4057 };
4058
4059 --$RELOAD;
2857 }; 4060 }
2858 4061
2859 warn "reloaded"; 4062 $t1 = AE::time - $t1;
4063 info "perl_reload: completed in ${t1}s\n";
2860}; 4064};
2861 4065
2862our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
2863 4067
2864sub reload_perl() { 4068sub reload_perl() {
2865 # doing reload synchronously and two reloads happen back-to-back, 4069 # doing reload synchronously and two reloads happen back-to-back,
2866 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
2867 4071
2868 $RELOAD_WATCHER ||= Event->timer ( 4072 $RELOAD_WATCHER ||= cf::async {
2869 reentrant => 0, 4073 Coro::AIO::aio_wait cache_extensions;
2870 after => 0, 4074
2871 data => WF_AUTOCANCEL, 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2872 cb => sub {
2873 do_reload_perl; 4076 do_reload_perl;
2874 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
2875 }, 4078 };
2876 ); 4079 };
2877} 4080}
2878 4081
2879register_command "reload" => sub { 4082register_command "reload" => sub {
2880 my ($who, $arg) = @_; 4083 my ($who, $arg) = @_;
2881 4084
2882 if ($who->flag (FLAG_WIZ)) { 4085 if ($who->flag (FLAG_WIZ)) {
2883 $who->message ("reloading server."); 4086 $who->message ("reloading server.");
4087 async {
4088 $Coro::current->{desc} = "perl_reload";
2884 async { reload_perl }; 4089 reload_perl;
4090 };
2885 } 4091 }
2886}; 4092};
2887 4093
2888unshift @INC, $LIBDIR; 4094#############################################################################
2889 4095
2890my $bug_warning = 0; 4096my $bug_warning = 0;
2891 4097
2892our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
2893our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
2894 4100
2895sub wait_for_tick { 4101sub wait_for_tick() {
2896 return unless $TICK_WATCHER->is_active;
2897 return if $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2898 4103
2899 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
2900 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
2901 $signal->wait; 4106 $signal->wait;
2902} 4107}
2903 4108
2904sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
2905 return unless $TICK_WATCHER->is_active;
2906 return if $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2907 4111
2908 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
2909 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
2910 $signal->wait; 4114 $signal->wait;
2911} 4115}
2912 4116
2913 my $min = 1e6;#d# 4117sub tick {
2914 my $avg = 10;
2915$TICK_WATCHER = Event->timer (
2916 reentrant => 0,
2917 parked => 1,
2918 prio => 0,
2919 at => $NEXT_TICK || $TICK,
2920 data => WF_AUTOCANCEL,
2921 cb => sub {
2922 if ($Coro::current != $Coro::main) { 4118 if ($Coro::current != $Coro::main) {
2923 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"
2924 unless ++$bug_warning > 10; 4120 unless ++$bug_warning > 10;
2925 return; 4121 return;
2926 } 4122 }
2927 4123
2928 $NOW = $tick_start = Event::time;
2929
2930 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
2931 4125
2932 0 && sync_job {#d# 4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2933 for(1..10) {
2934 my $t = Event::time;
2935 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2936 or die;
2937 4127
2938 $map->width (50); 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2939 $map->height (50); 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2940 $map->alloc; 4130 Coro::async_pool {
2941 $map->_load_objects ("/tmp/x.map", 1); 4131 $Coro::current->{desc} = "runtime saver";
2942 my $t = Event::time - $t; 4132 write_runtime_sync
2943 4133 or error "ERROR: unable to write runtime file: $!";
2944 #next unless $t < 0.0013;#d#
2945 if ($t < $min) {
2946 $min = $t;
2947 }
2948 $avg = $avg * 0.99 + $t * 0.01;
2949 }
2950 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2951 exit 0;
2952 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2953 }; 4134 };
4135 }
2954 4136
2955 $RUNTIME += $TICK;
2956 $NEXT_TICK += $TICK;
2957
2958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2959 $NEXT_RUNTIME_WRITE = $NOW + 10;
2960 Coro::async_pool {
2961 write_runtime
2962 or warn "ERROR: unable to write runtime file: $!";
2963 };
2964 }
2965
2966# my $AFTER = Event::time;
2967# warn $AFTER - $NOW;#d#
2968
2969 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2970 $sig->send; 4138 $sig->send;
2971 } 4139 }
2972 while (my $sig = shift @WAIT_FOR_TICK) { 4140 while (my $sig = shift @WAIT_FOR_TICK) {
2973 $sig->send; 4141 $sig->send;
2974 } 4142 }
2975 4143
2976 $NOW = Event::time; 4144 $LOAD = ($NOW - $TICK_START) / $TICK;
2977
2978 # if we are delayed by four ticks or more, skip them all
2979 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2980
2981 $TICK_WATCHER->at ($NEXT_TICK);
2982 $TICK_WATCHER->start;
2983
2984 $LOAD = ($NOW - $tick_start) / $TICK;
2985 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4145 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2986 4146
2987 _post_tick; 4147 if (0) {
2988 4148 if ($NEXT_TICK) {
2989 4149 my $jitter = $TICK_START - $NEXT_TICK;
4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4151 debug "jitter $JITTER\n";#d#
4152 }
2990 }, 4153 }
2991); 4154}
2992 4155
2993{ 4156{
2994 BDB::max_poll_time $TICK * 0.1; 4157 # configure BDB
2995 $BDB_POLL_WATCHER = Event->io ( 4158
2996 reentrant => 0,
2997 fd => BDB::poll_fileno,
2998 poll => 'r',
2999 prio => 0,
3000 data => WF_AUTOCANCEL,
3001 cb => \&BDB::poll_cb,
3002 );
3003 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3004 4160 BDB::max_poll_reqs $TICK * 0.1;
3005 BDB::set_sync_prepare { 4161 $AnyEvent::BDB::WATCHER->priority (1);
3006 my $status;
3007 my $current = $Coro::current;
3008 (
3009 sub {
3010 $status = $!;
3011 $current->ready; undef $current;
3012 },
3013 sub {
3014 Coro::schedule while defined $current;
3015 $! = $status;
3016 },
3017 )
3018 };
3019 4162
3020 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3021 $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);
3022 4170
3023 cf::sync_job { 4171 cf::sync_job {
3024 eval { 4172 eval {
3025 BDB::db_env_open 4173 BDB::db_env_open
3026 $DB_ENV, 4174 $DB_ENV,
… …
3028 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
3029 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4177 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3030 0666; 4178 0666;
3031 4179
3032 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4180 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3033
3034 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3035 $DB_ENV->set_lk_detect;
3036 }; 4181 };
3037 4182
3038 cf::cleanup "db_env_open(db): $@" if $@; 4183 cf::cleanup "db_env_open(db): $@" if $@;
3039 }; 4184 };
3040 } 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 };
3041} 4196}
3042 4197
3043{ 4198{
4199 # configure IO::AIO
4200
3044 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3045
3046 undef $Coro::AIO::WATCHER;
3047 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3048 $AIO_POLL_WATCHER = Event->io ( 4203 undef $AnyEvent::AIO::WATCHER;
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 fd => IO::AIO::poll_fileno,
3052 poll => 'r',
3053 prio => 6,
3054 cb => \&IO::AIO::poll_cb,
3055 );
3056} 4204}
3057 4205
3058my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3059 4208
3060sub _log_backtrace { 4209sub _log_backtrace {
3061 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3062 4211
3063 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3064 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3065 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3066 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3067 ++$_log_backtrace; 4220 ++$_log_backtrace;
4221 my $perl_bt = Carp::longmess $msg;
3068 async { 4222 async {
4223 $Coro::current->{desc} = "abt $msg";
4224
3069 my @bt = fork_call { 4225 my @bt = fork_call {
3070 @addr = map { sprintf "%x", $_ } @addr; 4226 @addr = map { sprintf "%x", $_ } @addr;
3071 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4227 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3072 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 |"
3073 or die "addr2line: $!"; 4229 or die "addr2line: $!";
… …
3081 } 4237 }
3082 4238
3083 @funcs 4239 @funcs
3084 }; 4240 };
3085 4241
3086 LOG llevInfo, "[ABT] $msg\n"; 4242 LOG llevInfo, "[ABT] $perl_bt\n";
4243 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3087 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3088 --$_log_backtrace; 4245 --$_log_backtrace;
3089 }; 4246 };
3090 } else { 4247 } else {
3091 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3092 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3093 } 4250 }
3094} 4251}
3095 4252
3096# load additional modules 4253# load additional modules
3097use cf::pod; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3098 4256
3099END { cf::emergency_save } 4257END { cf::emergency_save }
3100 4258
31011 42591
3102 4260

Diff Legend

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