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.283 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.491 by root, Sat Oct 24 09:18:44 2009 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 ();
14 37
38use Guard ();
15use Coro 3.61 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
52use Coro::Util ();
24 53
54use JSON::XS 2.01 ();
25use BDB (); 55use BDB ();
26use Data::Dumper; 56use Data::Dumper;
27use Digest::MD5; 57use 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 warn "error in event callback: @_";
210}; 295};
211 296
212############################################################################# 297#############################################################################
213 298
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
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1674
1354Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1355 1676
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1385=item $player->ext_reply ($msgid, %msg) 1677=item $player->ext_reply ($msgid, @msg)
1386 1678
1387Sends an ext reply to the player. 1679Sends an ext reply to the player.
1388 1680
1389=cut 1681=cut
1390 1682
1391sub ext_reply($$%) { 1683sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1684 my ($self, $id, @msg) = @_;
1393 1685
1394 $msg{msgid} = $id; 1686 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1687}
1398 1688
1399=item $player->ext_event ($type, %msg) 1689=item $player->ext_msg ($type, @msg)
1400 1690
1401Sends an ext event to the client. 1691Sends an ext event to the client.
1402 1692
1403=cut 1693=cut
1404 1694
1405sub ext_event($$%) { 1695sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1696 my ($self, $type, @msg) = @_;
1407 1697
1408 $self->ns->ext_event ($type, %msg); 1698 $self->ns->ext_msg ($type, @msg);
1409} 1699}
1410 1700
1411=head3 cf::region 1701=head3 cf::region
1412 1702
1413=over 4 1703=over 4
1426 my ($path) = @_; 1716 my ($path) = @_;
1427 1717
1428 my ($match, $specificity); 1718 my ($match, $specificity);
1429 1719
1430 for my $region (list) { 1720 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1721 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1722 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1723 if $region->specificity > $specificity;
1434 } 1724 }
1435 } 1725 }
1436 1726
1457our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1459 1749
1460sub generate_random_map { 1750sub generate_random_map {
1461 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
1462 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1756 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1556 $self->init; # pass $1 etc. 1849 $self->init; # pass $1 etc.
1557 return $self; 1850 return $self;
1558 } 1851 }
1559 } 1852 }
1560 1853
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1854 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1855 ()
1563} 1856}
1564 1857
1565sub init { 1858sub init {
1566 my ($self) = @_; 1859 my ($self) = @_;
1588 1881
1589# the temporary/swap location 1882# the temporary/swap location
1590sub save_path { 1883sub save_path {
1591 my ($self) = @_; 1884 my ($self) = @_;
1592 1885
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1595} 1888}
1596 1889
1597# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1598sub uniq_path { 1891sub uniq_path {
1599 my ($self) = @_; 1892 my ($self) = @_;
1600 1893
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1603}
1604
1605# and all this just because we cannot iterate over
1606# all maps in C++...
1607sub change_all_map_light {
1608 my ($change) = @_;
1609
1610 $_->change_map_light ($change)
1611 for grep $_->outdoor, values %cf::MAP;
1612} 1896}
1613 1897
1614sub decay_objects { 1898sub decay_objects {
1615 my ($self) = @_; 1899 my ($self) = @_;
1616 1900
1629 1913
1630sub load_header_from($) { 1914sub load_header_from($) {
1631 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1632 1916
1633 utf8::encode $path; 1917 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 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;
1639 1926
1640 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1641 1928
1642 1 1929 1
1643} 1930}
1697sub find { 1984sub find {
1698 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1699 1986
1700 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1701 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1703 1991
1704 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path";
1706 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1707 or return; 1994 or return;
1708 1995
1709 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1710 1997
1712 or return; 1999 or return;
1713 2000
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1717 $map->reset; 2006 $map->reset;
1718 undef $guard;
1719 return find $path; 2007 return find $path;
1720 } 2008 }
1721 2009
1722 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1723 } 2011 }
1732 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1733 2021
1734 my $path = $self->{path}; 2022 my $path = $self->{path};
1735 2023
1736 { 2024 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1738 2026
2027 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2029
1741 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1742 2031
1743 $self->alloc; 2032 $self->alloc;
1744 2033
1745 $self->pre_load; 2034 $self->pre_load;
1746 Coro::cede; 2035 cf::cede_to_tick;
1747 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1749 or return; 2040 or return;
1750 2041
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1752 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1753 2044
1754 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2046 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2049 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1759 } 2053 }
1760 } 2054 }
1761 2055
1762 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1763 # now do the right thing for maps 2059 # now do the right thing for maps
1764 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2062 unless $self->difficulty;
1767 Coro::cede; 2063 cf::cede_to_tick;
1768 2064
1769 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2066 $self->decay_objects;
1771 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1772 $self->update_buttons; 2068 $self->update_buttons;
1773 Coro::cede; 2069 cf::cede_to_tick;
1774 $self->set_darkness_map;
1775 Coro::cede;
1776 $self->activate; 2070 $self->activate;
1777 } 2071 }
1778 2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2077 }
1781 2078
1782 $self->post_load; 2079 $self->post_load;
1783} 2080}
1784 2081
1793 2090
1794 $self 2091 $self
1795} 2092}
1796 2093
1797# 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
1798sub load_diag { 2095sub load_neighbours {
1799 my ($map) = @_; 2096 my ($map) = @_;
1800 2097
1801 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1802 2099
1803 for (0 .. 3) { 2100 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1805 or next; 2102 or next;
1806 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1807 or next; 2104 or next;
1808 $neigh->load; 2105 $neigh->load;
1809 2106
2107 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2110 }
1813 2111
1814 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1816 or next; 2115 or next;
1817 $neigh->load; 2116 $neigh->load;
1818 } 2117 }
1819} 2118}
1820 2119
1825} 2124}
1826 2125
1827sub do_load_sync { 2126sub do_load_sync {
1828 my ($map) = @_; 2127 my ($map) = @_;
1829 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1830 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1831} 2133}
1832 2134
1833our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1835 2137
1836sub find_async { 2138sub find_async {
1837 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1838 2140
1839 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1840 2142
1841 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2145 }
1844 2146
1845 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1846 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1847 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2154 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2155 $map->load if $v;
2156 }
1852 2157
1853 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1854 } 2159 }
1855 } 2160 }
1856 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1857 }; 2162 };
1858 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1861} 2166}
1862 2167
1863sub save { 2168sub save {
1864 my ($self) = @_; 2169 my ($self) = @_;
1865 2170
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2172
1868 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1869 2174
1870 return unless $self->dirty; 2175 return unless $self->dirty;
1871 2176
1877 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1878 2183
1879 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1880 2185
1881 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1883 }; 2189 };
2190
2191 cf::get_slot 0.02;
1884 2192
1885 if ($uniq) { 2193 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2196 } else {
1894 my ($self) = @_; 2202 my ($self) = @_;
1895 2203
1896 # save first because save cedes 2204 # save first because save cedes
1897 $self->save; 2205 $self->save;
1898 2206
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2208
1901 return if $self->players; 2209 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2211 return if $self->{deny_save};
1904 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2217 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2218}
1908 2219
1909sub reset_at { 2220sub reset_at {
1910 my ($self) = @_; 2221 my ($self) = @_;
1911 2222
1929 2240
1930 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
1931 2242
1932 return if $self->players; 2243 return if $self->players;
1933 2244
1934 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
1935 2246
1936 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
1937 2248
1938 # need to save uniques path 2249 # need to save uniques path
1939 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
1943 if $uniq; 2254 if $uniq;
1944 } 2255 }
1945 2256
1946 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
1947 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2261 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2262
1952 $self->unlink_save; 2263 $self->unlink_save;
1953 $self->destroy; 2264 $self->destroy;
1954} 2265}
1955 2266
1956my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
1957 2268
1958sub nuke { 2269sub nuke {
1959 my ($self) = @_; 2270 my ($self) = @_;
1960 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
1961 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
1962 2276
1963 $self->unlink_save; 2277 $self->unlink_save;
1964 2278
1965 bless $self, "cf::map"; 2279 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2284
1971 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
1972 2287
1973 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
1974} 2289}
1975 2290
1976=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
2018 2333
2019sub unique_maps() { 2334sub unique_maps() {
2020 [ 2335 [
2021 map { 2336 map {
2022 utf8::decode $_; 2337 utf8::decode $_;
2023 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2024 ? normalise $_ 2341 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2343 ]
2028} 2344}
2029 2345
2030package 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}
2031 2377
2032=back 2378=back
2033 2379
2034=head3 cf::object 2380=head3 cf::object
2035 2381
2039 2385
2040=over 4 2386=over 4
2041 2387
2042=item $ob->inv_recursive 2388=item $ob->inv_recursive
2043 2389
2044Returns 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.
2045 2392
2046=cut 2393=cut
2047 2394
2048sub inv_recursive_; 2395sub inv_recursive_;
2049sub inv_recursive_ { 2396sub inv_recursive_ {
2052 2399
2053sub inv_recursive { 2400sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2055} 2402}
2056 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
2057package cf; 2432package cf;
2058 2433
2059=back 2434=back
2060 2435
2061=head3 cf::object::player 2436=head3 cf::object::player
2067Sends 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>
2068can 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
2069dialogue with the given NPC character. 2444dialogue with the given NPC character.
2070 2445
2071=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};
2072 2461
2073# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2463# with dialog boxes.
2075#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
2076sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2083 2472
2084 } else { 2473 } else {
2085 my $pl = $self->contr; 2474 my $pl = $self->contr;
2086 2475
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2479
2096 } else { 2480 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2483 }
2100 } 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 (@_);
2101} 2495}
2102 2496
2103=item $player_object->may ("access") 2497=item $player_object->may ("access")
2104 2498
2105Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
2118 2512
2119=item $player_object->enter_link 2513=item $player_object->enter_link
2120 2514
2121Freezes 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}>).
2122 2516
2123The 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.
2124I<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.
2125 2521
2126Will never block. 2522Will never block.
2127 2523
2128=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2129 2525
2184 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2582 if $x <=0 && $y <= 0;
2187 2583
2188 $map->load; 2584 $map->load;
2189 $map->load_diag; 2585 $map->load_neighbours;
2190 2586
2191 return unless $self->contr->active; 2587 return unless $self->contr->active;
2192 $self->activate_recursive;
2193 2588
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2196}
2197 2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2594}
2595
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2597
2200Moves 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
2201her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2202that 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
2203the 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 >>.
2204 2606
2205=cut 2607=cut
2206 2608
2207our $GOTOGEN; 2609our $GOTOGEN;
2208 2610
2209sub cf::object::player::goto { 2611sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2612 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2613
2212 # 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
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2616
2215 $self->enter_link; 2617 $self->enter_link;
2216 2618
2217 (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
2218 my $map = eval { 2641 my $map = eval {
2219 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2220 2643
2221 if ($map) { 2644 if ($map) {
2222 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2224 } else { 2647 } else {
2225 $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);
2226 } 2649 }
2227 2650
2228 $map 2651 $map
2229 }; 2652 };
2230 2653
2235 2658
2236 if ($gen == $self->{_goto_generation}) { 2659 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2660 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2661 $self->leave_link ($map, $x, $y);
2239 } 2662 }
2663
2664 $done->() if $done;
2240 })->prio (1); 2665 })->prio (1);
2241} 2666}
2242 2667
2243=item $player_object->enter_exit ($exit_object) 2668=item $player_object->enter_exit ($exit_object)
2244 2669
2264} 2689}
2265 2690
2266sub prepare_random_map { 2691sub prepare_random_map {
2267 my ($exit) = @_; 2692 my ($exit) = @_;
2268 2693
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2696 # that depends on the exit object
2274 2697
2275 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
2277 if ($exit->map) { 2700 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2282 } 2707 }
2283 2708
2284 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2285 2710
2286 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2289 2714
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2717 undef $fh;
2293 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2294 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2297 } 2726 }
2298} 2727}
2299 2728
2300sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2302 2731
2303 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2304 2733
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2734 $self->enter_link;
2317 2735
2318 (async { 2736 (async {
2319 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2320 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
2321 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2322 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
2323 1; 2760 1
2324 }) { 2761 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "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. "
2327 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2766
2330 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
2349 2786
2350 utf8::encode $text; 2787 utf8::encode $text;
2351 $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);
2352} 2789}
2353 2790
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2791=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2792
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2793Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2794client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2795the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2796the message unless the client supports the msg packet.
2360 2797
2361=cut 2798=cut
2362 2799
2800# non-persistent channels (usually the info channel)
2801our %CHANNEL = (
2802 "c/motd" => {
2803 id => "infobox",
2804 title => "MOTD",
2805 reply => undef,
2806 tooltip => "The message of the day",
2807 },
2808 "c/identify" => {
2809 id => "infobox",
2810 title => "Identify",
2811 reply => undef,
2812 tooltip => "Items recently identified",
2813 },
2814 "c/examine" => {
2815 id => "infobox",
2816 title => "Examine",
2817 reply => undef,
2818 tooltip => "Signs and other items you examined",
2819 },
2820 "c/shopinfo" => {
2821 id => "infobox",
2822 title => "Shop Info",
2823 reply => undef,
2824 tooltip => "What your bargaining skill tells you about the shop",
2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/statistics" => {
2851 id => "infobox",
2852 title => "Statistics",
2853 reply => undef,
2854 tooltip => "Shows your primary statistics",
2855 },
2856 "c/skills" => {
2857 id => "infobox",
2858 title => "Skills",
2859 reply => undef,
2860 tooltip => "Shows your experience per skill and item power",
2861 },
2862 "c/shopitems" => {
2863 id => "infobox",
2864 title => "Shop Items",
2865 reply => undef,
2866 tooltip => "Shows the items currently for sale in this shop",
2867 },
2868 "c/resistances" => {
2869 id => "infobox",
2870 title => "Resistances",
2871 reply => undef,
2872 tooltip => "Shows your resistances",
2873 },
2874 "c/pets" => {
2875 id => "infobox",
2876 title => "Pets",
2877 reply => undef,
2878 tooltip => "Shows information abotu your pets/a specific pet",
2879 },
2880 "c/perceiveself" => {
2881 id => "infobox",
2882 title => "Perceive Self",
2883 reply => undef,
2884 tooltip => "You gained detailed knowledge about yourself",
2885 },
2886 "c/uptime" => {
2887 id => "infobox",
2888 title => "Uptime",
2889 reply => undef,
2890 tooltip => "How long the server has been running since last restart",
2891 },
2892 "c/mapinfo" => {
2893 id => "infobox",
2894 title => "Map Info",
2895 reply => undef,
2896 tooltip => "Information related to the maps",
2897 },
2898 "c/party" => {
2899 id => "party",
2900 title => "Party",
2901 reply => "gsay ",
2902 tooltip => "Messages and chat related to your party",
2903 },
2904 "c/death" => {
2905 id => "death",
2906 title => "Death",
2907 reply => undef,
2908 tooltip => "Reason for and more info about your most recent death",
2909 },
2910 "c/say" => $SAY_CHANNEL,
2911 "c/chat" => $CHAT_CHANNEL,
2912);
2913
2363sub cf::client::send_msg { 2914sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2915 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2916
2366 $msg = $self->pl->expand_cfpod ($msg); 2917 $msg = $self->pl->expand_cfpod ($msg)
2918 unless $color & cf::NDI_VERBATIM;
2367 2919
2368 if ($self->can_msg) { 2920 $color &= cf::NDI_CLIENT_MASK; # just in case...
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2370 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/;
2379 }
2380 2921
2381 if ($color >= 0) { 2922 # check predefined channels, for the benefit of C
2382 if ($msg =~ /\[/) { 2923 if ($CHANNEL{$channel}) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2924 $channel = $CHANNEL{$channel};
2384 } else { 2925
2385 $self->send_packet ("drawinfo $color $msg") 2926 $self->ext_msg (channel_info => $channel);
2927 $channel = $channel->{id};
2928
2929 } elsif (ref $channel) {
2930 # send meta info to client, if not yet sent
2931 unless (exists $self->{channel}{$channel->{id}}) {
2932 $self->{channel}{$channel->{id}} = $channel;
2933 $self->ext_msg (channel_info => $channel);
2386 } 2934 }
2387 }
2388 }
2389}
2390 2935
2936 $channel = $channel->{id};
2937 }
2938
2939 return unless @extra || length $msg;
2940
2941 # default colour, mask it out
2942 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2943 if $color & cf::NDI_DEF;
2944
2945 my $pkt = "msg "
2946 . $self->{json_coder}->encode (
2947 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2948 );
2949
2950 # try lzf for large packets
2951 $pkt = "lzf " . Compress::LZF::compress $pkt
2952 if 1024 <= length $pkt and $self->{can_lzf};
2953
2954 # split very large packets
2955 if (8192 < length $pkt and $self->{can_lzf}) {
2956 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2957 $pkt = "frag";
2958 }
2959
2960 $self->send_packet ($pkt);
2961}
2962
2391=item $client->ext_event ($type, %msg) 2963=item $client->ext_msg ($type, @msg)
2392 2964
2393Sends an exti event to the client. 2965Sends an ext event to the client.
2394 2966
2395=cut 2967=cut
2396 2968
2397sub cf::client::ext_event($$%) { 2969sub cf::client::ext_msg($$@) {
2398 my ($self, $type, %msg) = @_; 2970 my ($self, $type, @msg) = @_;
2399 2971
2972 if ($self->extcmd == 2) {
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2974 } elsif ($self->extcmd == 1) { # TODO: remove
2400 $msg{msgtype} = "event_$type"; 2975 push @msg, msgtype => "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2976 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2977 }
2978}
2979
2980=item $client->ext_reply ($msgid, @msg)
2981
2982Sends an ext reply to the client.
2983
2984=cut
2985
2986sub cf::client::ext_reply($$@) {
2987 my ($self, $id, @msg) = @_;
2988
2989 if ($self->extcmd == 2) {
2990 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2991 } elsif ($self->extcmd == 1) {
2992 #TODO: version 1, remove
2993 unshift @msg, msgtype => "reply", msgid => $id;
2994 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2995 }
2402} 2996}
2403 2997
2404=item $success = $client->query ($flags, "text", \&cb) 2998=item $success = $client->query ($flags, "text", \&cb)
2405 2999
2406Queues a query to the client, calling the given callback with 3000Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3001the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2408C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3002C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 3003
2410Queries can fail, so check the return code. Or don't, as queries will become 3004Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 3005become reliable at some point in the future.
2412 3006
2413=cut 3007=cut
2414 3008
2415sub cf::client::query { 3009sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 3010 my ($self, $flags, $text, $cb) = @_;
2424 utf8::encode $text; 3018 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3019 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 3020
2427 $self->send_packet ($self->{query_queue}[0][0]) 3021 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 3022 if @{ $self->{query_queue} } == 1;
3023
3024 1
2429} 3025}
2430 3026
2431cf::client->attach ( 3027cf::client->attach (
3028 on_connect => sub {
3029 my ($ns) = @_;
3030
3031 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3032 },
2432 on_reply => sub { 3033 on_reply => sub {
2433 my ($ns, $msg) = @_; 3034 my ($ns, $msg) = @_;
2434 3035
2435 # this weird shuffling is so that direct followup queries 3036 # this weird shuffling is so that direct followup queries
2436 # get handled first 3037 # get handled first
2448 } else { 3049 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3050 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 3051 }
2451 } 3052 }
2452 }, 3053 },
3054 on_exticmd => sub {
3055 my ($ns, $buf) = @_;
3056
3057 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3058
3059 if (ref $msg) {
3060 my ($type, $reply, @payload) =
3061 "ARRAY" eq ref $msg
3062 ? @$msg
3063 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3064
3065 my @reply;
3066
3067 if (my $cb = $EXTICMD{$type}) {
3068 @reply = $cb->($ns, @payload);
3069 }
3070
3071 $ns->ext_reply ($reply, @reply)
3072 if $reply;
3073
3074 } else {
3075 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3076 }
3077
3078 cf::override;
3079 },
2453); 3080);
2454 3081
2455=item $client->async (\&cb) 3082=item $client->async (\&cb)
2456 3083
2457Create a new coroutine, running the specified callback. The coroutine will 3084Create a new coroutine, running the specified callback. The coroutine will
2498our $safe = new Safe "safe"; 3125our $safe = new Safe "safe";
2499our $safe_hole = new Safe::Hole; 3126our $safe_hole = new Safe::Hole;
2500 3127
2501$SIG{FPE} = 'IGNORE'; 3128$SIG{FPE} = 'IGNORE';
2502 3129
2503$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3130$safe->permit_only (Opcode::opset qw(
3131 :base_core :base_mem :base_orig :base_math
3132 grepstart grepwhile mapstart mapwhile
3133 sort time
3134));
2504 3135
2505# here we export the classes and methods available to script code 3136# here we export the classes and methods available to script code
2506 3137
2507=pod 3138=pod
2508 3139
2509The following functions and methods are available within a safe environment: 3140The following functions and methods are available within a safe environment:
2510 3141
2511 cf::object contr pay_amount pay_player map 3142 cf::object
3143 contr pay_amount pay_player map x y force_find force_add destroy
3144 insert remove name archname title slaying race decrease split
3145 value
3146
2512 cf::object::player player 3147 cf::object::player
2513 cf::player peaceful 3148 player
2514 cf::map trigger 3149
3150 cf::player
3151 peaceful
3152
3153 cf::map
3154 trigger
2515 3155
2516=cut 3156=cut
2517 3157
2518for ( 3158for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 3159 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3160 insert remove inv nrof name archname title slaying race
3161 decrease split destroy change_exp value msg lore send_msg)],
2520 ["cf::object::player" => qw(player)], 3162 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 3163 ["cf::player" => qw(peaceful send_msg)],
2522 ["cf::map" => qw(trigger)], 3164 ["cf::map" => qw(trigger)],
2523) { 3165) {
2524 no strict 'refs'; 3166 no strict 'refs';
2525 my ($pkg, @funs) = @$_; 3167 my ($pkg, @funs) = @$_;
2526 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3168 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2543 my ($code, %vars) = @_; 3185 my ($code, %vars) = @_;
2544 3186
2545 my $qcode = $code; 3187 my $qcode = $code;
2546 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3188 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2547 $qcode =~ s/\n/\\n/g; 3189 $qcode =~ s/\n/\\n/g;
3190
3191 %vars = (_dummy => 0) unless %vars;
2548 3192
2549 local $_; 3193 local $_;
2550 local @safe::cf::_safe_eval_args = values %vars; 3194 local @safe::cf::_safe_eval_args = values %vars;
2551 3195
2552 my $eval = 3196 my $eval =
2600# the server's init and main functions 3244# the server's init and main functions
2601 3245
2602sub load_facedata($) { 3246sub load_facedata($) {
2603 my ($path) = @_; 3247 my ($path) = @_;
2604 3248
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
3253 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3254
2605 warn "loading facedata from $path\n"; 3255 warn "loading facedata from $path\n";
2606 3256
2607 my $facedata; 3257 my $facedata;
2608 0 < aio_load $path, $facedata 3258 0 < aio_load $path, $facedata
2609 or die "$path: $!"; 3259 or die "$path: $!";
2611 $facedata = Coro::Storable::thaw $facedata; 3261 $facedata = Coro::Storable::thaw $facedata;
2612 3262
2613 $facedata->{version} == 2 3263 $facedata->{version} == 2
2614 or cf::cleanup "$path: version mismatch, cannot proceed."; 3264 or cf::cleanup "$path: version mismatch, cannot proceed.";
2615 3265
3266 # patch in the exptable
3267 $facedata->{resource}{"res/exp_table"} = {
3268 type => FT_RSRC,
3269 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3270 };
3271 cf::cede_to_tick;
3272
2616 { 3273 {
2617 my $faces = $facedata->{faceinfo}; 3274 my $faces = $facedata->{faceinfo};
2618 3275
2619 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2620 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3277 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3278
2621 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3279 cf::face::set_visibility $idx, $info->{visibility};
3280 cf::face::set_magicmap $idx, $info->{magicmap};
2622 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3281 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2623 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3282 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2624 Coro::cede; 3283
3284 cf::cede_to_tick;
2625 } 3285 }
2626 3286
2627 while (my ($face, $info) = each %$faces) { 3287 while (my ($face, $info) = each %$faces) {
2628 next unless $info->{smooth}; 3288 next unless $info->{smooth};
3289
2629 my $idx = cf::face::find $face 3290 my $idx = cf::face::find $face
2630 or next; 3291 or next;
3292
2631 if (my $smooth = cf::face::find $info->{smooth}) { 3293 if (my $smooth = cf::face::find $info->{smooth}) {
3294 cf::face::set_smooth $idx, $smooth;
2632 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3295 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2633 } else { 3296 } else {
2634 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3297 warn "smooth face '$info->{smooth}' not found for face '$face'";
2635 } 3298 }
2636 Coro::cede; 3299
3300 cf::cede_to_tick;
2637 } 3301 }
2638 } 3302 }
2639 3303
2640 { 3304 {
2641 my $anims = $facedata->{animinfo}; 3305 my $anims = $facedata->{animinfo};
2642 3306
2643 while (my ($anim, $info) = each %$anims) { 3307 while (my ($anim, $info) = each %$anims) {
2644 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3308 cf::anim::set $anim, $info->{frames}, $info->{facings};
2645 Coro::cede; 3309 cf::cede_to_tick;
2646 } 3310 }
2647 3311
2648 cf::anim::invalidate_all; # d'oh 3312 cf::anim::invalidate_all; # d'oh
2649 } 3313 }
2650 3314
3315 {
3316 # TODO: for gcfclient pleasure, we should give resources
3317 # that gcfclient doesn't grok a >10000 face index.
3318 my $res = $facedata->{resource};
3319
3320 while (my ($name, $info) = each %$res) {
3321 if (defined $info->{type}) {
3322 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3323 my $data;
3324
3325 if ($info->{type} & 1) {
3326 # prepend meta info
3327
3328 my $meta = $enc->encode ({
3329 name => $name,
3330 %{ $info->{meta} || {} },
3331 });
3332
3333 $data = pack "(w/a*)*", $meta, $info->{data};
3334 } else {
3335 $data = $info->{data};
3336 }
3337
3338 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3339 cf::face::set_type $idx, $info->{type};
3340 } else {
3341 $RESOURCE{$name} = $info;
3342 }
3343
3344 cf::cede_to_tick;
3345 }
3346 }
3347
3348 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3349
2651 1 3350 1
2652} 3351}
2653 3352
3353cf::global->attach (on_resource_update => sub {
3354 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3355 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3356
3357 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3358 my $sound = $soundconf->{compat}[$_]
3359 or next;
3360
3361 my $face = cf::face::find "sound/$sound->[1]";
3362 cf::sound::set $sound->[0] => $face;
3363 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3364 }
3365
3366 while (my ($k, $v) = each %{$soundconf->{event}}) {
3367 my $face = cf::face::find "sound/$v";
3368 cf::sound::set $k => $face;
3369 }
3370 }
3371});
3372
3373register_exticmd fx_want => sub {
3374 my ($ns, $want) = @_;
3375
3376 while (my ($k, $v) = each %$want) {
3377 $ns->fx_want ($k, $v);
3378 }
3379};
3380
3381sub load_resource_file($) {
3382 my $guard = lock_acquire "load_resource_file";
3383
3384 my $status = load_resource_file_ $_[0];
3385 get_slot 0.1, 100;
3386 cf::arch::commit_load;
3387
3388 $status
3389}
3390
2654sub reload_regions { 3391sub reload_regions {
3392 # HACK to clear player env face cache, we need some signal framework
3393 # for this (global event?)
3394 %ext::player_env::MUSIC_FACE_CACHE = ();
3395
2655 load_resource_file "$MAPDIR/regions" 3396 load_resource_file "$MAPDIR/regions"
2656 or die "unable to load regions file\n"; 3397 or die "unable to load regions file\n";
3398
3399 for (cf::region::list) {
3400 $_->{match} = qr/$_->{match}/
3401 if exists $_->{match};
3402 }
2657} 3403}
2658 3404
2659sub reload_facedata { 3405sub reload_facedata {
2660 load_facedata "$DATADIR/facedata" 3406 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 3407 or die "unable to load facedata\n";
2672} 3418}
2673 3419
2674sub reload_resources { 3420sub reload_resources {
2675 warn "reloading resource files...\n"; 3421 warn "reloading resource files...\n";
2676 3422
3423 reload_facedata;
3424 reload_archetypes;
2677 reload_regions; 3425 reload_regions;
2678 reload_facedata;
2679 #reload_archetypes;#d#
2680 reload_archetypes;
2681 reload_treasures; 3426 reload_treasures;
2682 3427
2683 warn "finished reloading resource files\n"; 3428 warn "finished reloading resource files\n";
2684} 3429}
2685 3430
2686sub init { 3431sub reload_config {
2687 reload_resources; 3432 warn "reloading config file...\n";
2688}
2689 3433
2690sub cfg_load {
2691 open my $fh, "<:utf8", "$CONFDIR/config" 3434 open my $fh, "<:utf8", "$CONFDIR/config"
2692 or return; 3435 or return;
2693 3436
2694 local $/; 3437 local $/;
2695 *CFG = YAML::Syck::Load <$fh>; 3438 *CFG = YAML::XS::Load scalar <$fh>;
2696 3439
2697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3440 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2698 3441
2699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3442 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3443 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2704 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3447 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2705 and die "WARNING: m(un)lockall failed: $!\n"; 3448 and die "WARNING: m(un)lockall failed: $!\n";
2706 }; 3449 };
2707 warn $@ if $@; 3450 warn $@ if $@;
2708 } 3451 }
3452
3453 warn "finished reloading resource files\n";
3454}
3455
3456sub pidfile() {
3457 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3458 or die "$PIDFILE: $!";
3459 flock $fh, &Fcntl::LOCK_EX
3460 or die "$PIDFILE: flock: $!";
3461 $fh
3462}
3463
3464# make sure only one server instance is running at any one time
3465sub atomic {
3466 my $fh = pidfile;
3467
3468 my $pid = <$fh>;
3469 kill 9, $pid if $pid > 0;
3470
3471 seek $fh, 0, 0;
3472 print $fh $$;
3473}
3474
3475sub main_loop {
3476 warn "EV::loop starting\n";
3477 if (1) {
3478 EV::loop;
3479 }
3480 warn "EV::loop returned\n";
3481 goto &main_loop unless $REALLY_UNLOOP;
2709} 3482}
2710 3483
2711sub main { 3484sub main {
3485 cf::init_globals; # initialise logging
3486
3487 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3488 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3489 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3490 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3491
3492 cf::init_experience;
3493 cf::init_anim;
3494 cf::init_attackmess;
3495 cf::init_dynamic;
3496
3497 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3498
2712 # we must not ever block the main coroutine 3499 # we must not ever block the main coroutine
2713 local $Coro::idle = sub { 3500 local $Coro::idle = sub {
2714 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3501 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2715 (async { 3502 (async {
2716 Event::one_event; 3503 $Coro::current->{desc} = "IDLE BUG HANDLER";
3504 EV::loop EV::LOOP_ONESHOT;
2717 })->prio (Coro::PRIO_MAX); 3505 })->prio (Coro::PRIO_MAX);
2718 }; 3506 };
2719 3507
2720 cfg_load; 3508 evthread_start IO::AIO::poll_fileno;
3509
3510 cf::sync_job {
3511 reload_resources;
3512 reload_config;
2721 db_init; 3513 db_init;
3514
3515 cf::load_settings;
3516 cf::load_materials;
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
2722 load_extensions; 3526 load_extensions;
2723 3527
2724 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
2725 Event::loop; 3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
2726} 3538}
2727 3539
2728############################################################################# 3540#############################################################################
2729# initialisation and cleanup 3541# initialisation and cleanup
2730 3542
2731# install some emergency cleanup handlers 3543# install some emergency cleanup handlers
2732BEGIN { 3544BEGIN {
3545 our %SIGWATCHER = ();
2733 for my $signal (qw(INT HUP TERM)) { 3546 for my $signal (qw(INT HUP TERM)) {
2734 Event->signal ( 3547 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2735 reentrant => 0,
2736 data => WF_AUTOCANCEL,
2737 signal => $signal,
2738 prio => 0,
2739 cb => sub {
2740 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
2741 },
2742 ); 3549 };
2743 } 3550 }
2744} 3551}
2745 3552
2746sub write_runtime { 3553sub write_runtime_sync {
2747 my $runtime = "$LOCALDIR/runtime";
2748
2749 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
2750 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
2751 3556
2752 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2753 3558
2754 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
2755 3560
2756 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2757 or return; 3562 or return;
2758 3563
2759 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
2760 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
2761 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
2771 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
2772 3577
2773 close $fh 3578 close $fh
2774 or return; 3579 or return;
2775 3580
2776 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2777 and return; 3582 and return;
2778 3583
2779 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
2780 3585
2781 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
2782} 3637}
2783 3638
2784sub emergency_save() { 3639sub emergency_save() {
2785 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
2786 3641
2787 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
2788 3643
2789 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
2790 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
2791 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
2792 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
2793 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
2794 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
2795 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
2796 $pl->valid or next; 3656 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2797 $pl->save; 3658 $pl->save;
2798 } 3659 }
2799 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
2800 3661
2801 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
2802 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
2803 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
2804 $map->valid or next; 3665 $map->valid or next;
2805 $map->save; 3666 $map->save;
2806 } 3667 }
2807 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
2808 3669
2809 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
2810 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
2811 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
2812 }; 3677 };
2813 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
2814 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
2815} 3685}
2816 3686
2817sub post_cleanup { 3687sub post_cleanup {
2818 my ($make_core) = @_; 3688 my ($make_core) = @_;
2819 3689
2820 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
2821 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
2822} 3721}
2823 3722
2824sub do_reload_perl() { 3723sub do_reload_perl() {
2825 # can/must only be called in main 3724 # can/must only be called in main
2826 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
2827 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
2828 return; 3727 return;
2829 } 3728 }
2830 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
2831 warn "reloading..."; 3735 warn "reloading...";
2832 3736
2833 warn "entering sync_job"; 3737 warn "entering sync_job";
2834 3738
2835 cf::sync_job { 3739 cf::sync_job {
2836 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
2837 cf::emergency_save; 3741 cf::emergency_save;
2838 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
2839 3743
2840 warn "syncing database to disk"; 3744 warn "syncing database to disk";
2841 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
2842 3746
2843 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
2844 3748
2845 warn "cancelling all WF_AUTOCANCEL watchers";
2846 for (Event::all_watchers) {
2847 $_->cancel if $_->data & WF_AUTOCANCEL;
2848 }
2849
2850 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
2851 for (;;) {
2852 BDB::flush;
2853 IO::AIO::flush;
2854 Coro::cede;
2855 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
2856 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2857 }
2858
2859 ++$RELOAD;
2860
2861 warn "cancelling all extension coros";
2862 $_->cancel for values %EXT_CORO;
2863 %EXT_CORO = ();
2864
2865 warn "removing commands";
2866 %COMMAND = ();
2867
2868 warn "removing ext commands";
2869 %EXTCMD = ();
2870
2871 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg";
2874
2875 if (my $cb = $pkg->can ("unload")) {
2876 eval {
2877 $cb->($pkg);
2878 1
2879 } or warn "$pkg unloaded, but with errors: $@";
2880 } 3752 }
2881 3753
2882 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
2883 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
2884 } 3756 %EXT_CORO = ();
2885 3757
2886 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
2887 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
2888 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2889 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
2890 warn "... unloading $k"; 3767 warn "... unloading $pkg";
2891 delete $INC{$k};
2892 3768
2893 $k =~ s/\.pm$//;
2894 $k =~ s/\//::/g;
2895
2896 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
2897 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
2898 } 3778 }
2899 3779
2900 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
2901 } 3795 }
2902 3796
2903 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
2904 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
2905 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2906 3800
2907 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
2908 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
2909 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2910 3804
2911 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
2912 # and global variables created in xs 3806 # and global variables created in xs
2913 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
2914 3808
2915 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
2916 3810
2917 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
2918 require cf; 3812 require cf;
2919 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
2920 3814
2921 warn "loading config and database again"; 3815 warn "loading config and database again";
2922 cf::cfg_load; 3816 cf::reload_config;
2923 3817
2924 warn "loading extensions"; 3818 warn "loading extensions";
2925 cf::load_extensions; 3819 cf::load_extensions;
2926 3820
3821 if ($REATTACH_ON_RELOAD) {
2927 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
2928 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
2929 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
2930 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
2931 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
2932 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
2933 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
2934 warn "leaving sync_job"; 3833 warn "leaving sync_job";
2935 3834
2936 1 3835 1
2937 } or do { 3836 } or do {
2938 warn $@; 3837 warn $@;
2939 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
2940 exit 1;
2941 }; 3839 };
2942 3840
2943 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
2944}; 3847};
2945 3848
2946our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
2947 3850
2948sub reload_perl() { 3851sub reload_perl() {
2949 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
2950 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
2951 3854
2952 $RELOAD_WATCHER ||= Event->timer ( 3855 $RELOAD_WATCHER ||= cf::async {
2953 reentrant => 0, 3856 Coro::AIO::aio_wait cache_extensions;
2954 after => 0, 3857
2955 data => WF_AUTOCANCEL, 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2956 cb => sub {
2957 do_reload_perl; 3859 do_reload_perl;
2958 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
2959 }, 3861 };
2960 ); 3862 };
2961} 3863}
2962 3864
2963register_command "reload" => sub { 3865register_command "reload" => sub {
2964 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
2965 3867
2966 if ($who->flag (FLAG_WIZ)) { 3868 if ($who->flag (FLAG_WIZ)) {
2967 $who->message ("reloading server."); 3869 $who->message ("reloading server.");
3870 async {
3871 $Coro::current->{desc} = "perl_reload";
2968 async { reload_perl }; 3872 reload_perl;
3873 };
2969 } 3874 }
2970}; 3875};
2971 3876
2972unshift @INC, $LIBDIR; 3877unshift @INC, $LIBDIR;
2973 3878
2975 3880
2976our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
2977our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
2978 3883
2979sub wait_for_tick { 3884sub wait_for_tick {
2980 return unless $TICK_WATCHER->is_active;
2981 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
2982 3886
2983 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
2984 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
2985 $signal->wait; 3889 $signal->wait;
2986} 3890}
2987 3891
2988sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
2989 return unless $TICK_WATCHER->is_active;
2990 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
2991 3894
2992 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
2993 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
2994 $signal->wait; 3897 $signal->wait;
2995} 3898}
2996 3899
2997 my $min = 1e6;#d# 3900sub tick {
2998 my $avg = 10;
2999$TICK_WATCHER = Event->timer (
3000 reentrant => 0,
3001 parked => 1,
3002 prio => 0,
3003 at => $NEXT_TICK || $TICK,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3007 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3008 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3009 return; 3904 return;
3010 } 3905 }
3011 3906
3012 $NOW = $tick_start = Event::time;
3013
3014 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3015 3908
3016 0 && sync_job {#d# 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3017 for(1..10) { 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3018 my $t = Event::time; 3911 Coro::async_pool {
3019 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3912 $Coro::current->{desc} = "runtime saver";
3020 or die; 3913 write_runtime_sync
3021 3914 or warn "ERROR: unable to write runtime file: $!";
3022 $map->width (50);
3023 $map->height (50);
3024 $map->alloc;
3025 $map->_load_objects ("/tmp/x.map", 1);
3026 my $t = Event::time - $t;
3027
3028 #next unless $t < 0.0013;#d#
3029 if ($t < $min) {
3030 $min = $t;
3031 }
3032 $avg = $avg * 0.99 + $t * 0.01;
3033 }
3034 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3035 exit 0;
3036 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3037 }; 3915 };
3916 }
3038 3917
3039 $RUNTIME += $TICK;
3040 $NEXT_TICK += $TICK;
3041
3042 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3043 $NEXT_RUNTIME_WRITE = $NOW + 10;
3044 Coro::async_pool {
3045 write_runtime
3046 or warn "ERROR: unable to write runtime file: $!";
3047 };
3048 }
3049
3050# my $AFTER = Event::time;
3051# warn $AFTER - $NOW;#d#
3052
3053 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3054 $sig->send; 3919 $sig->send;
3055 } 3920 }
3056 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3057 $sig->send; 3922 $sig->send;
3058 } 3923 }
3059 3924
3060 $NOW = Event::time; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3061
3062 # if we are delayed by four ticks or more, skip them all
3063 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3064
3065 $TICK_WATCHER->at ($NEXT_TICK);
3066 $TICK_WATCHER->start;
3067
3068 $LOAD = ($NOW - $tick_start) / $TICK;
3069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3070 3927
3071 _post_tick; 3928 if (0) {
3072 3929 if ($NEXT_TICK) {
3073 3930 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d#
3933 }
3074 }, 3934 }
3075); 3935}
3076 3936
3077{ 3937{
3078 BDB::max_poll_time $TICK * 0.1; 3938 # configure BDB
3079 $BDB_POLL_WATCHER = Event->io ( 3939
3080 reentrant => 0,
3081 fd => BDB::poll_fileno,
3082 poll => 'r',
3083 prio => 0,
3084 data => WF_AUTOCANCEL,
3085 cb => \&BDB::poll_cb,
3086 );
3087 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3088 3941 BDB::max_poll_reqs $TICK * 0.1;
3089 BDB::set_sync_prepare { 3942 $AnyEvent::BDB::WATCHER->priority (1);
3090 my $status;
3091 my $current = $Coro::current;
3092 (
3093 sub {
3094 $status = $!;
3095 $current->ready; undef $current;
3096 },
3097 sub {
3098 Coro::schedule while defined $current;
3099 $! = $status;
3100 },
3101 )
3102 };
3103 3943
3104 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3105 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3106 3951
3107 cf::sync_job { 3952 cf::sync_job {
3108 eval { 3953 eval {
3109 BDB::db_env_open 3954 BDB::db_env_open
3110 $DB_ENV, 3955 $DB_ENV,
3112 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3957 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3113 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3958 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3114 0666; 3959 0666;
3115 3960
3116 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3961 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3117
3118 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3119 $DB_ENV->set_lk_detect;
3120 }; 3962 };
3121 3963
3122 cf::cleanup "db_env_open(db): $@" if $@; 3964 cf::cleanup "db_env_open(db): $@" if $@;
3123 }; 3965 };
3124 } 3966 }
3967
3968 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3969 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3970 };
3971 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3972 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3973 };
3974 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3975 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3976 };
3125} 3977}
3126 3978
3127{ 3979{
3980 # configure IO::AIO
3981
3128 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3129
3130 undef $Coro::AIO::WATCHER;
3131 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3132 $AIO_POLL_WATCHER = Event->io ( 3984 undef $AnyEvent::AIO::WATCHER;
3133 reentrant => 0,
3134 data => WF_AUTOCANCEL,
3135 fd => IO::AIO::poll_fileno,
3136 poll => 'r',
3137 prio => 6,
3138 cb => \&IO::AIO::poll_cb,
3139 );
3140} 3985}
3141 3986
3142my $_log_backtrace; 3987my $_log_backtrace;
3143 3988
3144sub _log_backtrace { 3989sub _log_backtrace {
3147 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3148 3993
3149 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3150 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3151 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3152 async { 3998 async {
3999 $Coro::current->{desc} = "abt $msg";
4000
3153 my @bt = fork_call { 4001 my @bt = fork_call {
3154 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3155 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3156 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3157 or die "addr2line: $!"; 4005 or die "addr2line: $!";
3165 } 4013 }
3166 4014
3167 @funcs 4015 @funcs
3168 }; 4016 };
3169 4017
3170 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3171 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3172 --$_log_backtrace; 4021 --$_log_backtrace;
3173 }; 4022 };
3174 } else { 4023 } else {
3175 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3176 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3177 } 4026 }
3178} 4027}
3179 4028
3180# load additional modules 4029# load additional modules
3181use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3182 4032
3183END { cf::emergency_save } 4033END { cf::emergency_save }
3184 4034
31851 40351
3186 4036

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines