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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines