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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.493 by root, Mon Oct 26 02:34:37 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines