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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 2010 UTC

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

Diff Legend

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