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.338 by root, Tue Aug 21 01:07:47 2007 UTC vs.
Revision 1.514 by root, Mon Apr 12 17:13:36 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines