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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines