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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines