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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines