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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines