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.390 by root, Thu Oct 25 09:01:24 2007 UTC vs.
Revision 1.501 by root, Sat Jan 16 23:27:21 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Event; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.1 (); 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.51 (); 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;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $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 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
… …
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
226=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 367deadlocked coro.
… …
286 373
287Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
383 } 455 }
384 } 456 }
385}; 457};
386 458
387sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
388 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
389 463
390 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
392 466
… …
406 480
407BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
408 482
409=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
410 484
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 488acceptable.
415 489
416If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
… …
422 496
423sub sync_job(&) { 497sub sync_job(&) {
424 my ($job) = @_; 498 my ($job) = @_;
425 499
426 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 501 my $time = EV::time;
428 502
429 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
431 505
432 LOG llevError, Carp::longmess "sync job";#d# 506 LOG llevError, Carp::longmess "sync job";#d#
433 507
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
437 509
438 my $busy = 1; 510 my $busy = 1;
439 my @res; 511 my @res;
440 512
… …
447 519
448 while ($busy) { 520 while ($busy) {
449 if (Coro::nready) { 521 if (Coro::nready) {
450 Coro::cede_notself; 522 Coro::cede_notself;
451 } else { 523 } else {
452 Event::one_event; 524 EV::loop EV::LOOP_ONESHOT;
453 } 525 }
454 } 526 }
455 527
456 $time = Event::time - $time; 528 my $time = EV::time - $time;
457 529
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
462 531
463 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
464 } else { 533 } else {
465 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
466 535
… …
491=item fork_call { }, $args 560=item fork_call { }, $args
492 561
493Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
497 566
498=cut 567=cut
499 568
500sub fork_call(&@) { 569sub fork_call(&@) {
501 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
… …
508 reset_signals; 577 reset_signals;
509 &$cb 578 &$cb
510 }, @args; 579 }, @args;
511 580
512 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
513} 609}
514 610
515=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
516 612
517Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
656 752
657############################################################################# 753#############################################################################
658 754
659=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
660 756
661Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
664 760
665In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 763Deliantra).
668 764
669=over 4 765=over 4
670 766
671=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
672 768
… …
716=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
717 813
718Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
720 816
721Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
723 819
724These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
725 821
726=over 4 822=over 4
… …
954 } 1050 }
955 1051
956 0 1052 0
957} 1053}
958 1054
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1056
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1058
963Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
964 1060
… …
1017 1113
1018sub reattach { 1114sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1116 my ($obj) = @_;
1021 1117
1118 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1120
1024 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
1025 1122
1026 @$registry = (); 1123 @$registry = ();
1027 1124
… …
1042cf::attachable->attach ( 1139cf::attachable->attach (
1043 prio => -1000000, 1140 prio => -1000000,
1044 on_instantiate => sub { 1141 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1046 1143
1047 $data = from_json $data; 1144 $data = decode_json $data;
1048 1145
1049 for (@$data) { 1146 for (@$data) {
1050 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1051 1148
1052 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
1073 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1076 1173
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1179 aio_fsync $fh;
1180 }
1081 close $fh; 1181 aio_close $fh;
1082 1182
1083 if (@$objs) { 1183 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1190 aio_fsync $fh;
1191 }
1089 close $fh; 1192 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1194 }
1092 } else { 1195 } else {
1093 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1094 } 1197 }
1095 1198
1096 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1203 } else {
1098 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1099 } 1205 }
1100 } else { 1206 } else {
1101 aio_unlink $filename; 1207 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1103 } 1209 }
… …
1194 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1195 1301
1196 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1197} 1303}
1198 1304
1305use File::Glob ();
1306
1199cf::player->attach ( 1307cf::player->attach (
1200 on_command => sub { 1308 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1202 1310
1203 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1235 1343
1236 cf::override; 1344 cf::override;
1237 }, 1345 },
1238); 1346);
1239 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1240sub load_extensions { 1361sub load_extensions {
1241 cf::sync_job { 1362 cf::sync_job {
1242 my %todo; 1363 my %todo;
1243 1364
1244 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
… …
1263 1384
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1387
1267 $ext{source} = 1388 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1270 . $source 1391 . $source
1271 . "\n};\n1"; 1392 . "\n};\n1";
1272 1393
1273 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1289 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1291 1412
1292 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1414 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1416 }
1297 1417
1298 warn $msg; 1418 warn $msg;
1299 } 1419 }
1300 1420
… …
1314 1434
1315=back 1435=back
1316 1436
1317=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1318 1438
1319Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1320 1440
1321=cut 1441=cut
1322 1442
1323package cf::player; 1443package cf::player;
1324 1444
… …
1367 1487
1368sub exists($) { 1488sub exists($) {
1369 my ($login) = @_; 1489 my ($login) = @_;
1370 1490
1371 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1373} 1493}
1374 1494
1375sub find($) { 1495sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1497 my $login = $_[0];
… …
1389 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1510 or return;
1391 1511
1392 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1393 or return; 1513 or return;
1514
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1397 } 1518 }
1398 } 1519 }
… …
1408 1529
1409 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1410 1531
1411 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1413 1536
1414 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1538 cf::cede_to_tick;
1416} 1539}
1417 1540
… …
1449 my ($pl) = @_; 1572 my ($pl) = @_;
1450 1573
1451 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1452 1575
1453 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1578
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1460 1585
1461 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1501 1626
1502 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1503 my $path = path $login; 1628 my $path = path $login;
1504 1629
1505 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1636 }
1511 1637
… …
1542 } 1668 }
1543 1669
1544 \@paths 1670 \@paths
1545} 1671}
1546 1672
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1674
1549Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1676
1598=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1599 1678
1600Sends an ext reply to the player. 1679Sends an ext reply to the player.
1601 1680
… …
1668our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1670 1749
1671sub generate_random_map { 1750sub generate_random_map {
1672 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1673 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1756 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1799 1881
1800# the temporary/swap location 1882# the temporary/swap location
1801sub save_path { 1883sub save_path {
1802 my ($self) = @_; 1884 my ($self) = @_;
1803 1885
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1806} 1888}
1807 1889
1808# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1809sub uniq_path { 1891sub uniq_path {
1810 my ($self) = @_; 1892 my ($self) = @_;
1811 1893
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 1896}
1824 1897
1825sub decay_objects { 1898sub decay_objects {
1826 my ($self) = @_; 1899 my ($self) = @_;
1827 1900
… …
1911sub find { 1984sub find {
1912 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1913 1986
1914 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1915 1988
1916 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1918 1991
1919 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1924 or return; 1994 or return;
1925 1995
1926 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1927 1997
… …
1929 or return; 1999 or return;
1930 2000
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1934 undef $guard1; 2005 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2006 $map->reset;
1937 return find $path; 2007 return find $path;
1938 } 2008 }
1939 2009
1940 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1941 } 2011 }
1942} 2012}
1943 2013
1944sub pre_load { } 2014sub pre_load { }
1945sub post_load { } 2015#sub post_load { } # XS
1946 2016
1947sub load { 2017sub load {
1948 my ($self) = @_; 2018 my ($self) = @_;
1949 2019
1950 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
… …
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2038 $f->skip_block;
1969 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1970 or return; 2040 or return;
1971 2041
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1973 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1974 2044
1975 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2046 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
… …
1995 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2066 $self->decay_objects;
1997 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1998 $self->update_buttons; 2068 $self->update_buttons;
1999 cf::cede_to_tick; 2069 cf::cede_to_tick;
2000 $self->set_darkness_map;
2001 cf::cede_to_tick;
2002 $self->activate; 2070 $self->activate;
2003 } 2071 }
2004 2072
2005 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
2007 2075
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2077 }
2010 2078
2011 $self->post_load; 2079 $self->post_load;
2012} 2080}
2013 2081
… …
2071 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2072 2140
2073 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2074 2142
2075 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2145 }
2078 2146
2079 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2080 2148
2081 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
… …
2118 cf::async { 2186 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2187 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2121 }; 2189 };
2122 2190
2191 cf::get_slot 0.02;
2192
2123 if ($uniq) { 2193 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2196 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2135 $self->save; 2205 $self->save;
2136 2206
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2208
2139 return if $self->players; 2209 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2142 2212
2143 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2144 2214
2145 $self->deactivate; 2215 $self->deactivate;
… …
2170 2240
2171 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2242
2173 return if $self->players; 2243 return if $self->players;
2174 2244
2175 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2176 2246
2177 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2178 2248
2179 # need to save uniques path 2249 # need to save uniques path
2180 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
2263 2333
2264sub unique_maps() { 2334sub unique_maps() {
2265 [ 2335 [
2266 map { 2336 map {
2267 utf8::decode $_; 2337 utf8::decode $_;
2268 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2269 ? normalise $_ 2341 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2343 ]
2273} 2344}
2274 2345
2275package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2276 2377
2277=back 2378=back
2278 2379
2279=head3 cf::object 2380=head3 cf::object
2280 2381
… …
2284 2385
2285=over 4 2386=over 4
2286 2387
2287=item $ob->inv_recursive 2388=item $ob->inv_recursive
2288 2389
2289Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2290 2392
2291=cut 2393=cut
2292 2394
2293sub inv_recursive_; 2395sub inv_recursive_;
2294sub inv_recursive_ { 2396sub inv_recursive_ {
… …
2299 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2300} 2402}
2301 2403
2302=item $ref = $ob->ref 2404=item $ref = $ob->ref
2303 2405
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2406Creates and returns a persistent reference to an object that can be stored as a string.
2305 2407
2306=item $ob = cf::object::deref ($refstring) 2408=item $ob = cf::object::deref ($refstring)
2307 2409
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2411even if the object actually exists. May block.
… …
2341can be C<undef>. Does the right thing when the player is currently in a 2443can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2444dialogue with the given NPC character.
2343 2445
2344=cut 2446=cut
2345 2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2461
2346# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2463# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2466 my ($self, $npc, $msg, $flags) = @_;
… …
2361 my $dialog = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2479
2364 } else { 2480 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2483 }
2368 } 2484 }
2369} 2485}
2370 2486
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2487=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2396 2512
2397=item $player_object->enter_link 2513=item $player_object->enter_link
2398 2514
2399Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2400 2516
2401The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2403 2521
2404Will never block. 2522Will never block.
2405 2523
2406=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2407 2525
… …
2459 ($x, $y) = (-1, -1) 2577 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2578 unless (defined $x) && (defined $y);
2461 2579
2462 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2582 if $x <= 0 && $y <= 0;
2465 2583
2466 $map->load; 2584 $map->load;
2467 $map->load_neighbours; 2585 $map->load_neighbours;
2468 2586
2469 return unless $self->contr->active; 2587 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2588
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2474} 2594}
2475 2595
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2477 2597
2478Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2601the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2602be called at the end of this process.
2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2483 2606
2484=cut 2607=cut
2485 2608
2486our $GOTOGEN; 2609our $GOTOGEN;
2487 2610
… …
2566} 2689}
2567 2690
2568sub prepare_random_map { 2691sub prepare_random_map {
2569 my ($exit) = @_; 2692 my ($exit) = @_;
2570 2693
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2696 # that depends on the exit object
2576 2697
2577 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
… …
2579 if ($exit->map) { 2700 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2584 } 2707 }
2585 2708
2586 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2587 2710
2588 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2591 2714
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2717 undef $fh;
2595 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2596 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2599 } 2726 }
2600} 2727}
2601 2728
2602sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2604 2731
2605 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2606 2733
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2734 $self->enter_link;
2619 2735
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2736 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2737 $Coro::current->{desc} = "enter_exit";
2626 2738
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2629 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2630 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2631 1; 2760 1
2632 }) { 2761 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2766
2638 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2655sub cf::client::send_drawinfo { 2784sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 2785 my ($self, $text, $flags) = @_;
2657 2786
2658 utf8::encode $text; 2787 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789}
2790
2791=item $client->send_big_packet ($pkt)
2792
2793Like C<send_packet>, but tries to compress large packets, and fragments
2794them as required.
2795
2796=cut
2797
2798our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2799
2800sub cf::client::send_big_packet {
2801 my ($self, $pkt) = @_;
2802
2803 # try lzf for large packets
2804 $pkt = "lzf " . Compress::LZF::compress $pkt
2805 if 1024 <= length $pkt and $self->{can_lzf};
2806
2807 # split very large packets
2808 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2809 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2810 $pkt = "frag";
2811 }
2812
2813 $self->send_packet ($pkt);
2660} 2814}
2661 2815
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 2816=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 2817
2664Send a drawinfo or msg packet to the client, formatting the msg for the 2818Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2820the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2821the message unless the client supports the msg packet.
2668 2822
2669=cut 2823=cut
2670 2824
2825# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2826our %CHANNEL = (
2827 "c/motd" => {
2828 id => "infobox",
2829 title => "MOTD",
2830 reply => undef,
2831 tooltip => "The message of the day",
2832 },
2672 "c/identify" => { 2833 "c/identify" => {
2673 id => "infobox", 2834 id => "infobox",
2674 title => "Identify", 2835 title => "Identify",
2675 reply => undef, 2836 reply => undef,
2676 tooltip => "Items recently identified", 2837 tooltip => "Items recently identified",
… …
2678 "c/examine" => { 2839 "c/examine" => {
2679 id => "infobox", 2840 id => "infobox",
2680 title => "Examine", 2841 title => "Examine",
2681 reply => undef, 2842 reply => undef,
2682 tooltip => "Signs and other items you examined", 2843 tooltip => "Signs and other items you examined",
2844 },
2845 "c/shopinfo" => {
2846 id => "infobox",
2847 title => "Shop Info",
2848 reply => undef,
2849 tooltip => "What your bargaining skill tells you about the shop",
2683 }, 2850 },
2684 "c/book" => { 2851 "c/book" => {
2685 id => "infobox", 2852 id => "infobox",
2686 title => "Book", 2853 title => "Book",
2687 reply => undef, 2854 reply => undef,
… …
2703 id => "infobox", 2870 id => "infobox",
2704 title => "Body Parts", 2871 title => "Body Parts",
2705 reply => undef, 2872 reply => undef,
2706 tooltip => "Shows which body parts you posess and are available", 2873 tooltip => "Shows which body parts you posess and are available",
2707 }, 2874 },
2875 "c/statistics" => {
2876 id => "infobox",
2877 title => "Statistics",
2878 reply => undef,
2879 tooltip => "Shows your primary statistics",
2880 },
2881 "c/skills" => {
2882 id => "infobox",
2883 title => "Skills",
2884 reply => undef,
2885 tooltip => "Shows your experience per skill and item power",
2886 },
2887 "c/shopitems" => {
2888 id => "infobox",
2889 title => "Shop Items",
2890 reply => undef,
2891 tooltip => "Shows the items currently for sale in this shop",
2892 },
2893 "c/resistances" => {
2894 id => "infobox",
2895 title => "Resistances",
2896 reply => undef,
2897 tooltip => "Shows your resistances",
2898 },
2899 "c/pets" => {
2900 id => "infobox",
2901 title => "Pets",
2902 reply => undef,
2903 tooltip => "Shows information abotu your pets/a specific pet",
2904 },
2905 "c/perceiveself" => {
2906 id => "infobox",
2907 title => "Perceive Self",
2908 reply => undef,
2909 tooltip => "You gained detailed knowledge about yourself",
2910 },
2708 "c/uptime" => { 2911 "c/uptime" => {
2709 id => "infobox", 2912 id => "infobox",
2710 title => "Uptime", 2913 title => "Uptime",
2711 reply => undef, 2914 reply => undef,
2712 tooltip => "How long the server has been running sicne last restart", 2915 tooltip => "How long the server has been running since last restart",
2713 }, 2916 },
2714 "c/mapinfo" => { 2917 "c/mapinfo" => {
2715 id => "infobox", 2918 id => "infobox",
2716 title => "Map Info", 2919 title => "Map Info",
2717 reply => undef, 2920 reply => undef,
2718 tooltip => "Information related to the maps", 2921 tooltip => "Information related to the maps",
2719 }, 2922 },
2923 "c/party" => {
2924 id => "party",
2925 title => "Party",
2926 reply => "gsay ",
2927 tooltip => "Messages and chat related to your party",
2928 },
2929 "c/death" => {
2930 id => "death",
2931 title => "Death",
2932 reply => undef,
2933 tooltip => "Reason for and more info about your most recent death",
2934 },
2935 "c/say" => $SAY_CHANNEL,
2936 "c/chat" => $CHAT_CHANNEL,
2720); 2937);
2721 2938
2722sub cf::client::send_msg { 2939sub cf::client::send_msg {
2723 my ($self, $channel, $msg, $color, @extra) = @_; 2940 my ($self, $channel, $msg, $color, @extra) = @_;
2724 2941
2725 $msg = $self->pl->expand_cfpod ($msg); 2942 $msg = $self->pl->expand_cfpod ($msg)
2943 unless $color & cf::NDI_VERBATIM;
2726 2944
2727 $color &= cf::NDI_CLIENT_MASK; # just in case... 2945 $color &= cf::NDI_CLIENT_MASK; # just in case...
2728 2946
2729 # check predefined channels, for the benefit of C 2947 # check predefined channels, for the benefit of C
2730 if ($CHANNEL{$channel}) { 2948 if ($CHANNEL{$channel}) {
2731 $channel = $CHANNEL{$channel}; 2949 $channel = $CHANNEL{$channel};
2732 2950
2733 $self->ext_msg (channel_info => $channel) 2951 $self->ext_msg (channel_info => $channel);
2734 if $self->can_msg;
2735
2736 $channel = $channel->{id}; 2952 $channel = $channel->{id};
2737 2953
2738 } elsif (ref $channel) { 2954 } elsif (ref $channel) {
2739 # send meta info to client, if not yet sent 2955 # send meta info to client, if not yet sent
2740 unless (exists $self->{channel}{$channel->{id}}) { 2956 unless (exists $self->{channel}{$channel->{id}}) {
2741 $self->{channel}{$channel->{id}} = $channel; 2957 $self->{channel}{$channel->{id}} = $channel;
2742 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2743 if $self->can_msg;
2744 } 2959 }
2745 2960
2746 $channel = $channel->{id}; 2961 $channel = $channel->{id};
2747 } 2962 }
2748 2963
2749 return unless @extra || length $msg; 2964 return unless @extra || length $msg;
2750 2965
2751 if ($self->can_msg) {
2752 # default colour, mask it out 2966 # default colour, mask it out
2753 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2967 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2754 if $color & cf::NDI_DEF; 2968 if $color & cf::NDI_DEF;
2755 2969
2756 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2970 my $pkt = "msg "
2971 . $self->{json_coder}->encode (
2757 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2972 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2758 } else { 2973 );
2759 if ($color >= 0) {
2760 # replace some tags by gcfclient-compatible ones
2761 for ($msg) {
2762 1 while
2763 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2764 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2765 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2766 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2767 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2768 }
2769 2974
2770 $color &= cf::NDI_COLOR_MASK; 2975 $self->send_big_packet ($pkt);
2771
2772 utf8::encode $msg;
2773
2774 if (0 && $msg =~ /\[/) {
2775 # COMMAND/INFO
2776 $self->send_packet ("drawextinfo $color 10 8 $msg")
2777 } else {
2778 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2779 $self->send_packet ("drawinfo $color $msg")
2780 }
2781 }
2782 }
2783} 2976}
2784 2977
2785=item $client->ext_msg ($type, @msg) 2978=item $client->ext_msg ($type, @msg)
2786 2979
2787Sends an ext event to the client. 2980Sends an ext event to the client.
… …
2790 2983
2791sub cf::client::ext_msg($$@) { 2984sub cf::client::ext_msg($$@) {
2792 my ($self, $type, @msg) = @_; 2985 my ($self, $type, @msg) = @_;
2793 2986
2794 if ($self->extcmd == 2) { 2987 if ($self->extcmd == 2) {
2795 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2988 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2796 } elsif ($self->extcmd == 1) { # TODO: remove 2989 } elsif ($self->extcmd == 1) { # TODO: remove
2797 push @msg, msgtype => "event_$type"; 2990 push @msg, msgtype => "event_$type";
2798 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2991 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2799 } 2992 }
2800} 2993}
2801 2994
2802=item $client->ext_reply ($msgid, @msg) 2995=item $client->ext_reply ($msgid, @msg)
2803 2996
… …
2807 3000
2808sub cf::client::ext_reply($$@) { 3001sub cf::client::ext_reply($$@) {
2809 my ($self, $id, @msg) = @_; 3002 my ($self, $id, @msg) = @_;
2810 3003
2811 if ($self->extcmd == 2) { 3004 if ($self->extcmd == 2) {
2812 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3005 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2813 } elsif ($self->extcmd == 1) { 3006 } elsif ($self->extcmd == 1) {
2814 #TODO: version 1, remove 3007 #TODO: version 1, remove
2815 unshift @msg, msgtype => "reply", msgid => $id; 3008 unshift @msg, msgtype => "reply", msgid => $id;
2816 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3009 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2817 } 3010 }
2818} 3011}
2819 3012
2820=item $success = $client->query ($flags, "text", \&cb) 3013=item $success = $client->query ($flags, "text", \&cb)
2821 3014
… …
2948our $safe_hole = new Safe::Hole; 3141our $safe_hole = new Safe::Hole;
2949 3142
2950$SIG{FPE} = 'IGNORE'; 3143$SIG{FPE} = 'IGNORE';
2951 3144
2952$safe->permit_only (Opcode::opset qw( 3145$safe->permit_only (Opcode::opset qw(
2953 :base_core :base_mem :base_orig :base_math 3146 :base_core :base_mem :base_orig :base_math :base_loop
2954 grepstart grepwhile mapstart mapwhile 3147 grepstart grepwhile mapstart mapwhile
2955 sort time 3148 sort time
2956)); 3149));
2957 3150
2958# here we export the classes and methods available to script code 3151# here we export the classes and methods available to script code
… …
2961 3154
2962The following functions and methods are available within a safe environment: 3155The following functions and methods are available within a safe environment:
2963 3156
2964 cf::object 3157 cf::object
2965 contr pay_amount pay_player map x y force_find force_add destroy 3158 contr pay_amount pay_player map x y force_find force_add destroy
2966 insert remove name archname title slaying race decrease_ob_nr 3159 insert remove name archname title slaying race decrease split
3160 value
2967 3161
2968 cf::object::player 3162 cf::object::player
2969 player 3163 player
2970 3164
2971 cf::player 3165 cf::player
… …
2976 3170
2977=cut 3171=cut
2978 3172
2979for ( 3173for (
2980 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3174 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2981 insert remove inv name archname title slaying race 3175 insert remove inv nrof name archname title slaying race
2982 decrease_ob_nr destroy)], 3176 decrease split destroy change_exp value msg lore send_msg)],
2983 ["cf::object::player" => qw(player)], 3177 ["cf::object::player" => qw(player)],
2984 ["cf::player" => qw(peaceful)], 3178 ["cf::player" => qw(peaceful send_msg)],
2985 ["cf::map" => qw(trigger)], 3179 ["cf::map" => qw(trigger)],
2986) { 3180) {
2987 no strict 'refs'; 3181 no strict 'refs';
2988 my ($pkg, @funs) = @$_; 3182 my ($pkg, @funs) = @$_;
2989 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3007 3201
3008 my $qcode = $code; 3202 my $qcode = $code;
3009 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3010 $qcode =~ s/\n/\\n/g; 3204 $qcode =~ s/\n/\\n/g;
3011 3205
3206 %vars = (_dummy => 0) unless %vars;
3207
3208 my @res;
3012 local $_; 3209 local $_;
3013 local @safe::cf::_safe_eval_args = values %vars;
3014 3210
3015 my $eval = 3211 my $eval =
3016 "do {\n" 3212 "do {\n"
3017 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3018 . "#line 0 \"{$qcode}\"\n" 3214 . "#line 0 \"{$qcode}\"\n"
3019 . $code 3215 . $code
3020 . "\n}" 3216 . "\n}"
3021 ; 3217 ;
3022 3218
3219 if ($CFG{safe_eval}) {
3023 sub_generation_inc; 3220 sub_generation_inc;
3221 local @safe::cf::_safe_eval_args = values %vars;
3024 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3222 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3025 sub_generation_inc; 3223 sub_generation_inc;
3224 } else {
3225 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval;
3227 }
3026 3228
3027 if ($@) { 3229 if ($@) {
3028 warn "$@"; 3230 warn "$@";
3029 warn "while executing safe code '$code'\n"; 3231 warn "while executing safe code '$code'\n";
3030 warn "with arguments " . (join " ", %vars) . "\n"; 3232 warn "with arguments " . (join " ", %vars) . "\n";
… …
3049=cut 3251=cut
3050 3252
3051sub register_script_function { 3253sub register_script_function {
3052 my ($fun, $cb) = @_; 3254 my ($fun, $cb) = @_;
3053 3255
3054 no strict 'refs'; 3256 $fun = "safe::$fun" if $CFG{safe_eval};
3055 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3257 *$fun = $safe_hole->wrap ($cb);
3056} 3258}
3057 3259
3058=back 3260=back
3059 3261
3060=cut 3262=cut
… …
3081 3283
3082 $facedata->{version} == 2 3284 $facedata->{version} == 2
3083 or cf::cleanup "$path: version mismatch, cannot proceed."; 3285 or cf::cleanup "$path: version mismatch, cannot proceed.";
3084 3286
3085 # patch in the exptable 3287 # patch in the exptable
3288 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3086 $facedata->{resource}{"res/exp_table"} = { 3289 $facedata->{resource}{"res/exp_table"} = {
3087 type => FT_RSRC, 3290 type => FT_RSRC,
3088 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3291 data => $exp_table,
3292 hash => (Digest::MD5::md5 $exp_table),
3089 }; 3293 };
3090 cf::cede_to_tick; 3294 cf::cede_to_tick;
3091 3295
3092 { 3296 {
3093 my $faces = $facedata->{faceinfo}; 3297 my $faces = $facedata->{faceinfo};
3094 3298
3095 while (my ($face, $info) = each %$faces) { 3299 while (my ($face, $info) = each %$faces) {
3096 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3300 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3301
3097 cf::face::set_visibility $idx, $info->{visibility}; 3302 cf::face::set_visibility $idx, $info->{visibility};
3098 cf::face::set_magicmap $idx, $info->{magicmap}; 3303 cf::face::set_magicmap $idx, $info->{magicmap};
3099 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3304 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3100 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3305 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3101 3306
3102 cf::cede_to_tick; 3307 cf::cede_to_tick;
3103 } 3308 }
3104 3309
3105 while (my ($face, $info) = each %$faces) { 3310 while (my ($face, $info) = each %$faces) {
3106 next unless $info->{smooth}; 3311 next unless $info->{smooth};
3312
3107 my $idx = cf::face::find $face 3313 my $idx = cf::face::find $face
3108 or next; 3314 or next;
3315
3109 if (my $smooth = cf::face::find $info->{smooth}) { 3316 if (my $smooth = cf::face::find $info->{smooth}) {
3110 cf::face::set_smooth $idx, $smooth; 3317 cf::face::set_smooth $idx, $smooth;
3111 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3112 } else { 3319 } else {
3113 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3320 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3127 3334
3128 cf::anim::invalidate_all; # d'oh 3335 cf::anim::invalidate_all; # d'oh
3129 } 3336 }
3130 3337
3131 { 3338 {
3132 # TODO: for gcfclient pleasure, we should give resources
3133 # that gcfclient doesn't grok a >10000 face index.
3134 my $res = $facedata->{resource}; 3339 my $res = $facedata->{resource};
3135 3340
3136 my $soundconf = delete $res->{"res/sound.conf"};
3137
3138 while (my ($name, $info) = each %$res) { 3341 while (my ($name, $info) = each %$res) {
3342 if (defined $info->{type}) {
3139 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3343 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3140 my $data;
3141 3344
3142 if ($info->{type} & 1) { 3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3143 # prepend meta info 3346 cf::face::set_type $idx, $info->{type};
3144
3145 my $meta = $enc->encode ({
3146 name => $name,
3147 %{ $info->{meta} || {} },
3148 });
3149
3150 $data = pack "(w/a*)*", $meta, $info->{data};
3151 } else { 3347 } else {
3152 $data = $info->{data}; 3348 $RESOURCE{$name} = $info;
3153 } 3349 }
3154 3350
3155 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3156 cf::face::set_type $idx, $info->{type};
3157
3158 cf::cede_to_tick; 3351 cf::cede_to_tick;
3159 } 3352 }
3160
3161 if ($soundconf) {
3162 $soundconf = $enc->decode (delete $soundconf->{data});
3163
3164 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3165 my $sound = $soundconf->{compat}[$_]
3166 or next;
3167
3168 my $face = cf::face::find "sound/$sound->[1]";
3169 cf::sound::set $sound->[0] => $face;
3170 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3171 }
3172
3173 while (my ($k, $v) = each %{$soundconf->{event}}) {
3174 my $face = cf::face::find "sound/$v";
3175 cf::sound::set $k => $face;
3176 }
3177 }
3178 } 3353 }
3354
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3179 3356
3180 1 3357 1
3181} 3358}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3182 3379
3183register_exticmd fx_want => sub { 3380register_exticmd fx_want => sub {
3184 my ($ns, $want) = @_; 3381 my ($ns, $want) = @_;
3185 3382
3186 while (my ($k, $v) = each %$want) { 3383 while (my ($k, $v) = each %$want) {
3187 $ns->fx_want ($k, $v); 3384 $ns->fx_want ($k, $v);
3188 } 3385 }
3189}; 3386};
3387
3388sub load_resource_file($) {
3389 my $guard = lock_acquire "load_resource_file";
3390
3391 my $status = load_resource_file_ $_[0];
3392 get_slot 0.1, 100;
3393 cf::arch::commit_load;
3394
3395 $status
3396}
3190 3397
3191sub reload_regions { 3398sub reload_regions {
3192 # HACK to clear player env face cache, we need some signal framework 3399 # HACK to clear player env face cache, we need some signal framework
3193 # for this (global event?) 3400 # for this (global event?)
3194 %ext::player_env::MUSIC_FACE_CACHE = (); 3401 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3208} 3415}
3209 3416
3210sub reload_archetypes { 3417sub reload_archetypes {
3211 load_resource_file "$DATADIR/archetypes" 3418 load_resource_file "$DATADIR/archetypes"
3212 or die "unable to load archetypes\n"; 3419 or die "unable to load archetypes\n";
3213 #d# NEED to laod twice to resolve forward references
3214 # this really needs to be done in an extra post-pass
3215 # (which needs to be synchronous, so solve it differently)
3216 load_resource_file "$DATADIR/archetypes"
3217 or die "unable to load archetypes\n";
3218} 3420}
3219 3421
3220sub reload_treasures { 3422sub reload_treasures {
3221 load_resource_file "$DATADIR/treasures" 3423 load_resource_file "$DATADIR/treasures"
3222 or die "unable to load treasurelists\n"; 3424 or die "unable to load treasurelists\n";
3223} 3425}
3224 3426
3225sub reload_resources { 3427sub reload_resources {
3226 warn "reloading resource files...\n"; 3428 warn "reloading resource files...\n";
3227 3429
3430 reload_facedata;
3431 reload_archetypes;
3228 reload_regions; 3432 reload_regions;
3229 reload_facedata;
3230 #reload_archetypes;#d#
3231 reload_archetypes;
3232 reload_treasures; 3433 reload_treasures;
3233 3434
3234 warn "finished reloading resource files\n"; 3435 warn "finished reloading resource files\n";
3235} 3436}
3236 3437
3237sub init {
3238 reload_resources;
3239}
3240
3241sub reload_config { 3438sub reload_config {
3439 warn "reloading config file...\n";
3440
3242 open my $fh, "<:utf8", "$CONFDIR/config" 3441 open my $fh, "<:utf8", "$CONFDIR/config"
3243 or return; 3442 or return;
3244 3443
3245 local $/; 3444 local $/;
3246 *CFG = YAML::Syck::Load <$fh>; 3445 *CFG = YAML::XS::Load scalar <$fh>;
3247 3446
3248 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3249 3448
3250 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3251 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3255 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3256 and die "WARNING: m(un)lockall failed: $!\n"; 3455 and die "WARNING: m(un)lockall failed: $!\n";
3257 }; 3456 };
3258 warn $@ if $@; 3457 warn $@ if $@;
3259 } 3458 }
3459
3460 warn "finished reloading resource files\n";
3461}
3462
3463sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!";
3466 flock $fh, &Fcntl::LOCK_EX
3467 or die "$PIDFILE: flock: $!";
3468 $fh
3469}
3470
3471# make sure only one server instance is running at any one time
3472sub atomic {
3473 my $fh = pidfile;
3474
3475 my $pid = <$fh>;
3476 kill 9, $pid if $pid > 0;
3477
3478 seek $fh, 0, 0;
3479 print $fh $$;
3480}
3481
3482sub main_loop {
3483 warn "EV::loop starting\n";
3484 if (1) {
3485 EV::loop;
3486 }
3487 warn "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP;
3260} 3489}
3261 3490
3262sub main { 3491sub main {
3492 cf::init_globals; # initialise logging
3493
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505
3263 # we must not ever block the main coroutine 3506 # we must not ever block the main coroutine
3264 local $Coro::idle = sub { 3507 local $Coro::idle = sub {
3265 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3508 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3266 (async { 3509 (async {
3267 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3510 $Coro::current->{desc} = "IDLE BUG HANDLER";
3268 Event::one_event; 3511 EV::loop EV::LOOP_ONESHOT;
3269 })->prio (Coro::PRIO_MAX); 3512 })->prio (Coro::PRIO_MAX);
3270 }; 3513 };
3271 3514
3515 evthread_start IO::AIO::poll_fileno;
3516
3517 cf::sync_job {
3518 cf::load_settings;
3519 cf::load_materials;
3520
3521 reload_resources;
3272 reload_config; 3522 reload_config;
3273 db_init; 3523 db_init;
3524
3525 cf::init_uuid;
3526 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills;
3529
3530 cf::init_beforeplay;
3531
3532 atomic;
3533
3274 load_extensions; 3534 load_extensions;
3275 3535
3276 $TICK_WATCHER->start; 3536 utime time, time, $RUNTIMEFILE;
3277 Event::loop; 3537
3538 # no (long-running) fork's whatsoever before this point(!)
3539 use POSIX ();
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541
3542 (pop @POST_INIT)->(0) while @POST_INIT;
3543 };
3544
3545 main_loop;
3278} 3546}
3279 3547
3280############################################################################# 3548#############################################################################
3281# initialisation and cleanup 3549# initialisation and cleanup
3282 3550
3283# install some emergency cleanup handlers 3551# install some emergency cleanup handlers
3284BEGIN { 3552BEGIN {
3553 our %SIGWATCHER = ();
3285 for my $signal (qw(INT HUP TERM)) { 3554 for my $signal (qw(INT HUP TERM)) {
3286 Event->signal ( 3555 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 signal => $signal,
3290 prio => 0,
3291 cb => sub {
3292 cf::cleanup "SIG$signal"; 3556 cf::cleanup "SIG$signal";
3293 },
3294 ); 3557 };
3295 } 3558 }
3296} 3559}
3297 3560
3298sub write_runtime { 3561sub write_runtime_sync {
3299 my $runtime = "$LOCALDIR/runtime";
3300
3301 # first touch the runtime file to show we are still running: 3562 # first touch the runtime file to show we are still running:
3302 # the fsync below can take a very very long time. 3563 # the fsync below can take a very very long time.
3303 3564
3304 IO::AIO::aio_utime $runtime, undef, undef; 3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3305 3566
3306 my $guard = cf::lock_acquire "write_runtime"; 3567 my $guard = cf::lock_acquire "write_runtime";
3307 3568
3308 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3309 or return; 3570 or return;
3310 3571
3311 my $value = $cf::RUNTIME + 90 + 10; 3572 my $value = $cf::RUNTIME + 90 + 10;
3312 # 10 is the runtime save interval, for a monotonic clock 3573 # 10 is the runtime save interval, for a monotonic clock
3313 # 60 allows for the watchdog to kill the server. 3574 # 60 allows for the watchdog to kill the server.
… …
3323 aio_utime $fh, undef, undef; 3584 aio_utime $fh, undef, undef;
3324 3585
3325 close $fh 3586 close $fh
3326 or return; 3587 or return;
3327 3588
3328 aio_rename "$runtime~", $runtime 3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3329 and return; 3590 and return;
3330 3591
3331 warn "runtime file written.\n"; 3592 warn "runtime file written.\n";
3332 3593
3333 1 3594 1
3595}
3596
3597our $uuid_lock;
3598our $uuid_skip;
3599
3600sub write_uuid_sync($) {
3601 $uuid_skip ||= $_[0];
3602
3603 return if $uuid_lock;
3604 local $uuid_lock = 1;
3605
3606 my $uuid = "$LOCALDIR/uuid";
3607
3608 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3609 or return;
3610
3611 my $value = uuid_seq uuid_cur;
3612
3613 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n";
3615 return;
3616 }
3617
3618 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0;
3620
3621 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3622 and return;
3623
3624 # always fsync - this file is important
3625 aio_fsync $fh
3626 and return;
3627
3628 close $fh
3629 or return;
3630
3631 aio_rename "$uuid~", $uuid
3632 and return;
3633
3634 warn "uuid file written ($value).\n";
3635
3636 1
3637
3638}
3639
3640sub write_uuid($$) {
3641 my ($skip, $sync) = @_;
3642
3643 $sync ? write_uuid_sync $skip
3644 : async { write_uuid_sync $skip };
3334} 3645}
3335 3646
3336sub emergency_save() { 3647sub emergency_save() {
3337 my $freeze_guard = cf::freeze_mainloop; 3648 my $freeze_guard = cf::freeze_mainloop;
3338 3649
3339 warn "enter emergency perl save\n"; 3650 warn "emergency_perl_save: enter\n";
3340 3651
3341 cf::sync_job { 3652 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657
3342 # use a peculiar iteration method to avoid tripping on perl 3658 # use a peculiar iteration method to avoid tripping on perl
3343 # refcount bugs in for. also avoids problems with players 3659 # refcount bugs in for. also avoids problems with players
3344 # and maps saved/destroyed asynchronously. 3660 # and maps saved/destroyed asynchronously.
3345 warn "begin emergency player save\n"; 3661 warn "emergency_perl_save: begin player save\n";
3346 for my $login (keys %cf::PLAYER) { 3662 for my $login (keys %cf::PLAYER) {
3347 my $pl = $cf::PLAYER{$login} or next; 3663 my $pl = $cf::PLAYER{$login} or next;
3348 $pl->valid or next; 3664 $pl->valid or next;
3349 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3350 $pl->save; 3666 $pl->save;
3351 } 3667 }
3352 warn "end emergency player save\n"; 3668 warn "emergency_perl_save: end player save\n";
3353 3669
3354 warn "begin emergency map save\n"; 3670 warn "emergency_perl_save: begin map save\n";
3355 for my $path (keys %cf::MAP) { 3671 for my $path (keys %cf::MAP) {
3356 my $map = $cf::MAP{$path} or next; 3672 my $map = $cf::MAP{$path} or next;
3357 $map->valid or next; 3673 $map->valid or next;
3358 $map->save; 3674 $map->save;
3359 } 3675 }
3360 warn "end emergency map save\n"; 3676 warn "emergency_perl_save: end map save\n";
3361 3677
3362 warn "begin emergency database checkpoint\n"; 3678 warn "emergency_perl_save: begin database checkpoint\n";
3363 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3364 warn "end emergency database checkpoint\n"; 3680 warn "emergency_perl_save: end database checkpoint\n";
3681
3682 warn "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n";
3365 }; 3685 };
3366 3686
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3367 warn "leave emergency perl save\n"; 3692 warn "emergency_perl_save: leave\n";
3368} 3693}
3369 3694
3370sub post_cleanup { 3695sub post_cleanup {
3371 my ($make_core) = @_; 3696 my ($make_core) = @_;
3372 3697
3373 warn Carp::longmess "post_cleanup backtrace" 3698 warn Carp::longmess "post_cleanup backtrace"
3374 if $make_core; 3699 if $make_core;
3700
3701 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$;
3703}
3704
3705# a safer delete_package, copied from Symbol
3706sub clear_package($) {
3707 my $pkg = shift;
3708
3709 # expand to full symbol table name if needed
3710 unless ($pkg =~ /^main::.*::$/) {
3711 $pkg = "main$pkg" if $pkg =~ /^::/;
3712 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3713 $pkg .= '::' unless $pkg =~ /::$/;
3714 }
3715
3716 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3717 my $stem_symtab = *{$stem}{HASH};
3718
3719 defined $stem_symtab and exists $stem_symtab->{$leaf}
3720 or return;
3721
3722 # clear all symbols
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 }
3728 warn "cleared package $pkg\n";#d#
3375} 3729}
3376 3730
3377sub do_reload_perl() { 3731sub do_reload_perl() {
3378 # can/must only be called in main 3732 # can/must only be called in main
3379 if ($Coro::current != $Coro::main) { 3733 if ($Coro::current != $Coro::main) {
3380 warn "can only reload from main coroutine"; 3734 warn "can only reload from main coroutine";
3381 return; 3735 return;
3382 } 3736 }
3383 3737
3738 return if $RELOAD++;
3739
3740 my $t1 = EV::time;
3741
3742 while ($RELOAD) {
3384 warn "reloading..."; 3743 warn "reloading...";
3385 3744
3386 warn "entering sync_job"; 3745 warn "entering sync_job";
3387 3746
3388 cf::sync_job { 3747 cf::sync_job {
3389 cf::write_runtime; # external watchdog should not bark 3748 cf::write_runtime_sync; # external watchdog should not bark
3390 cf::emergency_save; 3749 cf::emergency_save;
3391 cf::write_runtime; # external watchdog should not bark 3750 cf::write_runtime_sync; # external watchdog should not bark
3392 3751
3393 warn "syncing database to disk"; 3752 warn "syncing database to disk";
3394 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3395 3754
3396 # if anything goes wrong in here, we should simply crash as we already saved 3755 # if anything goes wrong in here, we should simply crash as we already saved
3397 3756
3398 warn "cancelling all WF_AUTOCANCEL watchers";
3399 for (Event::all_watchers) {
3400 $_->cancel if $_->data & WF_AUTOCANCEL;
3401 }
3402
3403 warn "flushing outstanding aio requests"; 3757 warn "flushing outstanding aio requests";
3404 for (;;) {
3405 BDB::flush;
3406 IO::AIO::flush;
3407 Coro::cede_notself;
3408 last unless IO::AIO::nreqs || BDB::nreqs; 3758 while (IO::AIO::nreqs || BDB::nreqs) {
3409 warn "iterate..."; 3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3410 }
3411
3412 ++$RELOAD;
3413
3414 warn "cancelling all extension coros";
3415 $_->cancel for values %EXT_CORO;
3416 %EXT_CORO = ();
3417
3418 warn "removing commands";
3419 %COMMAND = ();
3420
3421 warn "removing ext/exti commands";
3422 %EXTCMD = ();
3423 %EXTICMD = ();
3424
3425 warn "unloading/nuking all extensions";
3426 for my $pkg (@EXTS) {
3427 warn "... unloading $pkg";
3428
3429 if (my $cb = $pkg->can ("unload")) {
3430 eval {
3431 $cb->($pkg);
3432 1
3433 } or warn "$pkg unloaded, but with errors: $@";
3434 } 3760 }
3435 3761
3436 warn "... nuking $pkg"; 3762 warn "cancelling all extension coros";
3437 Symbol::delete_package $pkg; 3763 $_->cancel for values %EXT_CORO;
3438 } 3764 %EXT_CORO = ();
3439 3765
3440 warn "unloading all perl modules loaded from $LIBDIR"; 3766 warn "removing commands";
3441 while (my ($k, $v) = each %INC) { 3767 %COMMAND = ();
3442 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3443 3768
3769 warn "removing ext/exti commands";
3770 %EXTCMD = ();
3771 %EXTICMD = ();
3772
3773 warn "unloading/nuking all extensions";
3774 for my $pkg (@EXTS) {
3444 warn "... unloading $k"; 3775 warn "... unloading $pkg";
3445 delete $INC{$k};
3446 3776
3447 $k =~ s/\.pm$//;
3448 $k =~ s/\//::/g;
3449
3450 if (my $cb = $k->can ("unload_module")) { 3777 if (my $cb = $pkg->can ("unload")) {
3778 eval {
3451 $cb->(); 3779 $cb->($pkg);
3780 1
3781 } or warn "$pkg unloaded, but with errors: $@";
3782 }
3783
3784 warn "... clearing $pkg";
3785 clear_package $pkg;
3452 } 3786 }
3453 3787
3454 Symbol::delete_package $k; 3788 warn "unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791
3792 warn "... unloading $k";
3793 delete $INC{$k};
3794
3795 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g;
3797
3798 if (my $cb = $k->can ("unload_module")) {
3799 $cb->();
3800 }
3801
3802 clear_package $k;
3455 } 3803 }
3456 3804
3457 warn "getting rid of safe::, as good as possible"; 3805 warn "getting rid of safe::, as good as possible";
3458 Symbol::delete_package "safe::$_" 3806 clear_package "safe::$_"
3459 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3460 3808
3461 warn "unloading cf.pm \"a bit\""; 3809 warn "unloading cf.pm \"a bit\"";
3462 delete $INC{"cf.pm"}; 3810 delete $INC{"cf.pm"};
3463 delete $INC{"cf/pod.pm"}; 3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3464 3812
3465 # don't, removes xs symbols, too, 3813 # don't, removes xs symbols, too,
3466 # and global variables created in xs 3814 # and global variables created in xs
3467 #Symbol::delete_package __PACKAGE__; 3815 #clear_package __PACKAGE__;
3468 3816
3469 warn "unload completed, starting to reload now"; 3817 warn "unload completed, starting to reload now";
3470 3818
3471 warn "reloading cf.pm"; 3819 warn "reloading cf.pm";
3472 require cf; 3820 require cf;
3473 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3821 cf::_connect_to_perl_1;
3474 3822
3475 warn "loading config and database again"; 3823 warn "loading config and database again";
3476 cf::reload_config; 3824 cf::reload_config;
3477 3825
3478 warn "loading extensions"; 3826 warn "loading extensions";
3479 cf::load_extensions; 3827 cf::load_extensions;
3480 3828
3829 if ($REATTACH_ON_RELOAD) {
3481 warn "reattaching attachments to objects/players"; 3830 warn "reattaching attachments to objects/players";
3482 _global_reattach; # objects, sockets 3831 _global_reattach; # objects, sockets
3483 warn "reattaching attachments to maps"; 3832 warn "reattaching attachments to maps";
3484 reattach $_ for values %MAP; 3833 reattach $_ for values %MAP;
3485 warn "reattaching attachments to players"; 3834 warn "reattaching attachments to players";
3486 reattach $_ for values %PLAYER; 3835 reattach $_ for values %PLAYER;
3836 }
3487 3837
3838 warn "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT;
3840
3488 warn "leaving sync_job"; 3841 warn "leaving sync_job";
3489 3842
3490 1 3843 1
3491 } or do { 3844 } or do {
3492 warn $@; 3845 warn $@;
3493 warn "error while reloading, exiting."; 3846 cf::cleanup "error while reloading, exiting.";
3494 exit 1;
3495 }; 3847 };
3496 3848
3497 warn "reloaded"; 3849 warn "reloaded";
3850 --$RELOAD;
3851 }
3852
3853 $t1 = EV::time - $t1;
3854 warn "reload completed in ${t1}s\n";
3498}; 3855};
3499 3856
3500our $RELOAD_WATCHER; # used only during reload 3857our $RELOAD_WATCHER; # used only during reload
3501 3858
3502sub reload_perl() { 3859sub reload_perl() {
3503 # doing reload synchronously and two reloads happen back-to-back, 3860 # doing reload synchronously and two reloads happen back-to-back,
3504 # coro crashes during coro_state_free->destroy here. 3861 # coro crashes during coro_state_free->destroy here.
3505 3862
3506 $RELOAD_WATCHER ||= Event->timer ( 3863 $RELOAD_WATCHER ||= cf::async {
3507 reentrant => 0, 3864 Coro::AIO::aio_wait cache_extensions;
3508 after => 0, 3865
3509 data => WF_AUTOCANCEL, 3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3510 cb => sub {
3511 do_reload_perl; 3867 do_reload_perl;
3512 undef $RELOAD_WATCHER; 3868 undef $RELOAD_WATCHER;
3513 }, 3869 };
3514 ); 3870 };
3515} 3871}
3516 3872
3517register_command "reload" => sub { 3873register_command "reload" => sub {
3518 my ($who, $arg) = @_; 3874 my ($who, $arg) = @_;
3519 3875
… …
3532 3888
3533our @WAIT_FOR_TICK; 3889our @WAIT_FOR_TICK;
3534our @WAIT_FOR_TICK_BEGIN; 3890our @WAIT_FOR_TICK_BEGIN;
3535 3891
3536sub wait_for_tick { 3892sub wait_for_tick {
3537 return unless $TICK_WATCHER->is_active;
3538 return if $Coro::current == $Coro::main; 3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3539 3894
3540 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3541 push @WAIT_FOR_TICK, $signal; 3896 push @WAIT_FOR_TICK, $signal;
3542 $signal->wait; 3897 $signal->wait;
3543} 3898}
3544 3899
3545sub wait_for_tick_begin { 3900sub wait_for_tick_begin {
3546 return unless $TICK_WATCHER->is_active;
3547 return if $Coro::current == $Coro::main; 3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3548 3902
3549 my $signal = new Coro::Signal; 3903 my $signal = new Coro::Signal;
3550 push @WAIT_FOR_TICK_BEGIN, $signal; 3904 push @WAIT_FOR_TICK_BEGIN, $signal;
3551 $signal->wait; 3905 $signal->wait;
3552} 3906}
3553 3907
3554$TICK_WATCHER = Event->timer ( 3908sub tick {
3555 reentrant => 0,
3556 parked => 1,
3557 prio => 0,
3558 at => $NEXT_TICK || $TICK,
3559 data => WF_AUTOCANCEL,
3560 cb => sub {
3561 if ($Coro::current != $Coro::main) { 3909 if ($Coro::current != $Coro::main) {
3562 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3910 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3563 unless ++$bug_warning > 10; 3911 unless ++$bug_warning > 10;
3564 return; 3912 return;
3565 } 3913 }
3566 3914
3567 $NOW = $tick_start = Event::time;
3568
3569 cf::server_tick; # one server iteration 3915 cf::server_tick; # one server iteration
3570 3916
3571 $RUNTIME += $TICK;
3572 $NEXT_TICK += $TICK;
3573
3574 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3917 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3575 $NEXT_RUNTIME_WRITE = $NOW + 10; 3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3576 Coro::async_pool { 3919 Coro::async_pool {
3577 $Coro::current->{desc} = "runtime saver"; 3920 $Coro::current->{desc} = "runtime saver";
3578 write_runtime 3921 write_runtime_sync
3579 or warn "ERROR: unable to write runtime file: $!"; 3922 or warn "ERROR: unable to write runtime file: $!";
3580 };
3581 } 3923 };
3924 }
3582 3925
3583 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3584 $sig->send; 3927 $sig->send;
3585 } 3928 }
3586 while (my $sig = shift @WAIT_FOR_TICK) { 3929 while (my $sig = shift @WAIT_FOR_TICK) {
3587 $sig->send; 3930 $sig->send;
3588 } 3931 }
3589 3932
3590 $NOW = Event::time; 3933 $LOAD = ($NOW - $TICK_START) / $TICK;
3591
3592 # if we are delayed by four ticks or more, skip them all
3593 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3594
3595 $TICK_WATCHER->at ($NEXT_TICK);
3596 $TICK_WATCHER->start;
3597
3598 $LOAD = ($NOW - $tick_start) / $TICK;
3599 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3934 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3600 3935
3601 _post_tick; 3936 if (0) {
3937 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d#
3941 }
3602 }, 3942 }
3603); 3943}
3604 3944
3605{ 3945{
3946 # configure BDB
3947
3606 BDB::min_parallel 8; 3948 BDB::min_parallel 8;
3607 BDB::max_poll_time $TICK * 0.1; 3949 BDB::max_poll_reqs $TICK * 0.1;
3608 $BDB_POLL_WATCHER = Event->io ( 3950 $AnyEvent::BDB::WATCHER->priority (1);
3609 reentrant => 0,
3610 fd => BDB::poll_fileno,
3611 poll => 'r',
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => \&BDB::poll_cb,
3615 );
3616
3617 BDB::set_sync_prepare {
3618 my $status;
3619 my $current = $Coro::current;
3620 (
3621 sub {
3622 $status = $!;
3623 $current->ready; undef $current;
3624 },
3625 sub {
3626 Coro::schedule while defined $current;
3627 $! = $status;
3628 },
3629 )
3630 };
3631 3951
3632 unless ($DB_ENV) { 3952 unless ($DB_ENV) {
3633 $DB_ENV = BDB::db_env_create; 3953 $DB_ENV = BDB::db_env_create;
3634 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3954 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3635 | BDB::LOG_AUTOREMOVE, 1); 3955 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3956 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3636 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3957 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3637 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3958 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3638 3959
3639 cf::sync_job { 3960 cf::sync_job {
3640 eval { 3961 eval {
… …
3650 3971
3651 cf::cleanup "db_env_open(db): $@" if $@; 3972 cf::cleanup "db_env_open(db): $@" if $@;
3652 }; 3973 };
3653 } 3974 }
3654 3975
3655 $BDB_DEADLOCK_WATCHER = Event->timer ( 3976 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3656 after => 3,
3657 interval => 1,
3658 hard => 1,
3659 prio => 0,
3660 data => WF_AUTOCANCEL,
3661 cb => sub {
3662 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3977 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3663 },
3664 ); 3978 };
3665 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3979 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3666 after => 11,
3667 interval => 60,
3668 hard => 1,
3669 prio => 0,
3670 data => WF_AUTOCANCEL,
3671 cb => sub {
3672 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3980 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3673 },
3674 ); 3981 };
3675 $BDB_TRICKLE_WATCHER = Event->timer ( 3982 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3676 after => 5,
3677 interval => 10,
3678 hard => 1,
3679 prio => 0,
3680 data => WF_AUTOCANCEL,
3681 cb => sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3983 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 },
3684 ); 3984 };
3685} 3985}
3686 3986
3687{ 3987{
3988 # configure IO::AIO
3989
3688 IO::AIO::min_parallel 8; 3990 IO::AIO::min_parallel 8;
3689
3690 undef $Coro::AIO::WATCHER;
3691 IO::AIO::max_poll_time $TICK * 0.1; 3991 IO::AIO::max_poll_time $TICK * 0.1;
3692 $AIO_POLL_WATCHER = Event->io ( 3992 undef $AnyEvent::AIO::WATCHER;
3693 reentrant => 0,
3694 data => WF_AUTOCANCEL,
3695 fd => IO::AIO::poll_fileno,
3696 poll => 'r',
3697 prio => 0,
3698 cb => \&IO::AIO::poll_cb,
3699 );
3700} 3993}
3701 3994
3702my $_log_backtrace; 3995my $_log_backtrace;
3703 3996
3704sub _log_backtrace { 3997sub _log_backtrace {
… …
3707 $msg =~ s/\n//; 4000 $msg =~ s/\n//;
3708 4001
3709 # limit the # of concurrent backtraces 4002 # limit the # of concurrent backtraces
3710 if ($_log_backtrace < 2) { 4003 if ($_log_backtrace < 2) {
3711 ++$_log_backtrace; 4004 ++$_log_backtrace;
4005 my $perl_bt = Carp::longmess $msg;
3712 async { 4006 async {
3713 $Coro::current->{desc} = "abt $msg"; 4007 $Coro::current->{desc} = "abt $msg";
3714 4008
3715 my @bt = fork_call { 4009 my @bt = fork_call {
3716 @addr = map { sprintf "%x", $_ } @addr; 4010 @addr = map { sprintf "%x", $_ } @addr;
… …
3727 } 4021 }
3728 4022
3729 @funcs 4023 @funcs
3730 }; 4024 };
3731 4025
3732 LOG llevInfo, "[ABT] $msg\n"; 4026 LOG llevInfo, "[ABT] $perl_bt\n";
4027 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3733 LOG llevInfo, "[ABT] $_\n" for @bt; 4028 LOG llevInfo, "[ABT] $_\n" for @bt;
3734 --$_log_backtrace; 4029 --$_log_backtrace;
3735 }; 4030 };
3736 } else { 4031 } else {
3737 LOG llevInfo, "[ABT] $msg\n"; 4032 LOG llevInfo, "[ABT] $msg\n";
3738 LOG llevInfo, "[ABT] [suppressed]\n"; 4033 LOG llevInfo, "[ABT] [suppressed]\n";
3739 } 4034 }
3740} 4035}
3741 4036
3742# load additional modules 4037# load additional modules
3743use cf::pod; 4038require "cf/$_.pm" for @EXTRA_MODULES;
4039cf::_connect_to_perl_2;
3744 4040
3745END { cf::emergency_save } 4041END { cf::emergency_save }
3746 4042
37471 40431
3748 4044

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines