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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.504 by root, Sat Jan 30 23:50:16 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines