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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
71 118
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 121our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
82 130
83our %CFG; 131our %CFG;
84 132
85our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 134our $RUNTIME;
135our $NOW;
87 136
88our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
91 140
92# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 143
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
98 153
99binmode STDOUT; 154binmode STDOUT;
100binmode STDERR; 155binmode STDERR;
101 156
102# read virtual server time, if available 157# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
107} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
108 165
109mkdir $_ 166mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 168
112our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
113 170
114sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
115 187
116############################################################################# 188#############################################################################
117 189
118=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
119 191
155 227
156The raw value load value from the last tick. 228The raw value load value from the last tick.
157 229
158=item %cf::CFG 230=item %cf::CFG
159 231
160Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 233from wherever your confdir points to.
162 234
163=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
164 236
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These 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 238returns 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. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
246=item @cf::INVOKE_RESULTS
247
248This array contains the results of the last C<invoke ()> call. When
249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
250that call.
251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
169=back 258=back
170 259
171=cut 260=cut
172 261
173BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
174 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
175 my $msg = join "", @_; 269 my $msg = join "", @_;
176 270
177 $msg .= "\n" 271 $msg .= "\n"
178 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
179 273
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 275
182 utf8::encode $msg;
183 LOG llevError, $msg; 276 LOG llevWarn, $msg;
184 }; 277};
185} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
186 292
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 303for my $pkg (qw(
198 cf::global cf::attachable 304 cf::global cf::attachable
199 cf::object cf::object::player 305 cf::object cf::object::player
200 cf::client cf::player 306 cf::client cf::player
201 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
202 cf::map cf::party cf::region 309 cf::party cf::region
203)) { 310)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 312}
207 313
208$Event::DIED = sub { 314$EV::DIED = sub {
209 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
210}; 316};
317
318#############################################################################
211 319
212=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
213 321
214=over 4 322=over 4
215 323
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 343 $d
236 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
237} 345}
238 346
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
242 348
243Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
244 350
245=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
246 352
247Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
248 354
355=cut
356
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358
359sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
374=item cf::post_init { BLOCK }
375
376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
377but I<before> the server starts ticking again.
378
379The codeblock will have a single boolean argument to indicate whether this
380is a reload or not.
381
382=cut
383
384sub post_init(&) {
385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
403}
404
249=item cf::lock_wait $string 405=item cf::lock_wait $string
250 406
251Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
252 408
253=item my $lock = cf::lock_acquire $string 409=item my $lock = cf::lock_acquire $string
254 410
255Wait until the given lock is available and then acquires it and returns 411Wait 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, 412a L<Guard> object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 413for example when the coroutine gets canceled), the lock is automatically
258returned. 414returned.
259 415
416Locks are *not* recursive, locking from the same coro twice results in a
417deadlocked coro.
418
260Lock names should begin with a unique identifier (for example, cf::map::find 419Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 420uses map_find and cf::map::load uses map_load).
262 421
263=item $locked = cf::lock_active $string 422=item $locked = cf::lock_active $string
264 423
265Return true if the lock is currently active, i.e. somebody has locked it. 424Return true if the lock is currently active, i.e. somebody has locked it.
266 425
267=cut 426=cut
268 427
269our %LOCK; 428our $LOCKS = new Coro::SemaphoreSet;
270 429
271sub lock_wait($) { 430sub lock_wait($) {
272 my ($key) = @_; 431 $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} 432}
280 433
281sub lock_acquire($) { 434sub lock_acquire($) {
282 my ($key) = @_; 435 $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} 436}
294 437
295sub lock_active($) { 438sub lock_active($) {
296 my ($key) = @_; 439 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 440}
300 441
301sub freeze_mainloop { 442sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 443 tick_inhibit_inc;
303 444
304 my $guard = Coro::guard { 445 &Guard::guard (\&tick_inhibit_dec);
305 $TICK_WATCHER->start; 446}
447
448=item cf::periodic $interval, $cb
449
450Like EV::periodic, but randomly selects a starting point so that the actions
451get spread over time.
452
453=cut
454
455sub periodic($$) {
456 my ($interval, $cb) = @_;
457
458 my $start = rand List::Util::min 180, $interval;
459
460 EV::periodic $start, $interval, 0, $cb
461}
462
463=item cf::get_slot $time[, $priority[, $name]]
464
465Allocate $time seconds of blocking CPU time at priority C<$priority>:
466This call blocks and returns only when you have at least C<$time> seconds
467of cpu time till the next tick. The slot is only valid till the next cede.
468
469The optional C<$name> can be used to identify the job to run. It might be
470used for statistical purposes and should identify the same time-class.
471
472Useful for short background jobs.
473
474=cut
475
476our @SLOT_QUEUE;
477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
479
480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
481$SLOT_QUEUE = Coro::async {
482 $Coro::current->desc ("timeslot manager");
483
484 my $signal = new Coro::Signal;
485 my $busy;
486
487 while () {
488 next_job:
489
490 my $avail = cf::till_tick;
491
492 for (0 .. $#SLOT_QUEUE) {
493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
495 my $job = splice @SLOT_QUEUE, $_, 1, ();
496 $job->[2]->send;
497 Coro::cede;
498 goto next_job;
499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
501 }
502 }
503
504 if (@SLOT_QUEUE) {
505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
506 push @cf::WAIT_FOR_TICK, $signal;
507 $signal->wait;
508 } else {
509 $busy = 0;
510 Coro::schedule;
511 }
306 }; 512 }
307 $TICK_WATCHER->stop; 513};
308 $guard 514
515sub get_slot($;$$) {
516 return if tick_inhibit || $Coro::current == $Coro::main;
517
518 my ($time, $pri, $name) = @_;
519
520 $time = clamp $time, 0.01, $TICK * .6;
521
522 my $sig = new Coro::Signal;
523
524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
526 $SLOT_QUEUE->ready;
527 $sig->wait;
309} 528}
310 529
311=item cf::async { BLOCK } 530=item cf::async { BLOCK }
312 531
313Currently the same as Coro::async_pool, meaning you cannot use 532Currently the same as Coro::async_pool, meaning you cannot use
318 537
319BEGIN { *async = \&Coro::async_pool } 538BEGIN { *async = \&Coro::async_pool }
320 539
321=item cf::sync_job { BLOCK } 540=item cf::sync_job { BLOCK }
322 541
323The design of crossfire+ requires that the main coro ($Coro::main) is 542The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 543is 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. 544partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
545acceptable.
326 546
327If it must be done, put the blocking parts into C<sync_job>. This will run 547If 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 548the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 549server will be frozen during this time, so the block should either finish
330fast or be very important. 550fast or be very important.
332=cut 552=cut
333 553
334sub sync_job(&) { 554sub sync_job(&) {
335 my ($job) = @_; 555 my ($job) = @_;
336 556
337 if ($Coro::current == $Coro::main) { 557 if (in_main) {
338 my $time = Event::time; 558 my $time = AE::time;
339 559
340 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
342 562
343 # TODO: use suspend/resume instead 563 #LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 564
345 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
346 566
347 my $busy = 1; 567 my $busy = 1;
348 my @res; 568 my @res;
349 569
350 (async { 570 (async {
571 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 572 @res = eval { $job->() };
352 warn $@ if $@; 573 error $@ if $@;
353 undef $busy; 574 undef $busy;
354 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
355 576
356 while ($busy) { 577 while ($busy) {
357 Coro::cede or Event::one_event; 578 if (Coro::nready) {
579 Coro::cede_notself;
580 } else {
581 EV::loop EV::LOOP_ONESHOT;
358 } 582 }
583 }
359 584
360 $time = Event::time - $time; 585 my $time = AE::time - $time;
361 586
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 587 $TICK_START += $time; # do not account sync jobs to server load
366 588
367 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
368 } else { 590 } else {
369 # we are in another coroutine, how wonderful, everything just works 591 # we are in another coroutine, how wonderful, everything just works
370 592
390 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
391 613
392 $coro 614 $coro
393} 615}
394 616
395sub write_runtime { 617=item fork_call { }, @args
396 my $runtime = "$LOCALDIR/runtime";
397 618
398 # first touch the runtime file to show we are still running: 619Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 620process, returning the results. Everything must be serialisable with
621Coro::Storable. May, of course, block. Note that the executed sub may
622never block itself or use any form of event handling.
400 623
401 IO::AIO::aio_utime $runtime, undef, undef; 624=cut
402 625
403 my $guard = cf::lock_acquire "write_runtime"; 626sub post_fork {
627 reset_signals;
628}
404 629
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 630sub fork_call(&@) {
406 or return; 631 my ($cb, @args) = @_;
407 632
408 my $value = $cf::RUNTIME + 90 + 10; 633 # we seemingly have to make a local copy of the whole thing,
409 # 10 is the runtime save interval, for a monotonic clock 634 # otherwise perl prematurely frees the stuff :/
410 # 60 allows for the watchdog to kill the server. 635 # TODO: investigate and fix (likely this will be rather laborious)
411 636
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 637 my @res = Coro::Util::fork_eval {
413 and return; 638 cf::post_fork;
639 &$cb
640 } @args;
414 641
415 # always fsync - this file is important 642 wantarray ? @res : $res[-1]
416 aio_fsync $fh 643}
417 and return;
418 644
419 # touch it again to show we are up-to-date 645sub 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";#d#
429
430 1 646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
654}
655
656=item $coin = coin_from_name $name
657
658=cut
659
660our %coin_alias = (
661 "silver" => "silvercoin",
662 "silvercoin" => "silvercoin",
663 "silvercoins" => "silvercoin",
664 "gold" => "goldcoin",
665 "goldcoin" => "goldcoin",
666 "goldcoins" => "goldcoin",
667 "platinum" => "platinacoin",
668 "platinumcoin" => "platinacoin",
669 "platinumcoins" => "platinacoin",
670 "platina" => "platinacoin",
671 "platinacoin" => "platinacoin",
672 "platinacoins" => "platinacoin",
673 "royalty" => "royalty",
674 "royalties" => "royalty",
675);
676
677sub coin_from_name($) {
678 $coin_alias{$_[0]}
679 ? cf::arch::find $coin_alias{$_[0]}
680 : undef
681}
682
683=item $value = cf::db_get $family => $key
684
685Returns a single value from the environment database.
686
687=item cf::db_put $family => $key => $value
688
689Stores the given C<$value> in the family. It can currently store binary
690data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
691
692=item $db = cf::db_table "name"
693
694Create and/or open a new database table. The string must not be "db" and must be unique
695within each server.
696
697=cut
698
699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
703 my ($name) = @_;
704 my $db = BDB::db_create $DB_ENV;
705
706 eval {
707 $db->set_flags (BDB::CHKSUM);
708
709 utf8::encode $name;
710 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
711 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
712 cf::cleanup "db_open(db): $!" if $!;
713 };
714 cf::cleanup "db_open(db): $@" if $@;
715
716 $db
717}
718
719our $DB;
720
721sub db_init {
722 $DB ||= db_table "db";
723}
724
725sub db_get($$) {
726 my $key = "$_[0]/$_[1]";
727
728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
731 BDB::db_get $DB, undef, $key, my $data;
732
733 $! ? ()
734 : $data
735}
736
737sub db_put($$$) {
738 BDB::dbreq_pri 4;
739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
740}
741
742=item cf::cache $id => [$paths...], $processversion => $process
743
744Generic caching function that returns the value of the resource $id,
745caching and regenerating as required.
746
747This function can block.
748
749=cut
750
751sub cache {
752 my ($id, $src, $processversion, $process) = @_;
753
754 my $meta =
755 join "\x00",
756 $processversion,
757 map {
758 aio_stat $_
759 and Carp::croak "$_: $!";
760
761 ($_, (stat _)[7,9])
762 } @$src;
763
764 my $dbmeta = db_get cache => "$id/meta";
765 if ($dbmeta ne $meta) {
766 # changed, we may need to process
767
768 my @data;
769 my $md5;
770
771 for (0 .. $#$src) {
772 0 <= aio_load $src->[$_], $data[$_]
773 or Carp::croak "$src->[$_]: $!";
774 }
775
776 # if processing is expensive, check
777 # checksum first
778 if (1) {
779 $md5 =
780 join "\x00",
781 $processversion,
782 map {
783 cf::cede_to_tick;
784 ($src->[$_], Digest::MD5::md5_hex $data[$_])
785 } 0.. $#$src;
786
787
788 my $dbmd5 = db_get cache => "$id/md5";
789 if ($dbmd5 eq $md5) {
790 db_put cache => "$id/meta", $meta;
791
792 return db_get cache => "$id/data";
793 }
794 }
795
796 my $t1 = Time::HiRes::time;
797 my $data = $process->(\@data);
798 my $t2 = Time::HiRes::time;
799
800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801
802 db_put cache => "$id/data", $data;
803 db_put cache => "$id/md5" , $md5;
804 db_put cache => "$id/meta", $meta;
805
806 return $data;
807 }
808
809 db_get cache => "$id/data"
431} 810}
432 811
433=item cf::datalog type => key => value, ... 812=item cf::datalog type => key => value, ...
434 813
435Log a datalog packet of the given type with the given key-value pairs. 814Log a datalog packet of the given type with the given key-value pairs.
436 815
437=cut 816=cut
438 817
439sub datalog($@) { 818sub datalog($@) {
440 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
442} 821}
443 822
444=back 823=back
445 824
446=cut 825=cut
447 826
448############################################################################# 827#############################################################################
449 828
450=head2 ATTACHABLE OBJECTS 829=head2 ATTACHABLE OBJECTS
451 830
452Many objects in crossfire are so-called attachable objects. That means you can 831Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 832attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 833to it. All such attachable objects support the following methods.
455 834
456In the following description, CLASS can be any of C<global>, C<object> 835In 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 836C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 837Deliantra).
459 838
460=over 4 839=over 4
461 840
462=item $attachable->attach ($attachment, key => $value...) 841=item $attachable->attach ($attachment, key => $value...)
463 842
507=item cf::CLASS::attachment $name, ... 886=item cf::CLASS::attachment $name, ...
508 887
509Register an attachment by C<$name> through which attachable objects of the 888Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 889given CLASS can refer to this attachment.
511 890
512Some classes such as crossfire maps and objects can specify attachments 891Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 892that are attached at load/instantiate time, thus the need for a name.
514 893
515These calls expect any number of the following handler/hook descriptions: 894These calls expect any number of the following handler/hook descriptions:
516 895
517=over 4 896=over 4
641 1020
642 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
643 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
644 1023
645 } elsif (ref $type) { 1024 } elsif (ref $type) {
646 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
647 1026
648 } else { 1027 } else {
649 shift @arg; 1028 shift @arg;
650 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
651 } 1030 }
652 } 1031 }
653} 1032}
654 1033
655sub _object_attach { 1034sub _object_attach {
665 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
666 } 1045 }
667 1046
668 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
669 } else { 1048 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
671 } 1050 }
672 1051
673 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
674} 1053}
675 1054
715 "; 1094 ";
716 die if $@; 1095 die if $@;
717} 1096}
718 1097
719our $override; 1098our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1099our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1100
722sub override { 1101sub override {
723 $override = 1; 1102 $override = 1;
724 @invoke_results = (); 1103 @INVOKE_RESULTS = (@_);
725} 1104}
726 1105
727sub do_invoke { 1106sub do_invoke {
728 my $event = shift; 1107 my $event = shift;
729 my $callbacks = shift; 1108 my $callbacks = shift;
730 1109
731 @invoke_results = (); 1110 @INVOKE_RESULTS = ();
732 1111
733 local $override; 1112 local $override;
734 1113
735 for (@$callbacks) { 1114 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
737 1116
738 if ($@) { 1117 if ($@) {
739 warn "$@";
740 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
741 override; 1119 override;
742 } 1120 }
743 1121
744 return 1 if $override; 1122 return 1 if $override;
745 } 1123 }
746 1124
747 0 1125 0
748} 1126}
749 1127
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1128=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1129
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1130=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1131
754Generate an object-specific event with the given arguments. 1132Generate an object-specific event with the given arguments.
755 1133
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1134This 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 1135removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1136results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1137
760=back 1138=back
761 1139
762=cut 1140=cut
763 1141
764############################################################################# 1142#############################################################################
765# object support 1143# object support
1144
1145sub _object_equal($$);
1146sub _object_equal($$) {
1147 my ($a, $b) = @_;
1148
1149 return 0 unless (ref $a) eq (ref $b);
1150
1151 if ("HASH" eq ref $a) {
1152 my @ka = keys %$a;
1153 my @kb = keys %$b;
1154
1155 return 0 if @ka != @kb;
1156
1157 for (0 .. $#ka) {
1158 return 0 unless $ka[$_] eq $kb[$_];
1159 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1160 }
1161
1162 } elsif ("ARRAY" eq ref $a) {
1163
1164 return 0 if @$a != @$b;
1165
1166 for (0 .. $#$a) {
1167 return 0 unless _object_equal $a->[$_], $b->[$_];
1168 }
1169
1170 } elsif ($a ne $b) {
1171 return 0;
1172 }
1173
1174 1
1175}
1176
1177our $SLOW_MERGES;#d#
1178sub _can_merge {
1179 my ($ob1, $ob2) = @_;
1180
1181 ++$SLOW_MERGES;#d#
1182
1183 # we do the slow way here
1184 return _object_equal $ob1, $ob2
1185}
766 1186
767sub reattach { 1187sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1188 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1189 my ($obj) = @_;
770 1190
1191 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1192 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1193
773 my $registry = $obj->registry; 1194 my $registry = $obj->registry;
774 1195
775 @$registry = (); 1196 @$registry = ();
776 1197
781 for (@$attach) { 1202 for (@$attach) {
782 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
783 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
784 } 1205 }
785 } else { 1206 } else {
786 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
787 } 1208 }
788 } 1209 }
789} 1210}
790 1211
791cf::attachable->attach ( 1212cf::attachable->attach (
792 prio => -1000000, 1213 prio => -1000000,
793 on_instantiate => sub { 1214 on_instantiate => sub {
794 my ($obj, $data) = @_; 1215 my ($obj, $data) = @_;
795 1216
796 $data = from_json $data; 1217 $data = decode_json $data;
797 1218
798 for (@$data) { 1219 for (@$data) {
799 my ($name, $args) = @$_; 1220 my ($name, $args) = @$_;
800 1221
801 $obj->attach ($name, %{$args || {} }); 1222 $obj->attach ($name, %{$args || {} });
817sub object_freezer_save { 1238sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
819 1240
820 sync_job { 1241 sync_job {
821 if (length $$rdata) { 1242 if (length $$rdata) {
1243 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
824 1247
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1249 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 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;
1253 aio_fsync $fh;
1254 }
829 close $fh; 1255 aio_close $fh;
830 1256
831 if (@$objs) { 1257 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1259 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 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;
1264 aio_fsync $fh;
1265 }
837 close $fh; 1266 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
839 } 1268 }
840 } else { 1269 } else {
841 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
842 } 1271 }
843 1272
844 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1274
1275 $filename =~ s%/[^/]+$%%;
1276 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1277 } else {
846 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
847 } 1279 }
848 } else { 1280 } else {
849 aio_unlink $filename; 1281 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
851 } 1283 }
852 } 1284 };
853} 1285}
854 1286
855sub object_freezer_as_string { 1287sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1288 my ($rdata, $objs) = @_;
857 1289
869 or return; 1301 or return;
870 1302
871 unless (aio_stat "$filename.pst") { 1303 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1304 (aio_load "$filename.pst", $av) >= 0
873 or return; 1305 or return;
1306
874 $av = eval { (Storable::thaw $av)->{objs} }; 1307 my $st = eval { Coro::Storable::thaw $av };
1308 $av = $st->{objs};
875 } 1309 }
876 1310
1311 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []};#d# 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1315
879 return ($data, $av); 1316 ($data, $av)
880} 1317}
1318
1319=head2 COMMAND CALLBACKS
1320
1321=over 4
1322
1323=cut
881 1324
882############################################################################# 1325#############################################################################
883# command handling &c 1326# command handling &c
884 1327
885=item cf::register_command $name => \&callback($ob,$args); 1328=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1341 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1342}
900 1343
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1344=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1345
903Register a callbackf ro execution when the client sends an extcmd packet. 1346Register a callback for execution when the client sends an (synchronous)
1347extcmd packet. Ext commands will be processed in the order they are
1348received by the server, like other user commands. The first argument is
1349the logged-in player. Ext commands can only be processed after a player
1350has logged in successfully.
904 1351
905If the callback returns something, it is sent back as if reply was being 1352If the callback returns something, it is sent back as if reply was being
906called. 1353called.
907 1354
1355=item cf::register_exticmd $name => \&callback($ns,$packet);
1356
1357Register a callback for execution when the client sends an (asynchronous)
1358exticmd packet. Exti commands are processed by the server as soon as they
1359are received, i.e. out of order w.r.t. other commands. The first argument
1360is a client socket. Exti commands can be received anytime, even before
1361log-in.
1362
1363If the callback returns something, it is sent back as if reply was being
1364called.
1365
908=cut 1366=cut
909 1367
910sub register_extcmd { 1368sub register_extcmd {
911 my ($name, $cb) = @_; 1369 my ($name, $cb) = @_;
912 1370
913 $EXTCMD{$name} = $cb; 1371 $EXTCMD{$name} = $cb;
914} 1372}
915 1373
1374sub register_exticmd {
1375 my ($name, $cb) = @_;
1376
1377 $EXTICMD{$name} = $cb;
1378}
1379
1380use File::Glob ();
1381
916cf::player->attach ( 1382cf::player->attach (
917 on_command => sub { 1383 on_unknown_command => sub {
918 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
919 1385
920 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
921 or return; 1387 or return;
922 1388
927 cf::override; 1393 cf::override;
928 }, 1394 },
929 on_extcmd => sub { 1395 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1396 my ($pl, $buf) = @_;
931 1397
932 my $msg = eval { from_json $buf }; 1398 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1399
934 if (ref $msg) { 1400 if (ref $msg) {
1401 my ($type, $reply, @payload) =
1402 "ARRAY" eq ref $msg
1403 ? @$msg
1404 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405
1406 my @reply;
1407
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1408 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1409 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1410 }
1411
1412 $pl->ext_reply ($reply, @reply)
1413 if $reply;
1414
940 } else { 1415 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1417 }
943 1418
944 cf::override; 1419 cf::override;
945 }, 1420 },
946); 1421);
947 1422
1423# "readahead" all extensions
948sub load_extension { 1424sub cache_extensions {
949 my ($path) = @_; 1425 my $grp = IO::AIO::aio_group;
950 1426
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
952 my $base = $1; 1428 for (grep /\.ext$/, @{$_[0]}) {
953 my $pkg = $1; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 } 1430 }
976 die $@;
977 } 1431 };
978 1432
979 push @EXTS, $pkg; 1433 $grp
980} 1434}
981 1435
982sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1439 cf::sync_job {
1440 my %todo;
1441
983 for my $ext (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1443 next unless -r $path;
985 eval { 1444
986 load_extension $ext; 1445 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1446 my $base = $1;
1447 my $pkg = $1;
1448 $pkg =~ s/[^[:word:]]/_/g;
1449 $pkg = "ext::$pkg";
1450
1451 open my $fh, "<:utf8", $path
1452 or die "$path: $!";
1453
1454 my $source = do { local $/; <$fh> };
1455
1456 my %ext = (
1457 path => $path,
1458 base => $base,
1459 pkg => $pkg,
1460 );
1461
1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1464
1465 $ext{source} =
1466 "package $pkg; use common::sense;\n"
1467 . "#line 1 \"$path\"\n{\n"
1468 . $source
1469 . "\n};\n1";
1470
1471 $todo{$base} = \%ext;
1472 }
1473
1474 my $pass = 0;
1475 my %done;
1476 while (%todo) {
1477 my $progress;
1478
1479 ++$pass;
1480
1481 ext:
1482 while (my ($k, $v) = each %todo) {
1483 for (split /,\s*/, $v->{meta}{depends}) {
1484 next ext
1485 unless exists $done{$_};
1486 }
1487
1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489
1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1493 error "$v->{path}: $@\n";
1494
1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1496 if exists $v->{meta}{mandatory};
1497
1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1507 }
987 1 1508 }
988 } or warn "$ext not loaded: $@"; 1509
1510 unless ($progress) {
1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1518 }
989 } 1519 };
990} 1520}
991 1521
992############################################################################# 1522#############################################################################
993 1523
1524=back
1525
994=head2 CORE EXTENSIONS 1526=head2 CORE EXTENSIONS
995 1527
996Functions and methods that extend core crossfire objects. 1528Functions and methods that extend core deliantra objects.
997 1529
998=cut 1530=cut
999 1531
1000package cf::player; 1532package cf::player;
1001 1533
1002use Coro::AIO; 1534use Coro::AIO;
1003 1535
1004=head3 cf::player 1536=head3 cf::player
1005 1537
1006=over 4 1538=over 4
1539
1540=item cf::player::num_playing
1541
1542Returns the official number of playing players, as per the Crossfire metaserver rules.
1543
1544=cut
1545
1546sub num_playing {
1547 scalar grep
1548 $_->ob->map
1549 && !$_->hidden
1550 && !$_->ob->flag (cf::FLAG_WIZ),
1551 cf::player::list
1552}
1007 1553
1008=item cf::player::find $login 1554=item cf::player::find $login
1009 1555
1010Returns the given player object, loading it if necessary (might block). 1556Returns the given player object, loading it if necessary (might block).
1011 1557
1030 1576
1031sub exists($) { 1577sub exists($) {
1032 my ($login) = @_; 1578 my ($login) = @_;
1033 1579
1034 $cf::PLAYER{$login} 1580 $cf::PLAYER{$login}
1035 or cf::sync_job { !aio_stat path $login } 1581 or !aio_stat path $login
1036} 1582}
1037 1583
1038sub find($) { 1584sub find($) {
1039 return $cf::PLAYER{$_[0]} || do { 1585 return $cf::PLAYER{$_[0]} || do {
1040 my $login = $_[0]; 1586 my $login = $_[0];
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1593 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1594 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1595 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1596 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1597
1052 my $pl = load_pl path $login 1598 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1599 or return;
1600
1601 my $pl = cf::player::load_pl $f
1602 or return;
1603
1604 local $cf::PLAYER_LOADING{$login} = $pl;
1605 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1055 } 1607 }
1056 } 1608 }
1057} 1609}
1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1058 1623
1059sub save($) { 1624sub save($) {
1060 my ($pl) = @_; 1625 my ($pl) = @_;
1061 1626
1062 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1067 return if $pl->{deny_save}; 1632 return if $pl->{deny_save};
1068 1633
1069 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1071 1636
1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1641
1072 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1073 Coro::cede; 1643 cf::cede_to_tick;
1074} 1644}
1075 1645
1076sub new($) { 1646sub new($) {
1077 my ($login) = @_; 1647 my ($login) = @_;
1078 1648
1084 $cf::PLAYER{$login} = $self; 1654 $cf::PLAYER{$login} = $self;
1085 1655
1086 $self 1656 $self
1087} 1657}
1088 1658
1659=item $player->send_msg ($channel, $msg, $color, [extra...])
1660
1661=cut
1662
1663sub send_msg {
1664 my $ns = shift->ns
1665 or return;
1666 $ns->send_msg (@_);
1667}
1668
1089=item $pl->quit_character 1669=item $pl->quit_character
1090 1670
1091Nukes the player without looking back. If logged in, the connection will 1671Nukes the player without looking back. If logged in, the connection will
1092be destroyed. May block for a long time. 1672be destroyed. May block for a long time.
1093 1673
1097 my ($pl) = @_; 1677 my ($pl) = @_;
1098 1678
1099 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1100 1680
1101 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1102 $pl->password ("*"); # this should lock out the player until we nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1103 1683
1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1105 $pl->deactivate; 1685 $pl->deactivate;
1686
1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1106 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1107 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1108 1692
1109 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1110 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1111 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1146 or return []; 1730 or return [];
1147 1731
1148 my @logins; 1732 my @logins;
1149 1733
1150 for my $login (@$dirs) { 1734 for my $login (@$dirs) {
1735 my $path = path $login;
1736
1737 # a .pst is a dead give-away for a valid player
1738 # if no pst file found, open and chekc for blocked users
1739 if (aio_stat "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1740 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1741 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1742 $buf !~ /^password -------------$/m or next; # official not-valid tag
1743 }
1154 1744
1155 utf8::decode $login; 1745 utf8::decode $login;
1156 push @logins, $login; 1746 push @logins, $login;
1157 } 1747 }
1158 1748
1159 \@logins 1749 \@logins
1160} 1750}
1161 1751
1162=item $player->maps 1752=item $player->maps
1753
1754=item cf::player::maps $login
1163 1755
1164Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1165player. May block. 1757player. May block.
1166 1758
1167=cut 1759=cut
1185 } 1777 }
1186 1778
1187 \@paths 1779 \@paths
1188} 1780}
1189 1781
1782=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783
1784Expand deliantra pod fragments into protocol xml.
1785
1190=item $player->ext_reply ($msgid, %msg) 1786=item $player->ext_reply ($msgid, @msg)
1191 1787
1192Sends an ext reply to the player. 1788Sends an ext reply to the player.
1193 1789
1194=cut 1790=cut
1195 1791
1196sub ext_reply($$%) { 1792sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1793 my ($self, $id, @msg) = @_;
1198 1794
1199 $msg{msgid} = $id; 1795 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1796}
1203 1797
1204=item $player->ext_event ($type, %msg) 1798=item $player->ext_msg ($type, @msg)
1205 1799
1206Sends an ext event to the client. 1800Sends an ext event to the client.
1207 1801
1208=cut 1802=cut
1209 1803
1210sub ext_event($$%) { 1804sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1805 my ($self, $type, @msg) = @_;
1212 1806
1213 $self->ns->ext_event ($type, %msg); 1807 $self->ns->ext_msg ($type, @msg);
1214} 1808}
1215 1809
1216=head3 cf::region 1810=head3 cf::region
1217 1811
1218=over 4 1812=over 4
1221 1815
1222package cf::region; 1816package cf::region;
1223 1817
1224=item cf::region::find_by_path $path 1818=item cf::region::find_by_path $path
1225 1819
1226Tries to decuce the probable region for a map knowing only its path. 1820Tries to decuce the likely region for a map knowing only its path.
1227 1821
1228=cut 1822=cut
1229 1823
1230sub find_by_path($) { 1824sub find_by_path($) {
1231 my ($path) = @_; 1825 my ($path) = @_;
1232 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1233 my ($match, $specificity); 1829 my ($match, $specificity);
1234 1830
1235 for my $region (list) { 1831 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1834 if $region->specificity > $specificity;
1239 } 1835 }
1240 } 1836 }
1241 1837
1262our $MAX_RESET = 3600; 1858our $MAX_RESET = 3600;
1263our $DEFAULT_RESET = 3000; 1859our $DEFAULT_RESET = 3000;
1264 1860
1265sub generate_random_map { 1861sub generate_random_map {
1266 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1267 # mit "rum" bekleckern, nicht 1863
1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865
1268 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1269 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1270 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1271 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1272 $rmp->{exit_on_final_map},
1273 $rmp->{xsize}, $rmp->{ysize},
1274 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1275 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1276 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1277 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1278 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1279 (cf::region::find $rmp->{region}), $rmp->{custom}
1280 )
1281} 1867}
1282 1868
1283=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1284 1870
1285Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
1290 1876
1291sub register { 1877sub register {
1292 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1293 my $pkg = caller; 1879 my $pkg = caller;
1294 1880
1295 no strict;
1296 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1297 1882
1298 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1299} 1884}
1300 1885
1301# also paths starting with '/' 1886# also paths starting with '/'
1302$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1303 1888
1304sub thawer_merge { 1889sub thawer_merge {
1305 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1306 1891
1307 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
1308 local $self->{path}; 1893 local $self->{path};
1309 local $self->{load_path}; 1894 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1895
1313 $self->SUPER::thawer_merge ($merge); 1896 $self->SUPER::thawer_merge ($merge);
1314} 1897}
1315 1898
1316sub normalise { 1899sub normalise {
1317 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1318 1901
1319 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1320 1903
1321 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1322 1905
1323 # map plan: 1906 # map plan:
1324 # 1907 #
1339 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1340 $path = "$base/$path"; 1923 $path = "$base/$path";
1341 } 1924 }
1342 1925
1343 for ($path) { 1926 for ($path) {
1344 redo if s{//}{/};
1345 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1346 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1347 } 1929 }
1348 1930
1349 $path 1931 $path
1363 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1364 return $self; 1946 return $self;
1365 } 1947 }
1366 } 1948 }
1367 1949
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1369 () 1951 ()
1370} 1952}
1371 1953
1372sub init { 1954sub init {
1373 my ($self) = @_; 1955 my ($self) = @_;
1395 1977
1396# the temporary/swap location 1978# the temporary/swap location
1397sub save_path { 1979sub save_path {
1398 my ($self) = @_; 1980 my ($self) = @_;
1399 1981
1400 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1982 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1401 "$TMPDIR/$path.map" 1983 "$TMPDIR/$path.map"
1402} 1984}
1403 1985
1404# the unique path, undef == no special unique path 1986# the unique path, undef == no special unique path
1405sub uniq_path { 1987sub uniq_path {
1406 my ($self) = @_; 1988 my ($self) = @_;
1407 1989
1408 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1990 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1409 "$UNIQUEDIR/$path" 1991 "$UNIQUEDIR/$path"
1410} 1992}
1411 1993
1412# and all this just because we cannot iterate over 1994sub decay_objects {
1413# all maps in C++...
1414sub change_all_map_light {
1415 my ($change) = @_; 1995 my ($self) = @_;
1416 1996
1417 $_->change_map_light ($change) 1997 return if $self->{deny_reset};
1418 for grep $_->outdoor, values %cf::MAP; 1998
1999 $self->do_decay_objects;
1419} 2000}
1420 2001
1421sub unlink_save { 2002sub unlink_save {
1422 my ($self) = @_; 2003 my ($self) = @_;
1423 2004
1428 2009
1429sub load_header_from($) { 2010sub load_header_from($) {
1430 my ($self, $path) = @_; 2011 my ($self, $path) = @_;
1431 2012
1432 utf8::encode $path; 2013 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 2014 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 2015 or return;
2016
2017 $self->_load_header ($f)
2018 or return;
2019
2020 local $MAP_LOADING{$self->{path}} = $self;
2021 $f->resolve_delayed_derefs;
1438 2022
1439 $self->{load_path} = $path; 2023 $self->{load_path} = $path;
1440 2024
1441 1 2025 1
1442} 2026}
1481 $self->load_header_orig 2065 $self->load_header_orig
1482 or return; 2066 or return;
1483 $self->prepare_orig; 2067 $self->prepare_orig;
1484 } 2068 }
1485 2069
2070 $self->{deny_reset} = 1
2071 if $self->no_reset;
2072
1486 $self->default_region (cf::region::find_by_path $self->{path}) 2073 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 2074 unless $self->default_region;
1488 2075
1489 1 2076 1
1490} 2077}
1491 2078
1492sub find; 2079sub find;
1493sub find { 2080sub find {
1494 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
1495 2082
2083 cf::cede_to_tick;
2084
1496 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
1497 2086
2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
1499 2089
1500 $cf::MAP{$path} || do { 2090 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path";
1502 my $map = new_from_path cf::map $path 2091 my $map = new_from_path cf::map $path
1503 or return; 2092 or return;
1504 2093
1505 $map->{last_save} = $cf::RUNTIME; 2094 $map->{last_save} = $cf::RUNTIME;
1506 2095
1507 $map->load_header 2096 $map->load_header
1508 or return; 2097 or return;
1509 2098
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2099 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 2100 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 2101 #$cf::WAIT_FOR_TICK->wait;
2102 undef $guard2;
2103 undef $guard1;
1513 $map->reset; 2104 $map->reset;
1514 undef $guard;
1515 return find $path; 2105 return find $path;
1516 } 2106 }
1517 2107
1518 $cf::MAP{$path} = $map 2108 $cf::MAP{$path} = $map
1519 } 2109 }
1520} 2110}
1521 2111
1522sub pre_load { } 2112sub pre_load { }
1523sub post_load { } 2113#sub post_load { } # XS
1524 2114
1525sub load { 2115sub load {
1526 my ($self) = @_; 2116 my ($self) = @_;
1527 2117
1528 local $self->{deny_reset} = 1; # loading can take a long time 2118 local $self->{deny_reset} = 1; # loading can take a long time
1529 2119
1530 my $path = $self->{path}; 2120 my $path = $self->{path};
1531 2121
1532 { 2122 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 2123 my $guard = cf::lock_acquire "map_data:$path";
1534 2124
2125 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 2126 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 2127
1537 $self->in_memory (cf::MAP_LOADING); 2128 $self->in_memory (cf::MAP_LOADING);
1538 2129
1539 $self->alloc; 2130 $self->alloc;
1540 2131
1541 $self->pre_load; 2132 $self->pre_load;
1542 Coro::cede; 2133 cf::cede_to_tick;
1543 2134
2135 my $f = new_from_file cf::object::thawer $self->{load_path};
2136 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 2137 $self->_load_objects ($f)
1545 or return; 2138 or return;
1546 2139
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2140 $self->post_load_original
1548 if delete $self->{load_original}; 2141 if delete $self->{load_original};
1549 2142
1550 if (my $uniq = $self->uniq_path) { 2143 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 2144 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 2145 unless (aio_stat $uniq) {
2146 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 2147 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 2148 $self->_load_objects ($f);
2149 $f->resolve_delayed_derefs;
2150 }
1555 } 2151 }
1556 } 2152 }
1557 2153
1558 Coro::cede; 2154 $f->resolve_delayed_derefs;
2155
2156 cf::cede_to_tick;
1559 # now do the right thing for maps 2157 # now do the right thing for maps
1560 $self->link_multipart_objects; 2158 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 2159 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 2160 unless $self->difficulty;
1563 Coro::cede; 2161 cf::cede_to_tick;
1564 2162
1565 unless ($self->{deny_activate}) { 2163 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 2164 $self->decay_objects;
1567 $self->fix_auto_apply; 2165 $self->fix_auto_apply;
1568 $self->update_buttons; 2166 $self->update_buttons;
1569 Coro::cede; 2167 cf::cede_to_tick;
1570 $self->set_darkness_map;
1571 Coro::cede;
1572 $self->activate; 2168 $self->activate;
1573 } 2169 }
1574 2170
2171 $self->{last_save} = $cf::RUNTIME;
2172 $self->last_access ($cf::RUNTIME);
2173
1575 $self->in_memory (cf::MAP_IN_MEMORY); 2174 $self->in_memory (cf::MAP_ACTIVE);
1576 } 2175 }
1577 2176
1578 $self->post_load; 2177 $self->post_load;
1579}
1580 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
1581sub customise_for { 2185sub customise_for {
1582 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
1583 2187
1584 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 2189 if $self->per_player;
1586 2190
2191# return find "?party/" . $ob->name . "/" . $self->{path}
2192# if $self->per_party;
2193
1587 $self 2194 $self
1588} 2195}
1589 2196
1590# find and load all maps in the 3x3 area around a map 2197# find and load all maps in the 3x3 area around a map
1591sub load_diag { 2198sub load_neighbours {
1592 my ($map) = @_; 2199 my ($map) = @_;
1593 2200
1594 my @diag; # diagonal neighbours 2201 my @neigh; # diagonal neighbours
1595 2202
1596 for (0 .. 3) { 2203 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2204 my $neigh = $map->tile_path ($_)
1598 or next; 2205 or next;
1599 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
1600 or next; 2207 or next;
1601 $neigh->load; 2208 $neigh->load;
1602 2209
2210 # now find the diagonal neighbours
2211 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2214 }
1606 2215
1607 for (@diag) { 2216 for (grep defined $_->[0], @neigh) {
2217 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2218 my $neigh = find $path, $origin
1609 or next; 2219 or next;
1610 $neigh->load; 2220 $neigh->load;
1611 } 2221 }
1612} 2222}
1613 2223
1614sub find_sync { 2224sub find_sync {
1615 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
1616 2226
1617 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
1618} 2231}
1619 2232
1620sub do_load_sync { 2233sub do_load_sync {
1621 my ($map) = @_; 2234 my ($map) = @_;
1622 2235
1623 cf::sync_job { $map->load }; 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237 if $Coro::current == $Coro::main;
2238
2239 $map->load;
1624} 2240}
1625 2241
1626our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
1628 2244
1629sub find_async { 2245sub find_async {
1630 my ($path, $origin) = @_; 2246 my ($path, $origin, $load) = @_;
1631 2247
1632 $path = normalise $path, $origin && $origin->{path}; 2248 $path = normalise $path, $origin && $origin->{path};
1633 2249
1634 if (my $map = $cf::MAP{$path}) { 2250 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2251 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1636 } 2252 }
1637 2253
1638 undef $MAP_PREFETCH{$path}; 2254 $MAP_PREFETCH{$path} |= $load;
2255
1639 $MAP_PREFETCHER ||= cf::async { 2256 $MAP_PREFETCHER ||= cf::async {
2257 $Coro::current->{desc} = "map prefetcher";
2258
1640 while (%MAP_PREFETCH) { 2259 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2260 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2261 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2262 $map->load if $v;
2263 }
1645 2264
1646 delete $MAP_PREFETCH{$path}; 2265 delete $MAP_PREFETCH{$k};
1647 } 2266 }
1648 } 2267 }
1649 undef $MAP_PREFETCHER; 2268 undef $MAP_PREFETCHER;
1650 }; 2269 };
1651 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
1652 2271
1653 () 2272 ()
1654} 2273}
1655 2274
2275# common code, used by both ->save and ->swapout
1656sub save { 2276sub _save {
1657 my ($self) = @_; 2277 my ($self) = @_;
1658
1659 my $lock = cf::lock_acquire "map_data:" . $self->path;
1660 2278
1661 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
1662 2280
1663 return unless $self->dirty; 2281 return unless $self->dirty;
1664 2282
1670 return if $self->{deny_save}; 2288 return if $self->{deny_save};
1671 2289
1672 local $self->{last_access} = $self->last_access;#d# 2290 local $self->{last_access} = $self->last_access;#d#
1673 2291
1674 cf::async { 2292 cf::async {
2293 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2294 $_->contr->save for $self->players;
1676 }; 2295 };
2296
2297 cf::get_slot 0.02;
1677 2298
1678 if ($uniq) { 2299 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2300 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2301 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1681 } else { 2302 } else {
1682 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1683 } 2304 }
1684} 2305}
1685 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
1686sub swap_out { 2315sub swap_out {
1687 my ($self) = @_; 2316 my ($self) = @_;
1688 2317
1689 # save first because save cedes
1690 $self->save;
1691
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2319
2320 return if $self->in_memory != cf::MAP_ACTIVE;
2321 return if $self->{deny_save};
1694 return if $self->players; 2322 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save};
1697 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
1698 $self->clear; 2333 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2334}
1701 2335
1702sub reset_at { 2336sub reset_at {
1703 my ($self) = @_; 2337 my ($self) = @_;
1704 2338
1705 # TODO: safety, remove and allow resettable per-player maps 2339 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 2340 return 1e99 if $self->{deny_reset};
1708 2341
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2344
1722 my ($self) = @_; 2355 my ($self) = @_;
1723 2356
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2358
1726 return if $self->players; 2359 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2360
1729 warn "resetting map ", $self->path;#d# 2361 cf::trace "resetting map ", $self->path, "\n";
1730 2362
1731 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
1732 2364
1733 # need to save uniques path 2365 # need to save uniques path
1734 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
1738 if $uniq; 2370 if $uniq;
1739 } 2371 }
1740 2372
1741 delete $cf::MAP{$self->path}; 2373 delete $cf::MAP{$self->path};
1742 2374
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2377 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2378
1747 $self->unlink_save; 2379 $self->unlink_save;
1748 $self->destroy; 2380 $self->destroy;
1749} 2381}
1750 2382
1751my $nuke_counter = "aaaa"; 2383my $nuke_counter = "aaaa";
1752 2384
1753sub nuke { 2385sub nuke {
1754 my ($self) = @_; 2386 my ($self) = @_;
1755 2387
2388 {
2389 my $lock = cf::lock_acquire "map_data:$self->{path}";
2390
1756 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
1757 2392
1758 $self->unlink_save; 2393 $self->unlink_save;
1759 2394
1760 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
1761 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2400
1766 $cf::MAP{$self->path} = $self; 2401 $cf::MAP{$self->path} = $self;
2402 }
1767 2403
1768 $self->reset; # polite request, might not happen 2404 $self->reset; # polite request, might not happen
2405}
2406
2407=item $maps = cf::map::tmp_maps
2408
2409Returns an arrayref with all map paths of currently instantiated and saved
2410maps. May block.
2411
2412=cut
2413
2414sub tmp_maps() {
2415 [
2416 map {
2417 utf8::decode $_;
2418 /\.map$/
2419 ? normalise $_
2420 : ()
2421 } @{ aio_readdir $TMPDIR or [] }
2422 ]
2423}
2424
2425=item $maps = cf::map::random_maps
2426
2427Returns an arrayref with all map paths of currently instantiated and saved
2428random maps. May block.
2429
2430=cut
2431
2432sub random_maps() {
2433 [
2434 map {
2435 utf8::decode $_;
2436 /\.map$/
2437 ? normalise "?random/$_"
2438 : ()
2439 } @{ aio_readdir $RANDOMDIR or [] }
2440 ]
1769} 2441}
1770 2442
1771=item cf::map::unique_maps 2443=item cf::map::unique_maps
1772 2444
1773Returns an arrayref of paths of all shared maps that have 2445Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2446instantiated unique items. May block.
1775 2447
1776=cut 2448=cut
1777 2449
1778sub unique_maps() { 2450sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2451 [
1780 or return; 2452 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2453 utf8::decode $_;
1786 next if /\.pst$/; 2454 s/\.map$//; # TODO future compatibility hack
1787 next unless /^$PATH_SEP/o; 2455 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1788 2456 ? ()
1789 push @paths, cf::map::normalise $_; 2457 : normalise $_
2458 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2459 ]
1791
1792 \@paths
1793} 2460}
1794 2461
1795package cf; 2462=item cf::map::static_maps
2463
2464Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2465file in the shared directory excluding F</styles> and F</editor>). May
2466block.
2467
2468=cut
2469
2470sub static_maps() {
2471 my @dirs = "";
2472 my @maps;
2473
2474 while (@dirs) {
2475 my $dir = shift @dirs;
2476
2477 next if $dir eq "/styles" || $dir eq "/editor";
2478
2479 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2480 or return;
2481
2482 for (@$files) {
2483 s/\.map$// or next;
2484 utf8::decode $_;
2485 push @maps, "$dir/$_";
2486 }
2487
2488 push @dirs, map "$dir/$_", @$dirs;
2489 }
2490
2491 \@maps
2492}
1796 2493
1797=back 2494=back
1798 2495
1799=head3 cf::object 2496=head3 cf::object
1800 2497
1804 2501
1805=over 4 2502=over 4
1806 2503
1807=item $ob->inv_recursive 2504=item $ob->inv_recursive
1808 2505
1809Returns the inventory of the object _and_ their inventories, recursively. 2506Returns the inventory of the object I<and> their inventories, recursively,
2507but I<not> the object itself.
1810 2508
1811=cut 2509=cut
1812 2510
1813sub inv_recursive_; 2511sub inv_recursive_;
1814sub inv_recursive_ { 2512sub inv_recursive_ {
1817 2515
1818sub inv_recursive { 2516sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2517 inv_recursive_ inv $_[0]
1820} 2518}
1821 2519
2520=item $ref = $ob->ref
2521
2522Creates and returns a persistent reference to an object that can be stored as a string.
2523
2524=item $ob = cf::object::deref ($refstring)
2525
2526returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2527even if the object actually exists. May block.
2528
2529=cut
2530
2531sub deref {
2532 my ($ref) = @_;
2533
2534 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2535 my ($uuid, $name) = ($1, $2);
2536 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2537 or return;
2538 $pl->ob->uuid eq $uuid
2539 or return;
2540
2541 $pl->ob
2542 } else {
2543 warn "$ref: cannot resolve object reference\n";
2544 undef
2545 }
2546}
2547
1822package cf; 2548package cf;
1823 2549
1824=back 2550=back
1825 2551
1826=head3 cf::object::player 2552=head3 cf::object::player
1832Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2558Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1833can be C<undef>. Does the right thing when the player is currently in a 2559can be C<undef>. Does the right thing when the player is currently in a
1834dialogue with the given NPC character. 2560dialogue with the given NPC character.
1835 2561
1836=cut 2562=cut
2563
2564our $SAY_CHANNEL = {
2565 id => "say",
2566 title => "Map",
2567 reply => "say ",
2568 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2569};
2570
2571our $CHAT_CHANNEL = {
2572 id => "chat",
2573 title => "Chat",
2574 reply => "chat ",
2575 tooltip => "Player chat and shouts, global to the server.",
2576};
1837 2577
1838# rough implementation of a future "reply" method that works 2578# rough implementation of a future "reply" method that works
1839# with dialog boxes. 2579# with dialog boxes.
1840#TODO: the first argument must go, split into a $npc->reply_to ( method 2580#TODO: the first argument must go, split into a $npc->reply_to ( method
1841sub cf::object::player::reply($$$;$) { 2581sub cf::object::player::reply($$$;$) {
1843 2583
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2584 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2585
1846 if ($self->{record_replies}) { 2586 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2587 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2588
1848 } else { 2589 } else {
2590 my $pl = $self->contr;
2591
2592 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2593 my $dialog = $pl->{npc_dialog};
2594 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2595
2596 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2597 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2598 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2599 }
1851 } 2600 }
2601}
2602
2603=item $object->send_msg ($channel, $msg, $color, [extra...])
2604
2605=cut
2606
2607sub cf::object::send_msg {
2608 my $pl = shift->contr
2609 or return;
2610 $pl->send_msg (@_);
1852} 2611}
1853 2612
1854=item $player_object->may ("access") 2613=item $player_object->may ("access")
1855 2614
1856Returns wether the given player is authorized to access resource "access" 2615Returns wether the given player is authorized to access resource "access"
1869 2628
1870=item $player_object->enter_link 2629=item $player_object->enter_link
1871 2630
1872Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
1873 2632
1874The player should be reasonably safe there for short amounts of time. You 2633The player should be reasonably safe there for short amounts of time (e.g.
1875I<MUST> call C<leave_link> as soon as possible, though. 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635though, as the player cannot control the character while it is on the link
2636map.
1876 2637
1877Will never block. 2638Will never block.
1878 2639
1879=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
1880 2641
1900sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
1901 my ($self) = @_; 2662 my ($self) = @_;
1902 2663
1903 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
1904 2665
2666 ++$self->{_link_recursion};
2667
1905 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
1906 2669
1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1908 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
1909 2672
1910 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1911} 2674}
1912 2675
1913sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
1914 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
1915 2678
1932 ($x, $y) = (-1, -1) 2695 ($x, $y) = (-1, -1)
1933 unless (defined $x) && (defined $y); 2696 unless (defined $x) && (defined $y);
1934 2697
1935 # use -1 or undef as default coordinates, not 0, 0 2698 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2699 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2700 if $x <= 0 && $y <= 0;
1938 2701
1939 $map->load; 2702 $map->load;
1940 $map->load_diag; 2703 $map->load_neighbours;
1941 2704
1942 return unless $self->contr->active; 2705 return unless $self->contr->active;
1943 $self->activate_recursive;
1944 2706
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
1947} 2709 # entering was successful
2710 delete $self->{_link_recursion};
2711 # only activate afterwards, to support waiting in hooks
2712 $self->activate_recursive;
2713 }
1948 2714
2715}
2716
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
1950 2718
1951Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2722the new (success) or old (failed) map position. In either case, $done will
2723be called at the end of this process.
2724
2725Note that $check will be called with a potentially non-loaded map, so if
2726it needs a loaded map it has to call C<< ->load >>.
1955 2727
1956=cut 2728=cut
1957 2729
1958our $GOTOGEN; 2730our $GOTOGEN;
1959 2731
1960sub cf::object::player::goto { 2732sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
1962 2740
1963 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2743
1966 $self->enter_link; 2744 $self->enter_link;
1967 2745
1968 (async { 2746 (async {
2747 $Coro::current->{desc} = "player::goto $path $x $y";
2748
2749 # *tag paths override both path and x|y
2750 if ($path =~ /^\*(.*)$/) {
2751 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2752 my $ob = $obs[rand @obs];
2753
2754 # see if we actually can go there
2755 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2756 $ob = $obs[rand @obs];
2757 } else {
2758 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2759 }
2760 # else put us there anyways for now #d#
2761
2762 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2763 } else {
2764 ($path, $x, $y) = (undef, undef, undef);
2765 }
2766 }
2767
1969 my $map = eval { 2768 my $map = eval {
1970 my $map = cf::map::find $path; 2769 my $map = defined $path ? cf::map::find $path : undef;
1971 2770
1972 if ($map) { 2771 if ($map) {
1973 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
1975 } else { 2774 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2776 }
1978 2777
1979 $map 2778 $map
1980 }; 2779 };
1981 2780
1986 2785
1987 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
1990 } 2789 }
2790
2791 $done->($self) if $done;
1991 })->prio (1); 2792 })->prio (1);
1992} 2793}
1993 2794
1994=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
1995 2796
2015} 2816}
2016 2817
2017sub prepare_random_map { 2818sub prepare_random_map {
2018 my ($exit) = @_; 2819 my ($exit) = @_;
2019 2820
2020 my $guard = cf::lock_acquire "exit_prepare:$exit";
2021
2022 # all this does is basically replace the /! path by 2821 # all this does is basically replace the /! path by
2023 # a new random map path (?random/...) with a seed 2822 # a new random map path (?random/...) with a seed
2024 # that depends on the exit object 2823 # that depends on the exit object
2025 2824
2026 my $rmp = parse_random_map_params $exit->msg; 2825 my $rmp = parse_random_map_params $exit->msg;
2028 if ($exit->map) { 2827 if ($exit->map) {
2029 $rmp->{region} = $exit->region->name; 2828 $rmp->{region} = $exit->region->name;
2030 $rmp->{origin_map} = $exit->map->path; 2829 $rmp->{origin_map} = $exit->map->path;
2031 $rmp->{origin_x} = $exit->x; 2830 $rmp->{origin_x} = $exit->x;
2032 $rmp->{origin_y} = $exit->y; 2831 $rmp->{origin_y} = $exit->y;
2832
2833 $exit->map->touch;
2033 } 2834 }
2034 2835
2035 $rmp->{random_seed} ||= $exit->random_seed; 2836 $rmp->{random_seed} ||= $exit->random_seed;
2036 2837
2037 my $data = cf::to_json $rmp; 2838 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2038 my $md5 = Digest::MD5::md5_hex $data; 2839 my $md5 = Digest::MD5::md5_hex $data;
2039 my $meta = "$RANDOMDIR/$md5.meta"; 2840 my $meta = "$RANDOMDIR/$md5.meta";
2040 2841
2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2842 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2042 aio_write $fh, 0, (length $data), $data, 0; 2843 aio_write $fh, 0, (length $data), $data, 0;
2043 undef $fh; 2844 undef $fh;
2044 aio_rename "$meta~", $meta; 2845 aio_rename "$meta~", $meta;
2045 2846
2847 my $slaying = "?random/$md5";
2848
2849 if ($exit->valid) {
2046 $exit->slaying ("?random/$md5"); 2850 $exit->slaying ("?random/$md5");
2047 $exit->msg (undef); 2851 $exit->msg (undef);
2852 }
2048 } 2853 }
2049} 2854}
2050 2855
2051sub cf::object::player::enter_exit { 2856sub cf::object::player::enter_exit {
2052 my ($self, $exit) = @_; 2857 my ($self, $exit) = @_;
2053 2858
2054 return unless $self->type == cf::PLAYER; 2859 return unless $self->type == cf::PLAYER;
2055 2860
2056 if ($exit->slaying eq "/!") {
2057 #TODO: this should de-fi-ni-te-ly not be a sync-job
2058 # the problem is that $exit might not survive long enough
2059 # so it needs to be done right now, right here
2060 cf::sync_job { prepare_random_map $exit };
2061 }
2062
2063 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2064 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp;
2066
2067 $self->enter_link; 2861 $self->enter_link;
2068 2862
2069 (async { 2863 (async {
2070 $self->deactivate_recursive; # just to be sure 2864 $Coro::current->{desc} = "enter_exit";
2865
2071 unless (eval { 2866 unless (eval {
2867 $self->deactivate_recursive; # just to be sure
2868
2869 # random map handling
2870 {
2871 my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873 prepare_random_map $exit
2874 if $exit->slaying eq "/!";
2875 }
2876
2877 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2878 my $x = $exit->stats->hp;
2879 my $y = $exit->stats->sp;
2880
2072 $self->goto ($slaying, $hp, $sp); 2881 $self->goto ($map, $x, $y);
2073 2882
2883 # if exit is damned, update players death & WoR home-position
2884 $self->contr->savebed ($map, $x, $y)
2885 if $exit->flag (cf::FLAG_DAMNED);
2886
2074 1; 2887 1
2075 }) { 2888 }) {
2076 $self->message ("Something went wrong deep within the crossfire server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2077 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2078 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2079 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2080 2893
2081 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2082 $self->leave_link; 2895 $self->leave_link;
2083 } 2896 }
2084 })->prio (1); 2897 })->prio (1);
2085} 2898}
2086 2899
2100 2913
2101 utf8::encode $text; 2914 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2915 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2916}
2104 2917
2918=item $client->send_big_packet ($pkt)
2919
2920Like C<send_packet>, but tries to compress large packets, and fragments
2921them as required.
2922
2923=cut
2924
2925our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2926
2927sub cf::client::send_big_packet {
2928 my ($self, $pkt) = @_;
2929
2930 # try lzf for large packets
2931 $pkt = "lzf " . Compress::LZF::compress $pkt
2932 if 1024 <= length $pkt and $self->{can_lzf};
2933
2934 # split very large packets
2935 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2936 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2937 $pkt = "frag";
2938 }
2939
2940 $self->send_packet ($pkt);
2941}
2942
2943=item $client->send_msg ($channel, $msg, $color, [extra...])
2944
2945Send a drawinfo or msg packet to the client, formatting the msg for the
2946client if neccessary. C<$type> should be a string identifying the type of
2947the message, with C<log> being the default. If C<$color> is negative, suppress
2948the message unless the client supports the msg packet.
2949
2950=cut
2951
2952# non-persistent channels (usually the info channel)
2953our %CHANNEL = (
2954 "c/motd" => {
2955 id => "infobox",
2956 title => "MOTD",
2957 reply => undef,
2958 tooltip => "The message of the day",
2959 },
2960 "c/identify" => {
2961 id => "infobox",
2962 title => "Identify",
2963 reply => undef,
2964 tooltip => "Items recently identified",
2965 },
2966 "c/examine" => {
2967 id => "infobox",
2968 title => "Examine",
2969 reply => undef,
2970 tooltip => "Signs and other items you examined",
2971 },
2972 "c/shopinfo" => {
2973 id => "infobox",
2974 title => "Shop Info",
2975 reply => undef,
2976 tooltip => "What your bargaining skill tells you about the shop",
2977 },
2978 "c/book" => {
2979 id => "infobox",
2980 title => "Book",
2981 reply => undef,
2982 tooltip => "The contents of a note or book",
2983 },
2984 "c/lookat" => {
2985 id => "infobox",
2986 title => "Look",
2987 reply => undef,
2988 tooltip => "What you saw there",
2989 },
2990 "c/who" => {
2991 id => "infobox",
2992 title => "Players",
2993 reply => undef,
2994 tooltip => "Shows players who are currently online",
2995 },
2996 "c/body" => {
2997 id => "infobox",
2998 title => "Body Parts",
2999 reply => undef,
3000 tooltip => "Shows which body parts you posess and are available",
3001 },
3002 "c/statistics" => {
3003 id => "infobox",
3004 title => "Statistics",
3005 reply => undef,
3006 tooltip => "Shows your primary statistics",
3007 },
3008 "c/skills" => {
3009 id => "infobox",
3010 title => "Skills",
3011 reply => undef,
3012 tooltip => "Shows your experience per skill and item power",
3013 },
3014 "c/shopitems" => {
3015 id => "infobox",
3016 title => "Shop Items",
3017 reply => undef,
3018 tooltip => "Shows the items currently for sale in this shop",
3019 },
3020 "c/resistances" => {
3021 id => "infobox",
3022 title => "Resistances",
3023 reply => undef,
3024 tooltip => "Shows your resistances",
3025 },
3026 "c/pets" => {
3027 id => "infobox",
3028 title => "Pets",
3029 reply => undef,
3030 tooltip => "Shows information abotu your pets/a specific pet",
3031 },
3032 "c/perceiveself" => {
3033 id => "infobox",
3034 title => "Perceive Self",
3035 reply => undef,
3036 tooltip => "You gained detailed knowledge about yourself",
3037 },
3038 "c/uptime" => {
3039 id => "infobox",
3040 title => "Uptime",
3041 reply => undef,
3042 tooltip => "How long the server has been running since last restart",
3043 },
3044 "c/mapinfo" => {
3045 id => "infobox",
3046 title => "Map Info",
3047 reply => undef,
3048 tooltip => "Information related to the maps",
3049 },
3050 "c/party" => {
3051 id => "party",
3052 title => "Party",
3053 reply => "gsay ",
3054 tooltip => "Messages and chat related to your party",
3055 },
3056 "c/death" => {
3057 id => "death",
3058 title => "Death",
3059 reply => undef,
3060 tooltip => "Reason for and more info about your most recent death",
3061 },
3062 "c/say" => $SAY_CHANNEL,
3063 "c/chat" => $CHAT_CHANNEL,
3064);
3065
3066sub cf::client::send_msg {
3067 my ($self, $channel, $msg, $color, @extra) = @_;
3068
3069 $msg = $self->pl->expand_cfpod ($msg)
3070 unless $color & cf::NDI_VERBATIM;
3071
3072 $color &= cf::NDI_CLIENT_MASK; # just in case...
3073
3074 # check predefined channels, for the benefit of C
3075 if ($CHANNEL{$channel}) {
3076 $channel = $CHANNEL{$channel};
3077
3078 $self->ext_msg (channel_info => $channel);
3079 $channel = $channel->{id};
3080
3081 } elsif (ref $channel) {
3082 # send meta info to client, if not yet sent
3083 unless (exists $self->{channel}{$channel->{id}}) {
3084 $self->{channel}{$channel->{id}} = $channel;
3085 $self->ext_msg (channel_info => $channel);
3086 }
3087
3088 $channel = $channel->{id};
3089 }
3090
3091 return unless @extra || length $msg;
3092
3093 # default colour, mask it out
3094 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3095 if $color & cf::NDI_DEF;
3096
3097 my $pkt = "msg "
3098 . $self->{json_coder}->encode (
3099 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3100 );
3101
3102 $self->send_big_packet ($pkt);
3103}
3104
2105=item $client->ext_event ($type, %msg) 3105=item $client->ext_msg ($type, @msg)
2106 3106
2107Sends an exti event to the client. 3107Sends an ext event to the client.
2108 3108
2109=cut 3109=cut
2110 3110
2111sub cf::client::ext_event($$%) { 3111sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 3112 my ($self, $type, @msg) = @_;
2113 3113
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 3117 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 3118 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119 }
3120}
3121
3122=item $client->ext_reply ($msgid, @msg)
3123
3124Sends an ext reply to the client.
3125
3126=cut
3127
3128sub cf::client::ext_reply($$@) {
3129 my ($self, $id, @msg) = @_;
3130
3131 if ($self->extcmd == 2) {
3132 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133 } elsif ($self->extcmd == 1) {
3134 #TODO: version 1, remove
3135 unshift @msg, msgtype => "reply", msgid => $id;
3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137 }
2116} 3138}
2117 3139
2118=item $success = $client->query ($flags, "text", \&cb) 3140=item $success = $client->query ($flags, "text", \&cb)
2119 3141
2120Queues a query to the client, calling the given callback with 3142Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3143the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3144C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 3145
2124Queries can fail, so check the return code. Or don't, as queries will become 3146Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 3147become reliable at some point in the future.
2126 3148
2127=cut 3149=cut
2128 3150
2129sub cf::client::query { 3151sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 3152 my ($self, $flags, $text, $cb) = @_;
2138 utf8::encode $text; 3160 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3161 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 3162
2141 $self->send_packet ($self->{query_queue}[0][0]) 3163 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 3164 if @{ $self->{query_queue} } == 1;
3165
3166 1
2143} 3167}
2144 3168
2145cf::client->attach ( 3169cf::client->attach (
3170 on_connect => sub {
3171 my ($ns) = @_;
3172
3173 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3174 },
2146 on_reply => sub { 3175 on_reply => sub {
2147 my ($ns, $msg) = @_; 3176 my ($ns, $msg) = @_;
2148 3177
2149 # this weird shuffling is so that direct followup queries 3178 # this weird shuffling is so that direct followup queries
2150 # get handled first 3179 # get handled first
2162 } else { 3191 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3192 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 3193 }
2165 } 3194 }
2166 }, 3195 },
3196 on_exticmd => sub {
3197 my ($ns, $buf) = @_;
3198
3199 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200
3201 if (ref $msg) {
3202 my ($type, $reply, @payload) =
3203 "ARRAY" eq ref $msg
3204 ? @$msg
3205 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206
3207 my @reply;
3208
3209 if (my $cb = $EXTICMD{$type}) {
3210 @reply = $cb->($ns, @payload);
3211 }
3212
3213 $ns->ext_reply ($reply, @reply)
3214 if $reply;
3215
3216 } else {
3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3218 }
3219
3220 cf::override;
3221 },
2167); 3222);
2168 3223
2169=item $client->async (\&cb) 3224=item $client->async (\&cb)
2170 3225
2171Create a new coroutine, running the specified callback. The coroutine will 3226Create a new coroutine, running the specified callback. The coroutine will
2187 3242
2188 $coro 3243 $coro
2189} 3244}
2190 3245
2191cf::client->attach ( 3246cf::client->attach (
2192 on_destroy => sub { 3247 on_client_destroy => sub {
2193 my ($ns) = @_; 3248 my ($ns) = @_;
2194 3249
2195 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2196 }, 3251 },
2197); 3252);
2212our $safe = new Safe "safe"; 3267our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 3268our $safe_hole = new Safe::Hole;
2214 3269
2215$SIG{FPE} = 'IGNORE'; 3270$SIG{FPE} = 'IGNORE';
2216 3271
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3272$safe->permit_only (Opcode::opset qw(
3273 :base_core :base_mem :base_orig :base_math :base_loop
3274 grepstart grepwhile mapstart mapwhile
3275 sort time
3276));
2218 3277
2219# here we export the classes and methods available to script code 3278# here we export the classes and methods available to script code
2220 3279
2221=pod 3280=pod
2222 3281
2223The following functions and methods are available within a safe environment: 3282The following functions and methods are available within a safe environment:
2224 3283
2225 cf::object contr pay_amount pay_player map 3284 cf::object
3285 contr pay_amount pay_player map x y force_find force_add destroy
3286 insert remove name archname title slaying race decrease split
3287 value
3288
2226 cf::object::player player 3289 cf::object::player
2227 cf::player peaceful 3290 player
2228 cf::map trigger 3291
3292 cf::player
3293 peaceful
3294
3295 cf::map
3296 trigger
2229 3297
2230=cut 3298=cut
2231 3299
2232for ( 3300for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 3301 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3302 insert remove inv nrof name archname title slaying race
3303 decrease split destroy change_exp value msg lore send_msg)],
2234 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 3305 ["cf::player" => qw(peaceful send_msg)],
2236 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
2237) { 3307) {
2238 no strict 'refs';
2239 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
2240 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2241 for @funs; 3310 for @funs;
2242} 3311}
2243 3312
2258 3327
2259 my $qcode = $code; 3328 my $qcode = $code;
2260 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3329 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2261 $qcode =~ s/\n/\\n/g; 3330 $qcode =~ s/\n/\\n/g;
2262 3331
3332 %vars = (_dummy => 0) unless %vars;
3333
3334 my @res;
2263 local $_; 3335 local $_;
2264 local @safe::cf::_safe_eval_args = values %vars;
2265 3336
2266 my $eval = 3337 my $eval =
2267 "do {\n" 3338 "do {\n"
2268 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3339 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2269 . "#line 0 \"{$qcode}\"\n" 3340 . "#line 0 \"{$qcode}\"\n"
2270 . $code 3341 . $code
2271 . "\n}" 3342 . "\n}"
2272 ; 3343 ;
2273 3344
3345 if ($CFG{safe_eval}) {
2274 sub_generation_inc; 3346 sub_generation_inc;
3347 local @safe::cf::_safe_eval_args = values %vars;
2275 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3348 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2276 sub_generation_inc; 3349 sub_generation_inc;
3350 } else {
3351 local @cf::_safe_eval_args = values %vars;
3352 @res = wantarray ? eval eval : scalar eval $eval;
3353 }
2277 3354
2278 if ($@) { 3355 if ($@) {
2279 warn "$@"; 3356 warn "$@",
2280 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
2281 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
2282 } 3359 }
2283 3360
2284 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
2285} 3362}
2286 3363
2300=cut 3377=cut
2301 3378
2302sub register_script_function { 3379sub register_script_function {
2303 my ($fun, $cb) = @_; 3380 my ($fun, $cb) = @_;
2304 3381
2305 no strict 'refs'; 3382 $fun = "safe::$fun" if $CFG{safe_eval};
2306 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3383 *$fun = $safe_hole->wrap ($cb);
2307} 3384}
2308 3385
2309=back 3386=back
2310 3387
2311=cut 3388=cut
2312
2313#############################################################################
2314
2315=head2 EXTENSION DATABASE SUPPORT
2316
2317Crossfire maintains a very simple database for extension use. It can
2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2319convert to/from binary).
2320
2321The parameter C<$family> should best start with the name of the extension
2322using it, it should be unique.
2323
2324=over 4
2325
2326=item $value = cf::db_get $family => $key
2327
2328Returns a single value from the database.
2329
2330=item cf::db_put $family => $key => $value
2331
2332Stores the given C<$value> in the family.
2333
2334=cut
2335
2336our $DB;
2337
2338sub db_init {
2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2341
2342 cf::sync_job {
2343 eval {
2344 $DB->set_flags (BDB::CHKSUM);
2345
2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2348 cf::cleanup "db_open(db): $!" if $!;
2349 };
2350 cf::cleanup "db_open(db): $@" if $@;
2351 };
2352 }
2353}
2354
2355sub db_get($$) {
2356 my $key = "$_[0]/$_[1]";
2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2366sub db_put($$$) {
2367 BDB::dbreq_pri 4;
2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2483}
2484 3389
2485############################################################################# 3390#############################################################################
2486# the server's init and main functions 3391# the server's init and main functions
2487 3392
2488sub load_facedata($) { 3393sub load_facedata($) {
2489 my ($path) = @_; 3394 my ($path) = @_;
2490 3395
3396 # HACK to clear player env face cache, we need some signal framework
3397 # for this (global event?)
3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401
2491 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
2492 3403
2493 my $facedata;
2494 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
2495 or die "$path: $!"; 3405 or die "$path: $!";
2496 3406
2497 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
2498 3408
2499 $facedata->{version} == 2 3409 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3410 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3411
3412 # patch in the exptable
3413 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414 $facedata->{resource}{"res/exp_table"} = {
3415 type => FT_RSRC,
3416 data => $exp_table,
3417 hash => (Digest::MD5::md5 $exp_table),
3418 };
3419 cf::cede_to_tick;
3420
2502 { 3421 {
2503 my $faces = $facedata->{faceinfo}; 3422 my $faces = $facedata->{faceinfo};
2504 3423
2505 while (my ($face, $info) = each %$faces) { 3424 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3425 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3428 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2510 Coro::cede; 3431 cf::face::set_data $idx, 2, "-", chr $idx & 255;
3432
3433 cf::cede_to_tick;
2511 } 3434 }
2512 3435
2513 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3437 next unless $info->{smooth};
3438
2515 my $idx = cf::face::find $face 3439 my $idx = cf::face::find $face
2516 or next; 3440 or next;
3441
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3443 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3445 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3447 }
2522 Coro::cede; 3448
3449 cf::cede_to_tick;
2523 } 3450 }
2524 } 3451 }
2525 3452
2526 { 3453 {
2527 my $anims = $facedata->{animinfo}; 3454 my $anims = $facedata->{animinfo};
2528 3455
2529 while (my ($anim, $info) = each %$anims) { 3456 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3457 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3458 cf::cede_to_tick;
2532 } 3459 }
2533 3460
2534 cf::anim::invalidate_all; # d'oh 3461 cf::anim::invalidate_all; # d'oh
2535 } 3462 }
2536 3463
3464 {
3465 my $res = $facedata->{resource};
3466
3467 while (my ($name, $info) = each %$res) {
3468 if (defined $info->{type}) {
3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3470
3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472 cf::face::set_type $idx, $info->{type};
3473 } else {
3474 $RESOURCE{$name} = $info; # unused
3475 }
3476
3477 cf::cede_to_tick;
3478 }
3479 }
3480
3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3482
2537 1 3483 1
2538} 3484}
2539 3485
3486register_exticmd fx_want => sub {
3487 my ($ns, $want) = @_;
3488
3489 while (my ($k, $v) = each %$want) {
3490 $ns->fx_want ($k, $v);
3491 }
3492};
3493
3494sub load_resource_file($) {
3495 my $guard = lock_acquire "load_resource_file";
3496
3497 my $status = load_resource_file_ $_[0];
3498 get_slot 0.1, 100;
3499 cf::arch::commit_load;
3500
3501 $status
3502}
3503
2540sub reload_regions { 3504sub reload_regions {
3505 # HACK to clear player env face cache, we need some signal framework
3506 # for this (global event?)
3507 %ext::player_env::MUSIC_FACE_CACHE = ();
3508
2541 load_resource_file "$MAPDIR/regions" 3509 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3510 or die "unable to load regions file\n";
3511
3512 for (cf::region::list) {
3513 $_->{match} = qr/$_->{match}/
3514 if exists $_->{match};
3515 }
2543} 3516}
2544 3517
2545sub reload_facedata { 3518sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3519 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3520 or die "unable to load facedata\n";
2555sub reload_treasures { 3528sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
2558} 3531}
2559 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
2560sub reload_resources { 3556sub reload_resources {
2561 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
2562 3558
3559 reload_exp_table;
3560 reload_materials;
3561 reload_facedata;
3562 reload_sound;
3563 reload_archetypes;
2563 reload_regions; 3564 reload_regions;
2564 reload_facedata;
2565 reload_archetypes;
2566 reload_treasures; 3565 reload_treasures;
2567 3566
2568 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
2569} 3568}
2570 3569
2571sub init { 3570sub reload_config {
2572 reload_resources; 3571 trace "reloading config file...\n";
2573}
2574 3572
2575sub cfg_load { 3573 0 < aio_load "$CONFDIR/config", my $config
2576 open my $fh, "<:utf8", "$CONFDIR/config" 3574 or die "$CONFDIR/config: $!";
2577 or return;
2578 3575
2579 local $/; 3576 utf8::decode $config;
2580 *CFG = YAML::Syck::Load <$fh>; 3577 *CFG = yaml_load $config;
2581 3578
2582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2583 3580
2584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2586 3583
2587 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
2591 }; 3588 };
2592 warn $@ if $@; 3589 warn $@ if $@;
2593 } 3590 }
2594} 3591}
2595 3592
3593sub pidfile() {
3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3595 or die "$PIDFILE: $!";
3596 flock $fh, &Fcntl::LOCK_EX
3597 or die "$PIDFILE: flock: $!";
3598 $fh
3599}
3600
3601# make sure only one server instance is running at any one time
3602sub atomic {
3603 my $fh = pidfile;
3604
3605 my $pid = <$fh>;
3606 kill 9, $pid if $pid > 0;
3607
3608 seek $fh, 0, 0;
3609 print $fh $$;
3610}
3611
3612sub main_loop {
3613 trace "EV::loop starting\n";
3614 if (1) {
3615 EV::loop;
3616 }
3617 trace "EV::loop returned\n";
3618 goto &main_loop unless $REALLY_UNLOOP;
3619}
3620
2596sub main { 3621sub main {
3622 cf::init_globals; # initialise logging
3623
3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628
3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630
2597 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
2598 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
2599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3633 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2600 (async { 3634 (async {
2601 Event::one_event; 3635 $Coro::current->{desc} = "IDLE BUG HANDLER";
3636 EV::loop EV::LOOP_ONESHOT;
2602 })->prio (Coro::PRIO_MAX); 3637 })->prio (Coro::PRIO_MAX);
2603 }; 3638 };
2604 3639
2605 cfg_load; 3640 evthread_start IO::AIO::poll_fileno;
3641
3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3649 cf::load_settings;
3650
3651 reload_resources;
3652 reload_config;
2606 db_init; 3653 db_init;
3654
3655 cf::init_uuid;
3656 cf::init_signals;
3657 cf::init_skills;
3658
3659 cf::init_beforeplay;
3660
3661 atomic;
3662
2607 load_extensions; 3663 load_extensions;
2608 3664
2609 $TICK_WATCHER->start; 3665 utime time, time, $RUNTIMEFILE;
2610 Event::loop; 3666
3667 # no (long-running) fork's whatsoever before this point(!)
3668 use POSIX ();
3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3670
3671 cf::_post_init 0;
3672 };
3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3682 goto &main_loop;
2611} 3683}
2612 3684
2613############################################################################# 3685#############################################################################
2614# initialisation and cleanup 3686# initialisation and cleanup
2615 3687
2616# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
2617BEGIN { 3689BEGIN {
3690 our %SIGWATCHER = ();
2618 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
2619 Event->signal ( 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2620 reentrant => 0,
2621 data => WF_AUTOCANCEL,
2622 signal => $signal,
2623 prio => 0,
2624 cb => sub {
2625 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
2626 },
2627 ); 3694 };
3695 }
3696}
3697
3698sub write_runtime_sync {
3699 my $t0 = AE::time;
3700
3701 # first touch the runtime file to show we are still running:
3702 # the fsync below can take a very very long time.
3703
3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3705
3706 my $guard = cf::lock_acquire "write_runtime";
3707
3708 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3709 or return;
3710
3711 my $value = $cf::RUNTIME + 90 + 10;
3712 # 10 is the runtime save interval, for a monotonic clock
3713 # 60 allows for the watchdog to kill the server.
3714
3715 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3716 and return;
3717
3718 # always fsync - this file is important
3719 aio_fsync $fh
3720 and return;
3721
3722 # touch it again to show we are up-to-date
3723 aio_utime $fh, undef, undef;
3724
3725 close $fh
3726 or return;
3727
3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3729 and return;
3730
3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3732
2628 } 3733 1
3734}
3735
3736our $uuid_lock;
3737our $uuid_skip;
3738
3739sub write_uuid_sync($) {
3740 $uuid_skip ||= $_[0];
3741
3742 return if $uuid_lock;
3743 local $uuid_lock = 1;
3744
3745 my $uuid = "$LOCALDIR/uuid";
3746
3747 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3748 or return;
3749
3750 my $value = uuid_seq uuid_cur;
3751
3752 unless ($value) {
3753 info "cowardly refusing to write zero uuid value!\n";
3754 return;
3755 }
3756
3757 my $value = uuid_str $value + $uuid_skip;
3758 $uuid_skip = 0;
3759
3760 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3761 and return;
3762
3763 # always fsync - this file is important
3764 aio_fsync $fh
3765 and return;
3766
3767 close $fh
3768 or return;
3769
3770 aio_rename "$uuid~", $uuid
3771 and return;
3772
3773 trace "uuid file written ($value).\n";
3774
3775 1
3776
3777}
3778
3779sub write_uuid($$) {
3780 my ($skip, $sync) = @_;
3781
3782 $sync ? write_uuid_sync $skip
3783 : async { write_uuid_sync $skip };
2629} 3784}
2630 3785
2631sub emergency_save() { 3786sub emergency_save() {
2632 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
2633 3788
2634 warn "enter emergency perl save\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
2635 3795
2636 cf::sync_job { 3796 cf::sync_job {
3797 cf::write_runtime_sync; # external watchdog should not bark
3798
2637 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
2638 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
2639 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
2640 warn "begin emergency player save\n"; 3802 info "emergency_perl_save: begin player save\n";
2641 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
2642 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
2643 $pl->valid or next; 3805 $pl->valid or next;
3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2644 $pl->save; 3807 $pl->save;
2645 } 3808 }
2646 warn "end emergency player save\n"; 3809 info "emergency_perl_save: end player save\n";
2647 3810
2648 warn "begin emergency map save\n"; 3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3813 info "emergency_perl_save: begin map save\n";
2649 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
2650 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
2651 $map->valid or next; 3816 $map->valid or next;
2652 $map->save; 3817 $map->save;
2653 } 3818 }
2654 warn "end emergency map save\n"; 3819 info "emergency_perl_save: end map save\n";
2655 3820
2656 warn "begin emergency database checkpoint\n"; 3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3823 info "emergency_perl_save: begin database checkpoint\n";
2657 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
2658 warn "end emergency database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3826
3827 info "emergency_perl_save: begin write uuid\n";
3828 write_uuid_sync 1;
3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
2659 }; 3849 };
2660 3850
2661 warn "leave emergency perl save\n"; 3851 info "emergency_perl_save: leave\n";
2662} 3852}
2663 3853
2664sub post_cleanup { 3854sub post_cleanup {
2665 my ($make_core) = @_; 3855 my ($make_core) = @_;
2666 3856
3857 IO::AIO::flush;
3858
2667 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
2668 if $make_core; 3860 if $make_core;
3861
3862 my $fh = pidfile;
3863 unlink $PIDFILE if <$fh> == $$;
3864}
3865
3866# a safer delete_package, copied from Symbol
3867sub clear_package($) {
3868 my $pkg = shift;
3869
3870 # expand to full symbol table name if needed
3871 unless ($pkg =~ /^main::.*::$/) {
3872 $pkg = "main$pkg" if $pkg =~ /^::/;
3873 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3874 $pkg .= '::' unless $pkg =~ /::$/;
3875 }
3876
3877 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3878 my $stem_symtab = *{$stem}{HASH};
3879
3880 defined $stem_symtab and exists $stem_symtab->{$leaf}
3881 or return;
3882
3883 # clear all symbols
3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3885 for my $name (keys %$leaf_symtab) {
3886 _gv_clear *{"$pkg$name"};
3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3888 }
2669} 3889}
2670 3890
2671sub do_reload_perl() { 3891sub do_reload_perl() {
2672 # can/must only be called in main 3892 # can/must only be called in main
2673 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
2674 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
2675 return; 3895 return;
2676 } 3896 }
2677 3897
2678 warn "reloading..."; 3898 return if $RELOAD++;
2679 3899
2680 warn "entering sync_job"; 3900 my $t1 = AE::time;
2681 3901
3902 while ($RELOAD) {
3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3905
3906 trace "perl_reload: entering sync_job";
3907
2682 cf::sync_job { 3908 cf::sync_job {
2683 cf::write_runtime; # external watchdog should not bark
2684 cf::emergency_save; 3909 #cf::emergency_save;
2685 cf::write_runtime; # external watchdog should not bark
2686 3910
2687 warn "syncing database to disk";
2688 BDB::db_env_txn_checkpoint $DB_ENV;
2689
2690 # if anything goes wrong in here, we should simply crash as we already saved
2691
2692 warn "cancelling all WF_AUTOCANCEL watchers";
2693 for (Event::all_watchers) {
2694 $_->cancel if $_->data & WF_AUTOCANCEL;
2695 }
2696
2697 warn "flushing outstanding aio requests";
2698 for (;;) {
2699 BDB::flush;
2700 IO::AIO::flush;
2701 Coro::cede;
2702 last unless IO::AIO::nreqs || BDB::nreqs;
2703 warn "iterate...";
2704 }
2705
2706 ++$RELOAD;
2707
2708 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
2709 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
2710 %EXT_CORO = (); 3913 %EXT_CORO = ();
2711 3914
2712 warn "removing commands"; 3915 trace "perl_reload: removing commands";
2713 %COMMAND = (); 3916 %COMMAND = ();
2714 3917
2715 warn "removing ext commands"; 3918 trace "perl_reload: removing ext/exti commands";
2716 %EXTCMD = (); 3919 %EXTCMD = ();
3920 %EXTICMD = ();
2717 3921
2718 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
2719 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
2720 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
2721 3925
2722 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
2723 eval { 3927 eval {
2724 $cb->($pkg); 3928 $cb->($pkg);
2725 1 3929 1
2726 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3931 }
3932
3933 trace "... clearing $pkg";
3934 clear_package $pkg;
2727 } 3935 }
2728 3936
2729 warn "... nuking $pkg";
2730 Symbol::delete_package $pkg;
2731 }
2732
2733 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2734 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
2735 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2736 3940
2737 warn "... unloading $k"; 3941 trace "... unloading $k";
2738 delete $INC{$k}; 3942 delete $INC{$k};
2739 3943
2740 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
2741 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
2742 3946
2743 if (my $cb = $k->can ("unload_module")) { 3947 if (my $cb = $k->can ("unload_module")) {
2744 $cb->(); 3948 $cb->();
3949 }
3950
3951 clear_package $k;
2745 } 3952 }
2746 3953
2747 Symbol::delete_package $k;
2748 }
2749
2750 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
2751 Symbol::delete_package "safe::$_" 3955 clear_package "safe::$_"
2752 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2753 3957
2754 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
2755 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
2756 delete $INC{"cf/pod.pm"}; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2757 3961
2758 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
2759 # and global variables created in xs 3963 # and global variables created in xs
2760 #Symbol::delete_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
2761 3965
2762 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
2763 3967
2764 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
2765 require cf; 3969 require cf;
2766 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3970 cf::_connect_to_perl_1;
2767 3971
2768 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
2769 cf::cfg_load; 3973 cf::reload_config;
2770 3974
2771 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
2772 cf::load_extensions; 3976 cf::load_extensions;
2773 3977
3978 if ($REATTACH_ON_RELOAD) {
2774 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
2775 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
2776 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
2777 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
2778 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
2779 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3985 }
2780 3986
2781 warn "leaving sync_job"; 3987 cf::_post_init 1;
2782 3988
3989 trace "perl_reload: leaving sync_job";
3990
2783 1 3991 1
2784 } or do { 3992 } or do {
2785 warn $@; 3993 error $@;
2786 warn "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
2787 exit 1; 3995 };
3996
3997 --$RELOAD;
2788 }; 3998 }
2789 3999
2790 warn "reloaded"; 4000 $t1 = AE::time - $t1;
4001 info "perl_reload: completed in ${t1}s\n";
2791}; 4002};
2792 4003
2793our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
2794 4005
2795sub reload_perl() { 4006sub reload_perl() {
2796 # doing reload synchronously and two reloads happen back-to-back, 4007 # doing reload synchronously and two reloads happen back-to-back,
2797 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
2798 4009
2799 $RELOAD_WATCHER ||= Event->timer ( 4010 $RELOAD_WATCHER ||= cf::async {
2800 reentrant => 0, 4011 Coro::AIO::aio_wait cache_extensions;
2801 after => 0, 4012
2802 data => WF_AUTOCANCEL, 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2803 cb => sub {
2804 do_reload_perl; 4014 do_reload_perl;
2805 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
2806 }, 4016 };
2807 ); 4017 };
2808} 4018}
2809 4019
2810register_command "reload" => sub { 4020register_command "reload" => sub {
2811 my ($who, $arg) = @_; 4021 my ($who, $arg) = @_;
2812 4022
2813 if ($who->flag (FLAG_WIZ)) { 4023 if ($who->flag (FLAG_WIZ)) {
2814 $who->message ("reloading server."); 4024 $who->message ("reloading server.");
4025 async {
4026 $Coro::current->{desc} = "perl_reload";
2815 async { reload_perl }; 4027 reload_perl;
4028 };
2816 } 4029 }
2817}; 4030};
2818 4031
2819unshift @INC, $LIBDIR; 4032#############################################################################
2820 4033
2821my $bug_warning = 0; 4034my $bug_warning = 0;
2822 4035
2823our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
2824our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
2825 4038
2826sub wait_for_tick { 4039sub wait_for_tick() {
2827 return unless $TICK_WATCHER->is_active;
2828 return if $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2829 4041
2830 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
2831 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
2832 $signal->wait; 4044 $signal->wait;
2833} 4045}
2834 4046
2835sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
2836 return unless $TICK_WATCHER->is_active;
2837 return if $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2838 4049
2839 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
2841 $signal->wait; 4052 $signal->wait;
2842} 4053}
2843 4054
2844 my $min = 1e6;#d# 4055sub tick {
2845 my $avg = 10;
2846$TICK_WATCHER = Event->timer (
2847 reentrant => 0,
2848 parked => 1,
2849 prio => 0,
2850 at => $NEXT_TICK || $TICK,
2851 data => WF_AUTOCANCEL,
2852 cb => sub {
2853 if ($Coro::current != $Coro::main) { 4056 if ($Coro::current != $Coro::main) {
2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4057 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2855 unless ++$bug_warning > 10; 4058 unless ++$bug_warning > 10;
2856 return; 4059 return;
2857 } 4060 }
2858 4061
2859 $NOW = $tick_start = Event::time;
2860
2861 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
2862 4063
2863 0 && sync_job {#d# 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2864 for(1..10) {
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868 4065
2869 $map->width (50); 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2870 $map->height (50); 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2871 $map->alloc; 4068 Coro::async_pool {
2872 $map->_load_objects ("/tmp/x.map", 1); 4069 $Coro::current->{desc} = "runtime saver";
2873 my $t = Event::time - $t; 4070 write_runtime_sync
2874 4071 or error "ERROR: unable to write runtime file: $!";
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 }; 4072 };
4073 }
2885 4074
2886 $RUNTIME += $TICK;
2887 $NEXT_TICK += $TICK;
2888
2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
2891 Coro::async_pool {
2892 write_runtime
2893 or warn "ERROR: unable to write runtime file: $!";
2894 };
2895 }
2896
2897# my $AFTER = Event::time;
2898# warn $AFTER - $NOW;#d#
2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send; 4076 $sig->send;
2902 } 4077 }
2903 while (my $sig = shift @WAIT_FOR_TICK) { 4078 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send; 4079 $sig->send;
2905 } 4080 }
2906 4081
2907 $NOW = Event::time; 4082 $LOAD = ($NOW - $TICK_START) / $TICK;
2908
2909 # if we are delayed by four ticks or more, skip them all
2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2911
2912 $TICK_WATCHER->at ($NEXT_TICK);
2913 $TICK_WATCHER->start;
2914
2915 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4083 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917 4084
2918 _post_tick; 4085 if (0) {
2919 4086 if ($NEXT_TICK) {
2920 4087 my $jitter = $TICK_START - $NEXT_TICK;
4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4089 debug "jitter $JITTER\n";#d#
4090 }
2921 }, 4091 }
2922); 4092}
2923 4093
2924{ 4094{
2925 BDB::max_poll_time $TICK * 0.1; 4095 # configure BDB
2926 $BDB_POLL_WATCHER = Event->io ( 4096
2927 reentrant => 0,
2928 fd => BDB::poll_fileno,
2929 poll => 'r',
2930 prio => 0,
2931 data => WF_AUTOCANCEL,
2932 cb => \&BDB::poll_cb,
2933 );
2934 BDB::min_parallel 8; 4097 BDB::min_parallel 16;
2935 4098 BDB::max_poll_reqs $TICK * 0.1;
2936 BDB::set_sync_prepare { 4099 $AnyEvent::BDB::WATCHER->priority (1);
2937 my $status;
2938 my $current = $Coro::current;
2939 (
2940 sub {
2941 $status = $!;
2942 $current->ready; undef $current;
2943 },
2944 sub {
2945 Coro::schedule while defined $current;
2946 $! = $status;
2947 },
2948 )
2949 };
2950 4100
2951 unless ($DB_ENV) { 4101 unless ($DB_ENV) {
2952 $DB_ENV = BDB::db_env_create; 4102 $DB_ENV = BDB::db_env_create;
4103 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4105 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4106 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4107 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2953 4108
2954 cf::sync_job { 4109 cf::sync_job {
2955 eval { 4110 eval {
2956 BDB::db_env_open 4111 BDB::db_env_open
2957 $DB_ENV, 4112 $DB_ENV,
2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4114 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4115 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2961 0666; 4116 0666;
2962 4117
2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4118 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2964
2965 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2966 $DB_ENV->set_lk_detect;
2967 }; 4119 };
2968 4120
2969 cf::cleanup "db_env_open(db): $@" if $@; 4121 cf::cleanup "db_env_open(db): $@" if $@;
2970 }; 4122 };
2971 } 4123 }
4124
4125 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4126 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4127 };
4128 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4129 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130 };
4131 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133 };
2972} 4134}
2973 4135
2974{ 4136{
4137 # configure IO::AIO
4138
2975 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
2976
2977 undef $Coro::AIO::WATCHER;
2978 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
2979 $AIO_POLL_WATCHER = Event->io ( 4141 undef $AnyEvent::AIO::WATCHER;
2980 reentrant => 0,
2981 data => WF_AUTOCANCEL,
2982 fd => IO::AIO::poll_fileno,
2983 poll => 'r',
2984 prio => 6,
2985 cb => \&IO::AIO::poll_cb,
2986 );
2987} 4142}
2988 4143
2989my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
2990 4146
2991sub _log_backtrace { 4147sub _log_backtrace {
2992 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
2993 4149
2994 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
2995 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
2996 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
2997 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
2998 ++$_log_backtrace; 4158 ++$_log_backtrace;
4159 my $perl_bt = Carp::longmess $msg;
2999 async { 4160 async {
4161 $Coro::current->{desc} = "abt $msg";
4162
3000 my @bt = fork_call { 4163 my @bt = fork_call {
3001 @addr = map { sprintf "%x", $_ } @addr; 4164 @addr = map { sprintf "%x", $_ } @addr;
3002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4165 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4166 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3004 or die "addr2line: $!"; 4167 or die "addr2line: $!";
3012 } 4175 }
3013 4176
3014 @funcs 4177 @funcs
3015 }; 4178 };
3016 4179
3017 LOG llevInfo, "[ABT] $msg\n"; 4180 LOG llevInfo, "[ABT] $perl_bt\n";
4181 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3018 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
3019 --$_log_backtrace; 4183 --$_log_backtrace;
3020 }; 4184 };
3021 } else { 4185 } else {
3022 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
3023 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3024 } 4188 }
3025} 4189}
3026 4190
3027# load additional modules 4191# load additional modules
3028use cf::pod; 4192require "cf/$_.pm" for @EXTRA_MODULES;
4193cf::_connect_to_perl_2;
3029 4194
3030END { cf::emergency_save } 4195END { cf::emergency_save }
3031 4196
30321 41971
3033 4198

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines