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.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.578 by root, Wed Jan 4 02:48:57 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
34 64
35# configure various modules to our taste 65# configure various modules to our taste
36# 66#
37$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40 75
41$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
42 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
63our $DATADIR = datadir; 99our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
67our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
73 120
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 123our $NEXT_TICK;
124our $USE_FSYNC = 1; # use fsync to write maps - default on
125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
128our $BDB_TRICKLE_WATCHER;
129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
133our %CFG;
134
135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
79our $NOW; 138our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off
81 139
82our $BDB_POLL_WATCHER; 140our (%PLAYER, %PLAYER_LOADING); # all users
83our $DB_ENV; 141our (%MAP, %MAP_LOADING ); # all maps
84
85our %CFG;
86
87our $UPTIME; $UPTIME ||= time;
88our $RUNTIME;
89
90our %PLAYER; # all users
91our %MAP; # all maps
92our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
93 143
94# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 146
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
100 159
101binmode STDOUT; 160binmode STDOUT;
102binmode STDERR; 161binmode STDERR;
103 162
104# read virtual server time, if available 163# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
109} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
110 171
111mkdir $_ 172mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 174
114our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
115 176
116sub cf::map::normalise; 177sub cf::map::normalise;
117 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
118############################################################################# 183#############################################################################
119 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
120=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
121 197
122=over 4 198=over 4
123 199
124=item $cf::UPTIME 200=item $cf::UPTIME
125 201
126The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
127 218
128=item $cf::RUNTIME 219=item $cf::RUNTIME
129 220
130The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
131every server tick. 222every server tick.
137Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
138directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
139unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
140database environment. 231database environment.
141 232
142=item $cf::NOW
143
144The time of the last (current) server tick.
145
146=item $cf::TICK
147
148The interval between server ticks, in seconds.
149
150=item $cf::LOADAVG 233=item $cf::LOADAVG
151 234
152The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
153(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
154objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
157 240
158The raw value load value from the last tick. 241The raw value load value from the last tick.
159 242
160=item %cf::CFG 243=item %cf::CFG
161 244
162Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 246from wherever your confdir points to.
164 247
165=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
166 249
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
271=item @cf::INVOKE_RESULTS
272
273This array contains the results of the last C<invoke ()> call. When
274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
275that call.
276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
171=back 283=back
172 284
173=cut 285=cut
174 286
175BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
176 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
177 my $msg = join "", @_; 294 my $msg = join "", @_;
178 295
179 $msg .= "\n" 296 $msg .= "\n"
180 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
181 298
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 300
184 utf8::encode $msg;
185 LOG llevError, $msg; 301 LOG llevWarn, $msg;
186 }; 302};
187} 303
304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
315 Coro::terminate
316};
188 317
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 328for my $pkg (qw(
200 cf::global cf::attachable 329 cf::global cf::attachable
201 cf::object cf::object::player 330 cf::object cf::object::player
202 cf::client cf::player 331 cf::client cf::player
203 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
204 cf::map cf::party cf::region 334 cf::party cf::region
205)) { 335)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 337}
209 338
210$Event::DIED = sub { 339$EV::DIED = sub {
211 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
212}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
213 347
214############################################################################# 348#############################################################################
215 349
216=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
217 351
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 373 $d
240 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
241} 375}
242 376
377=item $scalar = load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
243=item $ref = cf::from_json $json 391=item $ref = cf::decode_json $json
244 392
245Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
246 394
247=item $json = cf::to_json $ref 395=item $json = cf::encode_json $ref
248 396
249Converts a perl data structure into its JSON representation. 397Converts a perl data structure into its JSON representation.
250 398
251=cut 399=cut
252 400
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 402
255sub to_json ($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
257 467
258=item cf::lock_wait $string 468=item cf::lock_wait $string
259 469
260Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
261 471
262=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
263 473
264Wait until the given lock is available and then acquires it and returns 474Wait until the given lock is available and then acquires it and returns
265a Coro::guard object. If the guard object gets destroyed (goes out of scope, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
266for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
267returned. 477returned.
268 478
479Locks are *not* recursive, locking from the same coro twice results in a
480deadlocked coro.
481
269Lock names should begin with a unique identifier (for example, cf::map::find 482Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 483uses map_find and cf::map::load uses map_load).
271 484
272=item $locked = cf::lock_active $string 485=item $locked = cf::lock_active $string
273 486
274Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
275 488
276=cut 489=cut
277 490
278our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
279 492
280sub lock_wait($) { 493sub lock_wait($) {
281 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 495}
289 496
290sub lock_acquire($) { 497sub lock_acquire($) {
291 my ($key) = @_; 498 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 499}
303 500
304sub lock_active($) { 501sub lock_active($) {
305 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 503}
309 504
310sub freeze_mainloop { 505sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
312 507
313 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 509}
510
511=item cf::periodic $interval, $cb
512
513Like EV::periodic, but randomly selects a starting point so that the actions
514get spread over time.
515
516=cut
517
518sub periodic($$) {
519 my ($interval, $cb) = @_;
520
521 my $start = rand List::Util::min 180, $interval;
522
523 EV::periodic $start, $interval, 0, $cb
524}
525
526=item cf::get_slot $time[, $priority[, $name]]
527
528Allocate $time seconds of blocking CPU time at priority C<$priority>
529(default: 0): This call blocks and returns only when you have at least
530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
535
536The optional C<$name> can be used to identify the job to run. It might be
537used for statistical purposes and should identify the same time-class.
538
539Useful for short background jobs.
540
541=cut
542
543our @SLOT_QUEUE;
544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
546
547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
548$SLOT_QUEUE = Coro::async {
549 $Coro::current->desc ("timeslot manager");
550
551 my $signal = new Coro::Signal;
552 my $busy;
553
554 while () {
555 next_job:
556
557 my $avail = cf::till_tick;
558
559 for (0 .. $#SLOT_QUEUE) {
560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
562 my $job = splice @SLOT_QUEUE, $_, 1, ();
563 $job->[2]->send;
564 Coro::cede;
565 goto next_job;
566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568 }
569 }
570
571 if (@SLOT_QUEUE) {
572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
573 $WAIT_FOR_TICK->wait;
574 } else {
575 $busy = 0;
576 Coro::schedule;
577 }
315 }; 578 }
316 $TICK_WATCHER->stop; 579};
317 $guard 580
581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
584 my ($time, $pri, $name) = @_;
585
586 $time = clamp $time, 0.01, $TICK * .6;
587
588 my $sig = new Coro::Signal;
589
590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
592 $SLOT_QUEUE->ready;
593 $sig->wait;
318} 594}
319 595
320=item cf::async { BLOCK } 596=item cf::async { BLOCK }
321 597
322Currently the same as Coro::async_pool, meaning you cannot use 598Currently the same as Coro::async_pool, meaning you cannot use
327 603
328BEGIN { *async = \&Coro::async_pool } 604BEGIN { *async = \&Coro::async_pool }
329 605
330=item cf::sync_job { BLOCK } 606=item cf::sync_job { BLOCK }
331 607
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 608The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 609is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 611acceptable.
336 612
337If it must be done, put the blocking parts into C<sync_job>. This will run 613If it must be done, put the blocking parts into C<sync_job>. This will run
338the given BLOCK in another coroutine while waiting for the result. The 614the given BLOCK in another coroutine while waiting for the result. The
342=cut 618=cut
343 619
344sub sync_job(&) { 620sub sync_job(&) {
345 my ($job) = @_; 621 my ($job) = @_;
346 622
347 if ($Coro::current == $Coro::main) { 623 if (in_main) {
348 my $time = Event::time; 624 my $time = AE::time;
349 625
350 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
352 628
353 # TODO: use suspend/resume instead 629 #LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 630
355 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
356 632
357 my $busy = 1; 633 my $busy = 1;
358 my @res; 634 my @res;
359 635
360 (async { 636 (async {
637 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 638 @res = eval { $job->() };
362 warn $@ if $@; 639 error $@ if $@;
363 undef $busy; 640 undef $busy;
364 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
365 642
366 while ($busy) { 643 while ($busy) {
367 Coro::cede or Event::one_event; 644 if (Coro::nready) {
645 Coro::cede_notself;
646 } else {
647 EV::loop EV::LOOP_ONESHOT;
368 } 648 }
649 }
369 650
370 $time = Event::time - $time; 651 my $time = AE::time - $time;
371 652
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
376 654
377 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
378 } else { 656 } else {
379 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
380 658
400 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
401 679
402 $coro 680 $coro
403} 681}
404 682
405=item fork_call { }, $args 683=item fork_call { }, @args
406 684
407Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
411 689
412=cut 690=cut
413 691
414sub _store_scalar { 692sub post_fork {
415 open my $fh, ">", \my $buf 693 reset_signals;
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421} 694}
422 695
423sub fork_call(&@) { 696sub fork_call(&@) {
424 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
425 698
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 699 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 700 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 701 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 702
431 if (my $pid = fork) { 703 my @res = Coro::Util::fork_eval {
432 close $fh2; 704 cf::post_fork;
705 &$cb
706 } @args;
433 707
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 708 wantarray ? @res : $res[-1]
435 warn "pst<$res>" unless $res =~ /^pst/; 709}
436 $res = Coro::Storable::thaw $res;
437 710
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 711sub objinfo {
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals;
445 local $SIG{__WARN__};
446 local $SIG{__DIE__};
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452
453 eval {
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 } 712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
465} 747}
466 748
467=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
468 750
469Returns a single value from the environment database. 751Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 753=item cf::db_put $family => $key => $value
472 754
473Stores the given C<$value> in the family. It can currently store binary 755Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 756data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 757
758=item $db = cf::db_table "name"
759
760Create and/or open a new database table. The string must not be "db" and must be unique
761within each server.
762
476=cut 763=cut
764
765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
769 my ($name) = @_;
770 my $db = BDB::db_create $DB_ENV;
771
772 eval {
773 $db->set_flags (BDB::CHKSUM);
774
775 utf8::encode $name;
776 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
777 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
778 cf::cleanup "db_open(db): $!" if $!;
779 };
780 cf::cleanup "db_open(db): $@" if $@;
781
782 $db
783}
477 784
478our $DB; 785our $DB;
479 786
480sub db_init { 787sub db_init {
481 unless ($DB) { 788 $DB ||= db_table "db";
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job {
485 eval {
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 }
495} 789}
496 790
497sub db_get($$) { 791sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
499 793
500 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
501 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
502 798
503 $! ? () 799 $! ? ()
504 : $data 800 : $data
505 }
506} 801}
507 802
508sub db_put($$$) { 803sub db_put($$$) {
509 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
510 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
538 833
539 my @data; 834 my @data;
540 my $md5; 835 my $md5;
541 836
542 for (0 .. $#$src) { 837 for (0 .. $#$src) {
543 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
544 or Carp::croak "$src->[$_]: $!";
545 } 839 }
546 840
547 # if processing is expensive, check 841 # if processing is expensive, check
548 # checksum first 842 # checksum first
549 if (1) { 843 if (1) {
550 $md5 = 844 $md5 =
551 join "\x00", 845 join "\x00",
552 $processversion, 846 $processversion,
553 map { 847 map {
554 Coro::cede; 848 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 849 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 850 } 0.. $#$src;
557 851
558 852
559 my $dbmd5 = db_get cache => "$id/md5"; 853 my $dbmd5 = db_get cache => "$id/md5";
566 860
567 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
568 my $data = $process->(\@data); 862 my $data = $process->(\@data);
569 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
570 864
571 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
572 866
573 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
574 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
575 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
576 870
586 880
587=cut 881=cut
588 882
589sub datalog($@) { 883sub datalog($@) {
590 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
591 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
592} 886}
593 887
594=back 888=back
595 889
596=cut 890=cut
597 891
598############################################################################# 892#############################################################################
599 893
600=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
601 895
602Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
603attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
605 899
606In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
607C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
608Crossfire TRT). 902Deliantra).
609 903
610=over 4 904=over 4
611 905
612=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
613 907
657=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
658 952
659Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
660given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
661 955
662Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
663that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
664 958
665These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
666 960
667=over 4 961=over 4
791 1085
792 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
793 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
794 1088
795 } elsif (ref $type) { 1089 } elsif (ref $type) {
796 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
797 1091
798 } else { 1092 } else {
799 shift @arg; 1093 shift @arg;
800 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
801 } 1095 }
802 } 1096 }
803} 1097}
804 1098
805sub _object_attach { 1099sub _object_attach {
815 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
816 } 1110 }
817 1111
818 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
819 } else { 1113 } else {
820 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
821 } 1115 }
822 1116
823 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
824} 1118}
825 1119
865 "; 1159 ";
866 die if $@; 1160 die if $@;
867} 1161}
868 1162
869our $override; 1163our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1164our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 1165
872sub override { 1166sub override {
873 $override = 1; 1167 $override = 1;
874 @invoke_results = (); 1168 @INVOKE_RESULTS = (@_);
875} 1169}
876 1170
877sub do_invoke { 1171sub do_invoke {
878 my $event = shift; 1172 my $event = shift;
879 my $callbacks = shift; 1173 my $callbacks = shift;
880 1174
881 @invoke_results = (); 1175 @INVOKE_RESULTS = ();
882 1176
883 local $override; 1177 local $override;
884 1178
885 for (@$callbacks) { 1179 for (@$callbacks) {
886 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
887 1181
888 if ($@) { 1182 if ($@) {
889 warn "$@";
890 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
891 override; 1184 override;
892 } 1185 }
893 1186
894 return 1 if $override; 1187 return 1 if $override;
895 } 1188 }
896 1189
897 0 1190 0
898} 1191}
899 1192
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 1194
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1196
904Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
905 1198
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1199This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 1200removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 1201results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1202
910=back 1203=back
911 1204
912=cut 1205=cut
913 1206
914############################################################################# 1207#############################################################################
915# object support 1208# object support
1209
1210sub _object_equal($$);
1211sub _object_equal($$) {
1212 my ($a, $b) = @_;
1213
1214 return 0 unless (ref $a) eq (ref $b);
1215
1216 if ("HASH" eq ref $a) {
1217 my @ka = keys %$a;
1218 my @kb = keys %$b;
1219
1220 return 0 if @ka != @kb;
1221
1222 for (0 .. $#ka) {
1223 return 0 unless $ka[$_] eq $kb[$_];
1224 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1225 }
1226
1227 } elsif ("ARRAY" eq ref $a) {
1228
1229 return 0 if @$a != @$b;
1230
1231 for (0 .. $#$a) {
1232 return 0 unless _object_equal $a->[$_], $b->[$_];
1233 }
1234
1235 } elsif ($a ne $b) {
1236 return 0;
1237 }
1238
1239 1
1240}
1241
1242our $SLOW_MERGES;#d#
1243sub _can_merge {
1244 my ($ob1, $ob2) = @_;
1245
1246 ++$SLOW_MERGES;#d#
1247
1248 # we do the slow way here
1249 return _object_equal $ob1, $ob2
1250}
916 1251
917sub reattach { 1252sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1254 my ($obj) = @_;
920 1255
1256 # no longer needed after getting rid of delete_package?
921 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
922 1258
923 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
924 1260
925 @$registry = (); 1261 @$registry = ();
926 1262
931 for (@$attach) { 1267 for (@$attach) {
932 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
933 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
934 } 1270 }
935 } else { 1271 } else {
936 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
937 } 1273 }
938 } 1274 }
939} 1275}
940 1276
941cf::attachable->attach ( 1277cf::attachable->attach (
942 prio => -1000000, 1278 prio => -1000000,
943 on_instantiate => sub { 1279 on_instantiate => sub {
944 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
945 1281
946 $data = from_json $data; 1282 $data = decode_json $data;
947 1283
948 for (@$data) { 1284 for (@$data) {
949 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
950 1286
951 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1303sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
969 1305
970 sync_job { 1306 sync_job {
971 if (length $$rdata) { 1307 if (length $$rdata) {
1308 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
974 1312
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
979 close $fh; 1320 aio_close $fh;
980 1321
981 if (@$objs) { 1322 if (@$objs) {
982 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
983 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
986 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
987 close $fh; 1331 aio_close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
989 } 1333 }
990 } else { 1334 } else {
991 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
992 } 1336 }
993 1337
994 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
995 } else { 1342 } else {
996 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
997 } 1344 }
998 } else { 1345 } else {
999 aio_unlink $filename; 1346 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1001 } 1348 }
1002 } 1349 };
1003} 1350}
1004 1351
1005sub object_freezer_as_string { 1352sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1353 my ($rdata, $objs) = @_;
1007 1354
1019 or return; 1366 or return;
1020 1367
1021 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1370 or return;
1371
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1372 my $st = eval { Coro::Storable::thaw $av };
1373 $av = $st->{objs};
1025 } 1374 }
1026 1375
1376 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1380
1029 return ($data, $av); 1381 ($data, $av)
1030} 1382}
1031 1383
1032=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1033 1385
1034=over 4 1386=over 4
1088 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1089 1441
1090 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1091} 1443}
1092 1444
1445use File::Glob ();
1446
1093cf::player->attach ( 1447cf::player->attach (
1094 on_command => sub { 1448 on_unknown_command => sub {
1095 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1096 1450
1097 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1098 or return; 1452 or return;
1099 1453
1107 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1108 1462
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1464
1111 if (ref $msg) { 1465 if (ref $msg) {
1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467
1468 my @reply;
1469
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1470 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1471 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1472 }
1473
1474 $pl->ext_reply ($reply, @reply)
1475 if $reply;
1476
1117 } else { 1477 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1479 }
1120 1480
1121 cf::override; 1481 cf::override;
1122 }, 1482 },
1123); 1483);
1124 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1125sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1126 cf::sync_job { 1501 cf::sync_job {
1127 my %todo; 1502 my %todo;
1128 1503
1129 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1130 next unless -r $path; 1505 next unless -r $path;
1148 1523
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151 1526
1152 $ext{source} = 1527 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1154 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1155 . $source 1530 . $source
1156 . "\n};\n1"; 1531 . "\n};\n1";
1157 1532
1158 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1159 } 1534 }
1160 1535
1536 my $pass = 0;
1161 my %done; 1537 my %done;
1162 while (%todo) { 1538 while (%todo) {
1163 my $progress; 1539 my $progress;
1164 1540
1541 ++$pass;
1542
1543 ext:
1165 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1166 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1167 goto skip 1546 next ext
1168 unless exists $done{$_}; 1547 unless exists $done{$_};
1169 } 1548 }
1170 1549
1171 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1172 1551
1173 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1174 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1175 : "$v->{base}: extension inactive.\n";
1176 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1177 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1178 warn $msg; 1559
1179 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1180 exit 1; 1561 delete $todo{$k};
1181 } 1562 } else {
1182 1563 $done{$k} = delete $todo{$k};
1183 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1184 } 1569 }
1185
1186 $done{$k} = delete $todo{$k};
1187 push @EXTS, $v->{pkg};
1188 $progress = 1;
1189 } 1570 }
1190 1571
1191 skip: 1572 unless ($progress) {
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1193 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1194 } 1582 }
1195 }; 1583 };
1196} 1584}
1197 1585
1198############################################################################# 1586#############################################################################
1199 1587
1200=back 1588=back
1201 1589
1202=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1203 1591
1204Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1205 1593
1206=cut 1594=cut
1207 1595
1208package cf::player; 1596package cf::player;
1209 1597
1210use Coro::AIO; 1598use Coro::AIO;
1211 1599
1212=head3 cf::player 1600=head3 cf::player
1213 1601
1214=over 4 1602=over 4
1603
1604=item cf::player::num_playing
1605
1606Returns the official number of playing players, as per the Crossfire metaserver rules.
1607
1608=cut
1609
1610sub num_playing {
1611 scalar grep
1612 $_->ob->map
1613 && !$_->hidden
1614 && !$_->ob->flag (cf::FLAG_WIZ),
1615 cf::player::list
1616}
1215 1617
1216=item cf::player::find $login 1618=item cf::player::find $login
1217 1619
1218Returns the given player object, loading it if necessary (might block). 1620Returns the given player object, loading it if necessary (might block).
1219 1621
1238 1640
1239sub exists($) { 1641sub exists($) {
1240 my ($login) = @_; 1642 my ($login) = @_;
1241 1643
1242 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1243 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1244} 1646}
1245 1647
1246sub find($) { 1648sub find($) {
1247 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1248 my $login = $_[0]; 1650 my $login = $_[0];
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1657 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1658 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1659 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1660 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1661
1260 my $pl = load_pl path $login 1662 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1663 or return;
1664
1665 my $pl = cf::player::load_pl $f
1666 or return;
1667
1668 local $cf::PLAYER_LOADING{$login} = $pl;
1669 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1263 } 1671 }
1264 } 1672 }
1265} 1673}
1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1266 1687
1267sub save($) { 1688sub save($) {
1268 my ($pl) = @_; 1689 my ($pl) = @_;
1269 1690
1270 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1275 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1276 1697
1277 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1279 1700
1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1705
1280 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1281 Coro::cede; 1707 cf::cede_to_tick;
1282} 1708}
1283 1709
1284sub new($) { 1710sub new($) {
1285 my ($login) = @_; 1711 my ($login) = @_;
1286 1712
1292 $cf::PLAYER{$login} = $self; 1718 $cf::PLAYER{$login} = $self;
1293 1719
1294 $self 1720 $self
1295} 1721}
1296 1722
1723=item $player->send_msg ($channel, $msg, $color, [extra...])
1724
1725=cut
1726
1727sub send_msg {
1728 my $ns = shift->ns
1729 or return;
1730 $ns->send_msg (@_);
1731}
1732
1297=item $pl->quit_character 1733=item $pl->quit_character
1298 1734
1299Nukes the player without looking back. If logged in, the connection will 1735Nukes the player without looking back. If logged in, the connection will
1300be destroyed. May block for a long time. 1736be destroyed. May block for a long time.
1301 1737
1305 my ($pl) = @_; 1741 my ($pl) = @_;
1306 1742
1307 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1308 1744
1309 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1310 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1311 1747
1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1313 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1314 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1315 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1316 1756
1317 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1318 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1319 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1354 or return []; 1794 or return [];
1355 1795
1356 my @logins; 1796 my @logins;
1357 1797
1358 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1799 my $path = path $login;
1800
1801 # a .pst is a dead give-away for a valid player
1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1807 }
1362 1808
1363 utf8::decode $login; 1809 utf8::decode $login;
1364 push @logins, $login; 1810 push @logins, $login;
1365 } 1811 }
1366 1812
1367 \@logins 1813 \@logins
1368} 1814}
1369 1815
1370=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1371 1819
1372Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1373player. May block. 1821player. May block.
1374 1822
1375=cut 1823=cut
1393 } 1841 }
1394 1842
1395 \@paths 1843 \@paths
1396} 1844}
1397 1845
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1399 1847
1400Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1401 1849
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1446}
1447
1448=item $player->ext_reply ($msgid, %msg) 1850=item $player->ext_reply ($msgid, @msg)
1449 1851
1450Sends an ext reply to the player. 1852Sends an ext reply to the player.
1451 1853
1452=cut 1854=cut
1453 1855
1454sub ext_reply($$%) { 1856sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1857 my ($self, $id, @msg) = @_;
1456 1858
1457 $msg{msgid} = $id; 1859 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1860}
1460 1861
1461=item $player->ext_event ($type, %msg) 1862=item $player->ext_msg ($type, @msg)
1462 1863
1463Sends an ext event to the client. 1864Sends an ext event to the client.
1464 1865
1465=cut 1866=cut
1466 1867
1467sub ext_event($$%) { 1868sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1869 my ($self, $type, @msg) = @_;
1469 1870
1470 $self->ns->ext_event ($type, %msg); 1871 $self->ns->ext_msg ($type, @msg);
1471} 1872}
1472 1873
1473=head3 cf::region 1874=head3 cf::region
1474 1875
1475=over 4 1876=over 4
1485=cut 1886=cut
1486 1887
1487sub find_by_path($) { 1888sub find_by_path($) {
1488 my ($path) = @_; 1889 my ($path) = @_;
1489 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1490 my ($match, $specificity); 1893 my ($match, $specificity);
1491 1894
1492 for my $region (list) { 1895 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1898 if $region->specificity > $specificity;
1496 } 1899 }
1497 } 1900 }
1498 1901
1519our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1520our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1521 1924
1522sub generate_random_map { 1925sub generate_random_map {
1523 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1524 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1525 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1526 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1527 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1528 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1529 $rmp->{exit_on_final_map},
1530 $rmp->{xsize}, $rmp->{ysize},
1531 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1532 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1533 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1534 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1535 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1536 (cf::region::find $rmp->{region}), $rmp->{custom}
1537 )
1538} 1931}
1539 1932
1540=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1541 1934
1542Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1547 1940
1548sub register { 1941sub register {
1549 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1550 my $pkg = caller; 1943 my $pkg = caller;
1551 1944
1552 no strict;
1553 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1554 1946
1555 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1556} 1948}
1557 1949
1558# also paths starting with '/' 1950# also paths starting with '/'
1559$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1560 1952
1561sub thawer_merge { 1953sub thawer_merge {
1562 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1563 1955
1564 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1569} 1961}
1570 1962
1571sub normalise { 1963sub normalise {
1572 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1573 1965
1574 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1575 1967
1576 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1577 1969
1578 # map plan: 1970 # map plan:
1579 # 1971 #
1594 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1595 $path = "$base/$path"; 1987 $path = "$base/$path";
1596 } 1988 }
1597 1989
1598 for ($path) { 1990 for ($path) {
1599 redo if s{//}{/};
1600 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1601 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1602 } 1993 }
1603 1994
1604 $path 1995 $path
1618 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1619 return $self; 2010 return $self;
1620 } 2011 }
1621 } 2012 }
1622 2013
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1624 () 2015 ()
1625} 2016}
1626 2017
2018# may re-bless or do other evil things
1627sub init { 2019sub init {
1628 my ($self) = @_; 2020 my ($self) = @_;
1629 2021
1630 $self 2022 $self
1631} 2023}
1650 2042
1651# the temporary/swap location 2043# the temporary/swap location
1652sub save_path { 2044sub save_path {
1653 my ($self) = @_; 2045 my ($self) = @_;
1654 2046
1655 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1656 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1657} 2049}
1658 2050
1659# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1660sub uniq_path { 2052sub uniq_path {
1661 my ($self) = @_; 2053 my ($self) = @_;
1662 2054
1663 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1664 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1665}
1666
1667# and all this just because we cannot iterate over
1668# all maps in C++...
1669sub change_all_map_light {
1670 my ($change) = @_;
1671
1672 $_->change_map_light ($change)
1673 for grep $_->outdoor, values %cf::MAP;
1674} 2057}
1675 2058
1676sub decay_objects { 2059sub decay_objects {
1677 my ($self) = @_; 2060 my ($self) = @_;
1678 2061
1691 2074
1692sub load_header_from($) { 2075sub load_header_from($) {
1693 my ($self, $path) = @_; 2076 my ($self, $path) = @_;
1694 2077
1695 utf8::encode $path; 2078 utf8::encode $path;
1696 #aio_open $path, O_RDONLY, 0 2079 my $f = new_from_file cf::object::thawer $path
1697 # or return;
1698
1699 $self->_load_header ($path)
1700 or return; 2080 or return;
1701 2081
2082 $self->_load_header ($f)
2083 or return;
2084
2085 local $MAP_LOADING{$self->{path}} = $self;
2086 $f->resolve_delayed_derefs;
2087
1702 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1703 2089
1704 1 2090 1
1705} 2091}
1706 2092
2093# used to laod the header of an original map
1707sub load_header_orig { 2094sub load_header_orig {
1708 my ($self) = @_; 2095 my ($self) = @_;
1709 2096
1710 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1711} 2098}
1712 2099
2100# used to laod the header of an instantiated map
1713sub load_header_temp { 2101sub load_header_temp {
1714 my ($self) = @_; 2102 my ($self) = @_;
1715 2103
1716 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1717} 2105}
1718 2106
2107# called after loading the header from an instantiated map
1719sub prepare_temp { 2108sub prepare_temp {
1720 my ($self) = @_; 2109 my ($self) = @_;
1721 2110
1722 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1723 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1724 # safety 2113 # safety
1725 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1726 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1727} 2116}
1728 2117
2118# called after loading the header from an original map
1729sub prepare_orig { 2119sub prepare_orig {
1730 my ($self) = @_; 2120 my ($self) = @_;
1731 2121
1732 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1733 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1757 2147
1758sub find; 2148sub find;
1759sub find { 2149sub find {
1760 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1761 2151
2152 cf::cede_to_tick;
2153
1762 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1763 2155
2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1764 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1765 2158
1766 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1767 my $guard = cf::lock_acquire "map_find:$path";
1768 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1769 or return; 2161 or return;
1770 2162
1771 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1772 2164
1774 or return; 2166 or return;
1775 2167
1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1777 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1778 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
2172 undef $guard1;
1779 $map->reset; 2173 $map->reset;
1780 undef $guard;
1781 return find $path; 2174 return find $path;
1782 } 2175 }
1783 2176
1784 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1785 } 2178 }
1786} 2179}
1787 2180
1788sub pre_load { } 2181sub pre_load { }
1789sub post_load { } 2182#sub post_load { } # XS
1790 2183
1791sub load { 2184sub load {
1792 my ($self) = @_; 2185 my ($self) = @_;
1793 2186
1794 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1795 2188
1796 my $path = $self->{path}; 2189 my $path = $self->{path};
1797 2190
1798 { 2191 {
1799 my $guard = cf::lock_acquire "map_load:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1800 2193
2194 return unless $self->valid;
1801 return if $self->in_memory != cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1802
1803 $self->in_memory (cf::MAP_LOADING);
1804 2196
1805 $self->alloc; 2197 $self->alloc;
1806 2198
1807 $self->pre_load; 2199 $self->pre_load;
1808 Coro::cede; 2200 cf::cede_to_tick;
1809 2201
1810 $self->_load_objects ($self->{load_path}, 1) 2202 if (exists $self->{load_path}) {
2203 my $f = new_from_file cf::object::thawer $self->{load_path};
2204 $f->skip_block;
2205 $self->_load_objects ($f)
1811 or return; 2206 or return;
1812 2207
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1814 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1815 2210
1816 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq; 2212 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) { 2213 unless (aio_stat $uniq) {
2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1819 $self->clear_unique_items; 2215 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0); 2216 $self->_load_objects ($f);
2217 $f->resolve_delayed_derefs;
2218 }
2219 }
1821 } 2220 }
1822 }
1823 2221
1824 Coro::cede; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
2229
2230 cf::cede_to_tick;
1825 # now do the right thing for maps 2231 # now do the right thing for maps
1826 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1827 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1828 unless $self->difficulty; 2234 unless $self->difficulty;
1829 Coro::cede; 2235 cf::cede_to_tick;
1830 2236
1831 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1832 $self->decay_objects; 2238 $self->decay_objects;
1833 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1834 $self->update_buttons; 2240 $self->update_buttons;
1835 Coro::cede; 2241 cf::cede_to_tick;
1836 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1837 Coro::cede;
1838 $self->activate;
1839 } 2243 }
1840 2244
1841 $self->in_memory (cf::MAP_IN_MEMORY); 2245 $self->{last_save} = $cf::RUNTIME;
2246 $self->last_access ($cf::RUNTIME);
1842 } 2247 }
1843 2248
1844 $self->post_load; 2249 $self->post_load;
1845}
1846 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
1847sub customise_for { 2257sub customise_for {
1848 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
1849 2259
1850 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
1851 if $self->per_player; 2261 if $self->per_player;
1854# if $self->per_party; 2264# if $self->per_party;
1855 2265
1856 $self 2266 $self
1857} 2267}
1858 2268
1859# find and load all maps in the 3x3 area around a map
1860sub load_diag {
1861 my ($map) = @_;
1862
1863 my @diag; # diagonal neighbours
1864
1865 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_)
1867 or next;
1868 $neigh = find $neigh, $map
1869 or next;
1870 $neigh->load;
1871
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 }
1875
1876 for (@diag) {
1877 my $neigh = find @$_
1878 or next;
1879 $neigh->load;
1880 }
1881}
1882
1883sub find_sync { 2269sub find_sync {
1884 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
1885 2271
1886 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
1887} 2277}
1888 2278
1889sub do_load_sync { 2279sub do_load_sync {
1890 my ($map) = @_; 2280 my ($map) = @_;
1891 2281
1892 cf::sync_job { $map->load }; 2282 # it's a bug to call this from the main context
2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2284 if $Coro::current == $Coro::main;
2285
2286 $map->load;
1893} 2287}
1894 2288
1895our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
1896our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
1897 2291
1898sub find_async { 2292sub find_async {
1899 my ($path, $origin) = @_; 2293 my ($path, $origin, $load) = @_;
1900 2294
1901 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
1902 2296
1903 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
1904 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
1905 } 2299 }
1906 2300
1907 undef $MAP_PREFETCH{$path}; 2301 $MAP_PREFETCH{$path} |= $load;
2302
1908 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher";
2305
1909 while (%MAP_PREFETCH) { 2306 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 2307 while (my ($k, $v) = each %MAP_PREFETCH) {
1911 my $map = find $path 2308 if (my $map = find $k) {
1912 or next;
1913 $map->load; 2309 $map->load if $v;
2310 }
1914 2311
1915 delete $MAP_PREFETCH{$path}; 2312 delete $MAP_PREFETCH{$k};
1916 } 2313 }
1917 } 2314 }
1918 undef $MAP_PREFETCHER; 2315 undef $MAP_PREFETCHER;
1919 }; 2316 };
1920 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
1921 2318
1922 () 2319 ()
1923} 2320}
1924 2321
2322# common code, used by both ->save and ->swapout
1925sub save { 2323sub _save {
1926 my ($self) = @_; 2324 my ($self) = @_;
1927
1928 my $lock = cf::lock_acquire "map_data:" . $self->path;
1929 2325
1930 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
1931 2327
1932 return unless $self->dirty; 2328 return unless $self->dirty;
1933 2329
1939 return if $self->{deny_save}; 2335 return if $self->{deny_save};
1940 2336
1941 local $self->{last_access} = $self->last_access;#d# 2337 local $self->{last_access} = $self->last_access;#d#
1942 2338
1943 cf::async { 2339 cf::async {
2340 $Coro::current->{desc} = "map player save";
1944 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
1945 }; 2342 };
2343
2344 cf::get_slot 0.02;
1946 2345
1947 if ($uniq) { 2346 if ($uniq) {
1948 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1949 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1950 } else { 2349 } else {
1951 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1952 } 2351 }
1953} 2352}
1954 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
1955sub swap_out { 2362sub swap_out {
1956 my ($self) = @_; 2363 my ($self) = @_;
1957 2364
1958 # save first because save cedes
1959 $self->save;
1960
1961 my $lock = cf::lock_acquire "map_data:" . $self->path; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
1962 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
1963 return if $self->players; 2369 return if $self->players;
1964 return if $self->in_memory != cf::MAP_IN_MEMORY;
1965 return if $self->{deny_save};
1966 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
1967 $self->clear; 2380 $self->clear;
1968 $self->in_memory (cf::MAP_SWAPPED);
1969} 2381}
1970 2382
1971sub reset_at { 2383sub reset_at {
1972 my ($self) = @_; 2384 my ($self) = @_;
1973 2385
1991 2403
1992 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2405
1994 return if $self->players; 2406 return if $self->players;
1995 2407
1996 warn "resetting map ", $self->path; 2408 cf::trace "resetting map ", $self->path, "\n";
1997 2409
1998 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
1999 2411
2000 # need to save uniques path 2412 # need to save uniques path
2001 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2002 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2003 2415
2005 if $uniq; 2417 if $uniq;
2006 } 2418 }
2007 2419
2008 delete $cf::MAP{$self->path}; 2420 delete $cf::MAP{$self->path};
2009 2421
2422 $self->deactivate;
2423 $_->clear_links_to ($self) for values %cf::MAP;
2010 $self->clear; 2424 $self->clear;
2011
2012 $_->clear_links_to ($self) for values %cf::MAP;
2013 2425
2014 $self->unlink_save; 2426 $self->unlink_save;
2015 $self->destroy; 2427 $self->destroy;
2016} 2428}
2017 2429
2018my $nuke_counter = "aaaa"; 2430my $nuke_counter = "aaaa";
2019 2431
2020sub nuke { 2432sub nuke {
2021 my ($self) = @_; 2433 my ($self) = @_;
2022 2434
2435 {
2436 my $lock = cf::lock_acquire "map_data:$self->{path}";
2437
2023 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2024 2439
2025 $self->unlink_save; 2440 $self->unlink_save;
2026 2441
2027 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2028 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2029 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2030 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2031 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2032 2447
2033 $cf::MAP{$self->path} = $self; 2448 $cf::MAP{$self->path} = $self;
2449 }
2034 2450
2035 $self->reset; # polite request, might not happen 2451 $self->reset; # polite request, might not happen
2036} 2452}
2037 2453
2038=item $maps = cf::map::tmp_maps 2454=item $maps = cf::map::tmp_maps
2080 2496
2081sub unique_maps() { 2497sub unique_maps() {
2082 [ 2498 [
2083 map { 2499 map {
2084 utf8::decode $_; 2500 utf8::decode $_;
2085 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2086 ? normalise $_ 2504 : normalise $_
2087 : ()
2088 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2089 ] 2506 ]
2090} 2507}
2091 2508
2092package cf; 2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2093 2540
2094=back 2541=back
2095 2542
2096=head3 cf::object 2543=head3 cf::object
2097 2544
2101 2548
2102=over 4 2549=over 4
2103 2550
2104=item $ob->inv_recursive 2551=item $ob->inv_recursive
2105 2552
2106Returns the inventory of the object _and_ their inventories, recursively. 2553Returns the inventory of the object I<and> their inventories, recursively,
2554but I<not> the object itself.
2107 2555
2108=cut 2556=cut
2109 2557
2110sub inv_recursive_; 2558sub inv_recursive_;
2111sub inv_recursive_ { 2559sub inv_recursive_ {
2114 2562
2115sub inv_recursive { 2563sub inv_recursive {
2116 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2117} 2565}
2118 2566
2567=item $ref = $ob->ref
2568
2569Creates and returns a persistent reference to an object that can be stored as a string.
2570
2571=item $ob = cf::object::deref ($refstring)
2572
2573returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2574even if the object actually exists. May block.
2575
2576=cut
2577
2578sub deref {
2579 my ($ref) = @_;
2580
2581 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2582 my ($uuid, $name) = ($1, $2);
2583 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2584 or return;
2585 $pl->ob->uuid eq $uuid
2586 or return;
2587
2588 $pl->ob
2589 } else {
2590 warn "$ref: cannot resolve object reference\n";
2591 undef
2592 }
2593}
2594
2119package cf; 2595package cf;
2120 2596
2121=back 2597=back
2122 2598
2123=head3 cf::object::player 2599=head3 cf::object::player
2129Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2605Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2130can be C<undef>. Does the right thing when the player is currently in a 2606can be C<undef>. Does the right thing when the player is currently in a
2131dialogue with the given NPC character. 2607dialogue with the given NPC character.
2132 2608
2133=cut 2609=cut
2610
2611our $SAY_CHANNEL = {
2612 id => "say",
2613 title => "Map",
2614 reply => "say ",
2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2616};
2617
2618our $CHAT_CHANNEL = {
2619 id => "chat",
2620 title => "Chat",
2621 reply => "chat ",
2622 tooltip => "Player chat and shouts, global to the server.",
2623};
2134 2624
2135# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2136# with dialog boxes. 2626# with dialog boxes.
2137#TODO: the first argument must go, split into a $npc->reply_to ( method 2627#TODO: the first argument must go, split into a $npc->reply_to ( method
2138sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2145 2635
2146 } else { 2636 } else {
2147 my $pl = $self->contr; 2637 my $pl = $self->contr;
2148 2638
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2639 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2642
2158 } else { 2643 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2161 } 2646 }
2162 } 2647 }
2648}
2649
2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2651
2652=cut
2653
2654sub cf::object::send_msg {
2655 my $pl = shift->contr
2656 or return;
2657 $pl->send_msg (@_);
2163} 2658}
2164 2659
2165=item $player_object->may ("access") 2660=item $player_object->may ("access")
2166 2661
2167Returns wether the given player is authorized to access resource "access" 2662Returns wether the given player is authorized to access resource "access"
2180 2675
2181=item $player_object->enter_link 2676=item $player_object->enter_link
2182 2677
2183Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2184 2679
2185The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2186I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2187 2684
2188Will never block. 2685Will never block.
2189 2686
2190=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2191 2688
2211sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2212 my ($self) = @_; 2709 my ($self) = @_;
2213 2710
2214 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2215 2712
2713 ++$self->{_link_recursion};
2714
2216 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2217 2716
2218 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2219 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2220 2719
2221 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2222} 2721}
2223 2722
2224sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2225 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2226 2725
2243 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2244 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2245 2744
2246 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2249 2748
2250 $map->load; 2749 $map->load;
2251 $map->load_diag;
2252 2750
2253 return unless $self->contr->active; 2751 return unless $self->contr->active;
2254 $self->activate_recursive;
2255 2752
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2258} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2259 2760
2761}
2762
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2261 2764
2262Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position. 2768the new (success) or old (failed) map position. In either case, $done will
2769be called at the end of this process.
2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2266 2773
2267=cut 2774=cut
2268 2775
2269our $GOTOGEN; 2776our $GOTOGEN;
2270 2777
2271sub cf::object::player::goto { 2778sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2273 2786
2274 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2789
2277 $self->enter_link; 2790 $self->enter_link;
2278 2791
2279 (async { 2792 (async {
2793 $Coro::current->{desc} = "player::goto $path $x $y";
2794
2795 # *tag paths override both path and x|y
2796 if ($path =~ /^\*(.*)$/) {
2797 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2798 my $ob = $obs[rand @obs];
2799
2800 # see if we actually can go there
2801 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2802 $ob = $obs[rand @obs];
2803 } else {
2804 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2805 }
2806 # else put us there anyways for now #d#
2807
2808 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2809 } else {
2810 ($path, $x, $y) = (undef, undef, undef);
2811 }
2812 }
2813
2280 my $map = eval { 2814 my $map = eval {
2281 my $map = cf::map::find $path; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2282 2816
2283 if ($map) { 2817 if ($map) {
2284 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2286 } else { 2820 } else {
2287 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2288 } 2822 }
2289 2823
2290 $map 2824 $map
2291 }; 2825 };
2292 2826
2297 2831
2298 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2301 } 2835 }
2836
2837 $done->($self) if $done;
2302 })->prio (1); 2838 })->prio (1);
2303} 2839}
2304 2840
2305=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2306 2842
2326} 2862}
2327 2863
2328sub prepare_random_map { 2864sub prepare_random_map {
2329 my ($exit) = @_; 2865 my ($exit) = @_;
2330 2866
2331 my $guard = cf::lock_acquire "exit_prepare:$exit";
2332
2333 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2334 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2335 # that depends on the exit object 2869 # that depends on the exit object
2336 2870
2337 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2339 if ($exit->map) { 2873 if ($exit->map) {
2340 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2341 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2342 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2343 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2344 } 2880 }
2345 2881
2346 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2347 2883
2348 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2349 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2350 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2351 2887
2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2353 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2354 undef $fh; 2890 undef $fh;
2355 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2356 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2357 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2358 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2359 } 2899 }
2360} 2900}
2361 2901
2362sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2363 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2364 2904
2365 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2366 2906
2367 if ($exit->slaying eq "/!") {
2368 #TODO: this should de-fi-ni-te-ly not be a sync-job
2369 # the problem is that $exit might not survive long enough
2370 # so it needs to be done right now, right here
2371 cf::sync_job { prepare_random_map $exit };
2372 }
2373
2374 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2375 my $hp = $exit->stats->hp;
2376 my $sp = $exit->stats->sp;
2377
2378 $self->enter_link; 2907 $self->enter_link;
2379 2908
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
2383
2384 (async { 2909 (async {
2385 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
2386 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2916 my $x = $exit->stats->hp;
2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2941
2387 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2388 2943
2944 # if exit is damned, update players death & WoR home-position
2945 $self->contr->savebed ($map, $x, $y)
2946 if $exit->flag (cf::FLAG_DAMNED);
2947
2389 1; 2948 1
2390 }) { 2949 }) {
2391 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2392 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2393 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2394 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2395 2954
2396 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2397 $self->leave_link; 2956 $self->leave_link;
2398 } 2957 }
2399 })->prio (1); 2958 })->prio (1);
2400} 2959}
2401 2960
2415 2974
2416 utf8::encode $text; 2975 utf8::encode $text;
2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2418} 2977}
2419 2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
3002}
3003
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 3005
2422Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of 3007client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress 3008the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2426 3010
2427=cut 3011=cut
2428 3012
3013# non-persistent channels (usually the info channel)
3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
3021 "c/identify" => {
3022 id => "infobox",
3023 title => "Identify",
3024 reply => undef,
3025 tooltip => "Items recently identified",
3026 },
3027 "c/examine" => {
3028 id => "infobox",
3029 title => "Examine",
3030 reply => undef,
3031 tooltip => "Signs and other items you examined",
3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
3038 },
3039 "c/book" => {
3040 id => "infobox",
3041 title => "Book",
3042 reply => undef,
3043 tooltip => "The contents of a note or book",
3044 },
3045 "c/lookat" => {
3046 id => "infobox",
3047 title => "Look",
3048 reply => undef,
3049 tooltip => "What you saw there",
3050 },
3051 "c/who" => {
3052 id => "infobox",
3053 title => "Players",
3054 reply => undef,
3055 tooltip => "Shows players who are currently online",
3056 },
3057 "c/body" => {
3058 id => "infobox",
3059 title => "Body Parts",
3060 reply => undef,
3061 tooltip => "Shows which body parts you posess and are available",
3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
3099 "c/uptime" => {
3100 id => "infobox",
3101 title => "Uptime",
3102 reply => undef,
3103 tooltip => "How long the server has been running since last restart",
3104 },
3105 "c/mapinfo" => {
3106 id => "infobox",
3107 title => "Map Info",
3108 reply => undef,
3109 tooltip => "Information related to the maps",
3110 },
3111 "c/party" => {
3112 id => "party",
3113 title => "Party",
3114 reply => "gsay ",
3115 tooltip => "Messages and chat related to your party",
3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
3125);
3126
2429sub cf::client::send_msg { 3127sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2431 3129
2432 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
3132
3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
3134
3135 # check predefined channels, for the benefit of C
3136 if ($CHANNEL{$channel}) {
3137 $channel = $CHANNEL{$channel};
3138
3139 $self->ext_msg (channel_info => $channel);
3140 $channel = $channel->{id};
3141
3142 } elsif (ref $channel) {
3143 # send meta info to client, if not yet sent
3144 unless (exists $self->{channel}{$channel->{id}}) {
3145 $self->{channel}{$channel->{id}} = $channel;
3146 $self->ext_msg (channel_info => $channel);
3147 }
3148
3149 $channel = $channel->{id};
3150 }
2433 3151
2434 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2435 3153
2436 if ($self->can_msg) { 3154 # default colour, mask it out
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2438 } else { 3156 if $color & cf::NDI_DEF;
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448 3157
2449 if ($color >= 0) { 3158 my $pkt = "msg "
2450 if (0 && $msg =~ /\[/) { 3159 . $self->{json_coder}->encode (
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2452 } else { 3161 );
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg")
2455 }
2456 }
2457 }
2458}
2459 3162
3163 $self->send_big_packet ($pkt);
3164}
3165
2460=item $client->ext_event ($type, %msg) 3166=item $client->ext_msg ($type, @msg)
2461 3167
2462Sends an ext event to the client. 3168Sends an ext event to the client.
2463 3169
2464=cut 3170=cut
2465 3171
2466sub cf::client::ext_event($$%) { 3172sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 3173 my ($self, $type, @msg) = @_;
2468 3174
3175 if ($self->extcmd == 2) {
3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3177 } elsif ($self->extcmd == 1) { # TODO: remove
2469 $msg{msgtype} = "event_$type"; 3178 push @msg, msgtype => "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180 }
3181}
3182
3183=item $client->ext_reply ($msgid, @msg)
3184
3185Sends an ext reply to the client.
3186
3187=cut
3188
3189sub cf::client::ext_reply($$@) {
3190 my ($self, $id, @msg) = @_;
3191
3192 return unless $self->extcmd == 2;
3193
3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2471} 3195}
2472 3196
2473=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2474 3198
2475Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2530 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2531 3255
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 3257
2534 if (ref $msg) { 3258 if (ref $msg) {
3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3260
3261 my @reply;
3262
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3263 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 3264 @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 } 3265 }
3266
3267 $ns->ext_reply ($reply, @reply)
3268 if $reply;
3269
2541 } else { 3270 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 } 3272 }
2544 3273
2545 cf::override; 3274 cf::override;
2546 }, 3275 },
2547); 3276);
2567 3296
2568 $coro 3297 $coro
2569} 3298}
2570 3299
2571cf::client->attach ( 3300cf::client->attach (
2572 on_destroy => sub { 3301 on_client_destroy => sub {
2573 my ($ns) = @_; 3302 my ($ns) = @_;
2574 3303
2575 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2576 }, 3305 },
2577); 3306);
2592our $safe = new Safe "safe"; 3321our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2594 3323
2595$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2596 3325
2597$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3326$safe->permit_only (Opcode::opset qw(
3327 :base_core :base_mem :base_orig :base_math :base_loop
3328 grepstart grepwhile mapstart mapwhile
3329 sort time
3330));
2598 3331
2599# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2600 3333
2601=pod 3334=pod
2602 3335
2603The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2604 3337
2605 cf::object 3338 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 3339 contr pay_amount pay_player map x y force_find force_add destroy
2607 insert remove 3340 insert remove name archname title slaying race decrease split
3341 value
2608 3342
2609 cf::object::player 3343 cf::object::player
2610 player 3344 player
2611 3345
2612 cf::player 3346 cf::player
2617 3351
2618=cut 3352=cut
2619 3353
2620for ( 3354for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)], 3356 insert remove inv nrof name archname title slaying race
3357 decrease split destroy change_exp value msg lore send_msg)],
2623 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2625 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2626) { 3361) {
2627 no strict 'refs';
2628 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2629 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2630 for @funs; 3364 for @funs;
2631} 3365}
2632 3366
2647 3381
2648 my $qcode = $code; 3382 my $qcode = $code;
2649 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2650 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2651 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2652 local $_; 3389 local $_;
2653 local @safe::cf::_safe_eval_args = values %vars;
2654 3390
2655 my $eval = 3391 my $eval =
2656 "do {\n" 3392 "do {\n"
2657 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2658 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2659 . $code 3395 . $code
2660 . "\n}" 3396 . "\n}"
2661 ; 3397 ;
2662 3398
3399 if ($CFG{safe_eval}) {
2663 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2664 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2665 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
2666 3408
2667 if ($@) { 3409 if ($@) {
2668 warn "$@"; 3410 warn "$@",
2669 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2670 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2671 } 3413 }
2672 3414
2673 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
2674} 3416}
2675 3417
2689=cut 3431=cut
2690 3432
2691sub register_script_function { 3433sub register_script_function {
2692 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
2693 3435
2694 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
2695 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
2696} 3438}
2697 3439
2698=back 3440=back
2699 3441
2700=cut 3442=cut
2703# the server's init and main functions 3445# the server's init and main functions
2704 3446
2705sub load_facedata($) { 3447sub load_facedata($) {
2706 my ($path) = @_; 3448 my ($path) = @_;
2707 3449
3450 # HACK to clear player env face cache, we need some signal framework
3451 # for this (global event?)
3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3453
3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3455
2708 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
2709 3457
2710 my $facedata; 3458 my $facedata = decode_storable load_file $path;
2711 0 < aio_load $path, $facedata
2712 or die "$path: $!";
2713
2714 $facedata = Coro::Storable::thaw $facedata;
2715 3459
2716 $facedata->{version} == 2 3460 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 3462
3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3465 $facedata->{resource}{"res/exp_table"} = {
3466 type => FT_RSRC,
3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3469 };
3470 cf::cede_to_tick;
3471
2719 { 3472 {
2720 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
2721 3474
2722 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3479 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2727 Coro::cede; 3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3483
3484 cf::cede_to_tick;
2728 } 3485 }
2729 3486
2730 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
2732 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
2733 or next; 3491 or next;
3492
2734 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3494 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 3496 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 3498 }
2739 Coro::cede; 3499
3500 cf::cede_to_tick;
2740 } 3501 }
2741 } 3502 }
2742 3503
2743 { 3504 {
2744 my $anims = $facedata->{animinfo}; 3505 my $anims = $facedata->{animinfo};
2745 3506
2746 while (my ($anim, $info) = each %$anims) { 3507 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3508 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 3509 cf::cede_to_tick;
2749 } 3510 }
2750 3511
2751 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
2752 } 3513 }
2753 3514
3515 {
3516 my $res = $facedata->{resource};
3517
3518 while (my ($name, $info) = each %$res) {
3519 if (defined (my $type = delete $info->{type})) {
3520 # TODO: different hash - must free and use new index, or cache ixface data queue
3521 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3522
3523 cf::face::set_data $idx, 0, delete $info->{data}, delete $info->{hash};
3524 cf::face::set_type $idx, $type;
3525 cf::face::set_meta $idx, (keys %$info && (~$type & 1)) ? $info : undef; # any keys left are stashed into meta unless prepended
3526 } else {
3527# $RESOURCE{$name} = $info; # unused
3528 }
3529
3530 cf::cede_to_tick;
3531 }
3532 }
3533
3534 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3535
2754 1 3536 1
2755} 3537}
2756 3538
3539register_exticmd fx_want => sub {
3540 my ($ns, $want) = @_;
3541
3542 while (my ($k, $v) = each %$want) {
3543 $ns->fx_want ($k, $v);
3544 }
3545};
3546
3547sub load_resource_file($) {
3548 my $guard = lock_acquire "load_resource_file";
3549
3550 my $status = load_resource_file_ $_[0];
3551 get_slot 0.1, 100;
3552 cf::arch::commit_load;
3553
3554 $status
3555}
3556
2757sub reload_regions { 3557sub reload_regions {
3558 # HACK to clear player env face cache, we need some signal framework
3559 # for this (global event?)
3560 %ext::player_env::MUSIC_FACE_CACHE = ();
3561
2758 load_resource_file "$MAPDIR/regions" 3562 load_resource_file "$MAPDIR/regions"
2759 or die "unable to load regions file\n"; 3563 or die "unable to load regions file\n";
3564
3565 for (cf::region::list) {
3566 $_->{match} = qr/$_->{match}/
3567 if exists $_->{match};
3568 }
2760} 3569}
2761 3570
2762sub reload_facedata { 3571sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 3572 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n"; 3573 or die "unable to load facedata\n";
2765} 3574}
2766 3575
2767sub reload_archetypes { 3576sub reload_archetypes {
2768 load_resource_file "$DATADIR/archetypes" 3577 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n"; 3578 or die "unable to load archetypes\n";
2770 #d# NEED to laod twice to resolve forward references
2771 # this really needs to be done in an extra post-pass
2772 # (which needs to be synchronous, so solve it differently)
2773 load_resource_file "$DATADIR/archetypes"
2774 or die "unable to load archetypes\n";
2775} 3579}
2776 3580
2777sub reload_treasures { 3581sub reload_treasures {
2778 load_resource_file "$DATADIR/treasures" 3582 load_resource_file "$DATADIR/treasures"
2779 or die "unable to load treasurelists\n"; 3583 or die "unable to load treasurelists\n";
2780} 3584}
2781 3585
3586sub reload_sound {
3587 trace "loading sound config from $DATADIR/sound\n";
3588
3589 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3590
3591 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3592 my $sound = $soundconf->{compat}[$_]
3593 or next;
3594
3595 my $face = cf::face::find "sound/$sound->[1]";
3596 cf::sound::set $sound->[0] => $face;
3597 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3598 }
3599
3600 while (my ($k, $v) = each %{$soundconf->{event}}) {
3601 my $face = cf::face::find "sound/$v";
3602 cf::sound::set $k => $face;
3603 }
3604}
3605
2782sub reload_resources { 3606sub reload_resources {
2783 warn "reloading resource files...\n"; 3607 trace "reloading resource files...\n";
2784 3608
3609 reload_exp_table;
3610 reload_materials;
3611 reload_facedata;
3612 reload_sound;
3613 reload_archetypes;
2785 reload_regions; 3614 reload_regions;
2786 reload_facedata;
2787 #reload_archetypes;#d#
2788 reload_archetypes;
2789 reload_treasures; 3615 reload_treasures;
2790 3616
2791 warn "finished reloading resource files\n"; 3617 trace "finished reloading resource files\n";
2792} 3618}
2793 3619
2794sub init { 3620sub reload_config {
2795 reload_resources; 3621 trace "reloading config file...\n";
2796}
2797 3622
2798sub cfg_load { 3623 my $config = load_file "$CONFDIR/config";
2799 open my $fh, "<:utf8", "$CONFDIR/config" 3624 utf8::decode $config;
2800 or return; 3625 *CFG = decode_yaml $config;
2801 3626
2802 local $/;
2803 *CFG = YAML::Syck::Load <$fh>;
2804
2805 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3627 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2806 3628
2807 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3629 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2808 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3630 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2809 3631
2810 if (exists $CFG{mlockall}) { 3632 if (exists $CFG{mlockall}) {
2814 }; 3636 };
2815 warn $@ if $@; 3637 warn $@ if $@;
2816 } 3638 }
2817} 3639}
2818 3640
3641sub pidfile() {
3642 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3643 or die "$PIDFILE: $!";
3644 flock $fh, &Fcntl::LOCK_EX
3645 or die "$PIDFILE: flock: $!";
3646 $fh
3647}
3648
3649# make sure only one server instance is running at any one time
3650sub atomic {
3651 my $fh = pidfile;
3652
3653 my $pid = <$fh>;
3654 kill 9, $pid if $pid > 0;
3655
3656 seek $fh, 0, 0;
3657 print $fh $$;
3658}
3659
3660sub main_loop {
3661 trace "EV::loop starting\n";
3662 if (1) {
3663 EV::loop;
3664 }
3665 trace "EV::loop returned\n";
3666 goto &main_loop unless $REALLY_UNLOOP;
3667}
3668
2819sub main { 3669sub main {
3670 cf::init_globals; # initialise logging
3671
3672 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3673 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3674 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3675 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3676
3677 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3678
2820 # we must not ever block the main coroutine 3679 # we must not ever block the main coroutine
2821 local $Coro::idle = sub { 3680 local $Coro::idle = sub {
2822 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3681 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2823 (async { 3682 (async {
2824 Event::one_event; 3683 $Coro::current->{desc} = "IDLE BUG HANDLER";
3684 EV::loop EV::LOOP_ONESHOT;
2825 })->prio (Coro::PRIO_MAX); 3685 })->prio (Coro::PRIO_MAX);
2826 }; 3686 };
2827 3687
2828 cfg_load; 3688 evthread_start IO::AIO::poll_fileno;
3689
3690 cf::sync_job {
3691 cf::incloader::init ();
3692
3693 cf::init_anim;
3694 cf::init_attackmess;
3695 cf::init_dynamic;
3696
3697 cf::load_settings;
3698
3699 reload_resources;
3700 reload_config;
2829 db_init; 3701 db_init;
3702
3703 cf::init_uuid;
3704 cf::init_signals;
3705 cf::init_skills;
3706
3707 cf::init_beforeplay;
3708
3709 atomic;
3710
2830 load_extensions; 3711 load_extensions;
2831 3712
2832 $TICK_WATCHER->start; 3713 utime time, time, $RUNTIMEFILE;
2833 Event::loop; 3714
3715 # no (long-running) fork's whatsoever before this point(!)
3716 use POSIX ();
3717 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3718
3719 cf::_post_init 0;
3720 };
3721
3722 cf::object::thawer::errors_are_fatal 0;
3723 info "parse errors in files are no longer fatal from this point on.\n";
3724
3725 AE::postpone {
3726 undef &main; # free gobs of memory :)
3727 };
3728
3729 goto &main_loop;
2834} 3730}
2835 3731
2836############################################################################# 3732#############################################################################
2837# initialisation and cleanup 3733# initialisation and cleanup
2838 3734
2839# install some emergency cleanup handlers 3735# install some emergency cleanup handlers
2840BEGIN { 3736BEGIN {
3737 our %SIGWATCHER = ();
2841 for my $signal (qw(INT HUP TERM)) { 3738 for my $signal (qw(INT HUP TERM)) {
2842 Event->signal ( 3739 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2843 reentrant => 0,
2844 data => WF_AUTOCANCEL,
2845 signal => $signal,
2846 prio => 0,
2847 cb => sub {
2848 cf::cleanup "SIG$signal"; 3740 cf::cleanup "SIG$signal";
2849 },
2850 ); 3741 };
2851 } 3742 }
2852} 3743}
2853 3744
2854sub write_runtime { 3745sub write_runtime_sync {
2855 my $runtime = "$LOCALDIR/runtime"; 3746 my $t0 = AE::time;
2856 3747
2857 # first touch the runtime file to show we are still running: 3748 # first touch the runtime file to show we are still running:
2858 # the fsync below can take a very very long time. 3749 # the fsync below can take a very very long time.
2859 3750
2860 IO::AIO::aio_utime $runtime, undef, undef; 3751 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2861 3752
2862 my $guard = cf::lock_acquire "write_runtime"; 3753 my $guard = cf::lock_acquire "write_runtime";
2863 3754
2864 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3755 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2865 or return; 3756 or return;
2866 3757
2867 my $value = $cf::RUNTIME + 90 + 10; 3758 my $value = $cf::RUNTIME + 90 + 10;
2868 # 10 is the runtime save interval, for a monotonic clock 3759 # 10 is the runtime save interval, for a monotonic clock
2869 # 60 allows for the watchdog to kill the server. 3760 # 60 allows for the watchdog to kill the server.
2879 aio_utime $fh, undef, undef; 3770 aio_utime $fh, undef, undef;
2880 3771
2881 close $fh 3772 close $fh
2882 or return; 3773 or return;
2883 3774
2884 aio_rename "$runtime~", $runtime 3775 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2885 and return; 3776 and return;
2886 3777
2887 warn "runtime file written.\n"; 3778 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2888 3779
2889 1 3780 1
3781}
3782
3783our $uuid_lock;
3784our $uuid_skip;
3785
3786sub write_uuid_sync($) {
3787 $uuid_skip ||= $_[0];
3788
3789 return if $uuid_lock;
3790 local $uuid_lock = 1;
3791
3792 my $uuid = "$LOCALDIR/uuid";
3793
3794 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3795 or return;
3796
3797 my $value = uuid_seq uuid_cur;
3798
3799 unless ($value) {
3800 info "cowardly refusing to write zero uuid value!\n";
3801 return;
3802 }
3803
3804 my $value = uuid_str $value + $uuid_skip;
3805 $uuid_skip = 0;
3806
3807 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3808 and return;
3809
3810 # always fsync - this file is important
3811 aio_fsync $fh
3812 and return;
3813
3814 close $fh
3815 or return;
3816
3817 aio_rename "$uuid~", $uuid
3818 and return;
3819
3820 trace "uuid file written ($value).\n";
3821
3822 1
3823
3824}
3825
3826sub write_uuid($$) {
3827 my ($skip, $sync) = @_;
3828
3829 $sync ? write_uuid_sync $skip
3830 : async { write_uuid_sync $skip };
2890} 3831}
2891 3832
2892sub emergency_save() { 3833sub emergency_save() {
2893 my $freeze_guard = cf::freeze_mainloop; 3834 my $freeze_guard = cf::freeze_mainloop;
2894 3835
2895 warn "enter emergency perl save\n"; 3836 info "emergency_perl_save: enter\n";
3837
3838 # this is a trade-off: we want to be very quick here, so
3839 # save all maps without fsync, and later call a global sync
3840 # (which in turn might be very very slow)
3841 local $USE_FSYNC = 0;
2896 3842
2897 cf::sync_job { 3843 cf::sync_job {
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
2898 # use a peculiar iteration method to avoid tripping on perl 3846 # use a peculiar iteration method to avoid tripping on perl
2899 # refcount bugs in for. also avoids problems with players 3847 # refcount bugs in for. also avoids problems with players
2900 # and maps saved/destroyed asynchronously. 3848 # and maps saved/destroyed asynchronously.
2901 warn "begin emergency player save\n"; 3849 info "emergency_perl_save: begin player save\n";
2902 for my $login (keys %cf::PLAYER) { 3850 for my $login (keys %cf::PLAYER) {
2903 my $pl = $cf::PLAYER{$login} or next; 3851 my $pl = $cf::PLAYER{$login} or next;
2904 $pl->valid or next; 3852 $pl->valid or next;
3853 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2905 $pl->save; 3854 $pl->save;
2906 } 3855 }
2907 warn "end emergency player save\n"; 3856 info "emergency_perl_save: end player save\n";
2908 3857
2909 warn "begin emergency map save\n"; 3858 cf::write_runtime_sync; # external watchdog should not bark
3859
3860 info "emergency_perl_save: begin map save\n";
2910 for my $path (keys %cf::MAP) { 3861 for my $path (keys %cf::MAP) {
2911 my $map = $cf::MAP{$path} or next; 3862 my $map = $cf::MAP{$path} or next;
2912 $map->valid or next; 3863 $map->valid or next;
2913 $map->save; 3864 $map->save;
2914 } 3865 }
2915 warn "end emergency map save\n"; 3866 info "emergency_perl_save: end map save\n";
2916 3867
2917 warn "begin emergency database checkpoint\n"; 3868 cf::write_runtime_sync; # external watchdog should not bark
3869
3870 info "emergency_perl_save: begin database checkpoint\n";
2918 BDB::db_env_txn_checkpoint $DB_ENV; 3871 BDB::db_env_txn_checkpoint $DB_ENV;
2919 warn "end emergency database checkpoint\n"; 3872 info "emergency_perl_save: end database checkpoint\n";
3873
3874 info "emergency_perl_save: begin write uuid\n";
3875 write_uuid_sync 1;
3876 info "emergency_perl_save: end write uuid\n";
3877
3878 cf::write_runtime_sync; # external watchdog should not bark
3879
3880 trace "emergency_perl_save: syncing database to disk";
3881 BDB::db_env_txn_checkpoint $DB_ENV;
3882
3883 info "emergency_perl_save: starting sync\n";
3884 IO::AIO::aio_sync sub {
3885 info "emergency_perl_save: finished sync\n";
3886 };
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3889
3890 trace "emergency_perl_save: flushing outstanding aio requests";
3891 while (IO::AIO::nreqs || BDB::nreqs) {
3892 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3893 }
3894
3895 cf::write_runtime_sync; # external watchdog should not bark
2920 }; 3896 };
2921 3897
2922 warn "leave emergency perl save\n"; 3898 info "emergency_perl_save: leave\n";
2923} 3899}
2924 3900
2925sub post_cleanup { 3901sub post_cleanup {
2926 my ($make_core) = @_; 3902 my ($make_core) = @_;
2927 3903
3904 IO::AIO::flush;
3905
2928 warn Carp::longmess "post_cleanup backtrace" 3906 error Carp::longmess "post_cleanup backtrace"
2929 if $make_core; 3907 if $make_core;
3908
3909 my $fh = pidfile;
3910 unlink $PIDFILE if <$fh> == $$;
3911}
3912
3913# a safer delete_package, copied from Symbol
3914sub clear_package($) {
3915 my $pkg = shift;
3916
3917 # expand to full symbol table name if needed
3918 unless ($pkg =~ /^main::.*::$/) {
3919 $pkg = "main$pkg" if $pkg =~ /^::/;
3920 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3921 $pkg .= '::' unless $pkg =~ /::$/;
3922 }
3923
3924 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3925 my $stem_symtab = *{$stem}{HASH};
3926
3927 defined $stem_symtab and exists $stem_symtab->{$leaf}
3928 or return;
3929
3930 # clear all symbols
3931 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3932 for my $name (keys %$leaf_symtab) {
3933 _gv_clear *{"$pkg$name"};
3934# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3935 }
2930} 3936}
2931 3937
2932sub do_reload_perl() { 3938sub do_reload_perl() {
2933 # can/must only be called in main 3939 # can/must only be called in main
2934 if ($Coro::current != $Coro::main) { 3940 unless (in_main) {
2935 warn "can only reload from main coroutine"; 3941 error "can only reload from main coroutine";
2936 return; 3942 return;
2937 } 3943 }
2938 3944
2939 warn "reloading..."; 3945 return if $RELOAD++;
2940 3946
2941 warn "entering sync_job"; 3947 my $t1 = AE::time;
2942 3948
3949 while ($RELOAD) {
3950 cf::get_slot 0.1, -1, "reload_perl";
3951 info "perl_reload: reloading...";
3952
3953 trace "perl_reload: entering sync_job";
3954
2943 cf::sync_job { 3955 cf::sync_job {
2944 cf::write_runtime; # external watchdog should not bark
2945 cf::emergency_save; 3956 #cf::emergency_save;
2946 cf::write_runtime; # external watchdog should not bark
2947 3957
2948 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV;
2950
2951 # if anything goes wrong in here, we should simply crash as we already saved
2952
2953 warn "cancelling all WF_AUTOCANCEL watchers";
2954 for (Event::all_watchers) {
2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2956 }
2957
2958 warn "flushing outstanding aio requests";
2959 for (;;) {
2960 BDB::flush;
2961 IO::AIO::flush;
2962 Coro::cede;
2963 last unless IO::AIO::nreqs || BDB::nreqs;
2964 warn "iterate...";
2965 }
2966
2967 ++$RELOAD;
2968
2969 warn "cancelling all extension coros"; 3958 trace "perl_reload: cancelling all extension coros";
2970 $_->cancel for values %EXT_CORO; 3959 $_->cancel for values %EXT_CORO;
2971 %EXT_CORO = (); 3960 %EXT_CORO = ();
2972 3961
2973 warn "removing commands"; 3962 trace "perl_reload: removing commands";
2974 %COMMAND = (); 3963 %COMMAND = ();
2975 3964
2976 warn "removing ext/exti commands"; 3965 trace "perl_reload: removing ext/exti commands";
2977 %EXTCMD = (); 3966 %EXTCMD = ();
2978 %EXTICMD = (); 3967 %EXTICMD = ();
2979 3968
2980 warn "unloading/nuking all extensions"; 3969 trace "perl_reload: unloading/nuking all extensions";
2981 for my $pkg (@EXTS) { 3970 for my $pkg (@EXTS) {
2982 warn "... unloading $pkg"; 3971 trace "... unloading $pkg";
2983 3972
2984 if (my $cb = $pkg->can ("unload")) { 3973 if (my $cb = $pkg->can ("unload")) {
2985 eval { 3974 eval {
2986 $cb->($pkg); 3975 $cb->($pkg);
2987 1 3976 1
2988 } or warn "$pkg unloaded, but with errors: $@"; 3977 } or error "$pkg unloaded, but with errors: $@";
3978 }
3979
3980 trace "... clearing $pkg";
3981 clear_package $pkg;
2989 } 3982 }
2990 3983
2991 warn "... nuking $pkg";
2992 Symbol::delete_package $pkg;
2993 }
2994
2995 warn "unloading all perl modules loaded from $LIBDIR"; 3984 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2996 while (my ($k, $v) = each %INC) { 3985 while (my ($k, $v) = each %INC) {
2997 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3986 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2998 3987
2999 warn "... unloading $k"; 3988 trace "... unloading $k";
3000 delete $INC{$k}; 3989 delete $INC{$k};
3001 3990
3002 $k =~ s/\.pm$//; 3991 $k =~ s/\.pm$//;
3003 $k =~ s/\//::/g; 3992 $k =~ s/\//::/g;
3004 3993
3005 if (my $cb = $k->can ("unload_module")) { 3994 if (my $cb = $k->can ("unload_module")) {
3006 $cb->(); 3995 $cb->();
3996 }
3997
3998 clear_package $k;
3007 } 3999 }
3008 4000
3009 Symbol::delete_package $k;
3010 }
3011
3012 warn "getting rid of safe::, as good as possible"; 4001 trace "perl_reload: getting rid of safe::, as good as possible";
3013 Symbol::delete_package "safe::$_" 4002 clear_package "safe::$_"
3014 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4003 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3015 4004
3016 warn "unloading cf.pm \"a bit\""; 4005 trace "perl_reload: unloading cf.pm \"a bit\"";
3017 delete $INC{"cf.pm"}; 4006 delete $INC{"cf.pm"};
3018 delete $INC{"cf/pod.pm"}; 4007 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3019 4008
3020 # don't, removes xs symbols, too, 4009 # don't, removes xs symbols, too,
3021 # and global variables created in xs 4010 # and global variables created in xs
3022 #Symbol::delete_package __PACKAGE__; 4011 #clear_package __PACKAGE__;
3023 4012
3024 warn "unload completed, starting to reload now"; 4013 info "perl_reload: unload completed, starting to reload now";
3025 4014
3026 warn "reloading cf.pm"; 4015 trace "perl_reload: reloading cf.pm";
3027 require cf; 4016 require cf;
3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4017 cf::_connect_to_perl_1;
3029 4018
3030 warn "loading config and database again"; 4019 trace "perl_reload: loading config and database again";
3031 cf::cfg_load; 4020 cf::reload_config;
3032 4021
3033 warn "loading extensions"; 4022 trace "perl_reload: loading extensions";
3034 cf::load_extensions; 4023 cf::load_extensions;
3035 4024
4025 if ($REATTACH_ON_RELOAD) {
3036 warn "reattaching attachments to objects/players"; 4026 trace "perl_reload: reattaching attachments to objects/players";
3037 _global_reattach; # objects, sockets 4027 _global_reattach; # objects, sockets
3038 warn "reattaching attachments to maps"; 4028 trace "perl_reload: reattaching attachments to maps";
3039 reattach $_ for values %MAP; 4029 reattach $_ for values %MAP;
3040 warn "reattaching attachments to players"; 4030 trace "perl_reload: reattaching attachments to players";
3041 reattach $_ for values %PLAYER; 4031 reattach $_ for values %PLAYER;
4032 }
3042 4033
3043 warn "leaving sync_job"; 4034 cf::_post_init 1;
3044 4035
4036 trace "perl_reload: leaving sync_job";
4037
3045 1 4038 1
3046 } or do { 4039 } or do {
3047 warn $@; 4040 error $@;
3048 warn "error while reloading, exiting."; 4041 cf::cleanup "perl_reload: error, exiting.";
3049 exit 1; 4042 };
4043
4044 --$RELOAD;
3050 }; 4045 }
3051 4046
3052 warn "reloaded"; 4047 $t1 = AE::time - $t1;
4048 info "perl_reload: completed in ${t1}s\n";
3053}; 4049};
3054 4050
3055our $RELOAD_WATCHER; # used only during reload 4051our $RELOAD_WATCHER; # used only during reload
3056 4052
3057sub reload_perl() { 4053sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back, 4054 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here. 4055 # coro crashes during coro_state_free->destroy here.
3060 4056
3061 $RELOAD_WATCHER ||= Event->timer ( 4057 $RELOAD_WATCHER ||= cf::async {
3062 reentrant => 0, 4058 Coro::AIO::aio_wait cache_extensions;
3063 after => 0, 4059
3064 data => WF_AUTOCANCEL, 4060 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3065 cb => sub {
3066 do_reload_perl; 4061 do_reload_perl;
3067 undef $RELOAD_WATCHER; 4062 undef $RELOAD_WATCHER;
3068 }, 4063 };
3069 ); 4064 };
3070} 4065}
3071 4066
3072register_command "reload" => sub { 4067register_command "reload" => sub {
3073 my ($who, $arg) = @_; 4068 my ($who, $arg) = @_;
3074 4069
3075 if ($who->flag (FLAG_WIZ)) { 4070 if ($who->flag (FLAG_WIZ)) {
3076 $who->message ("reloading server."); 4071 $who->message ("reloading server.");
4072 async {
4073 $Coro::current->{desc} = "perl_reload";
3077 async { reload_perl }; 4074 reload_perl;
4075 };
3078 } 4076 }
3079}; 4077};
3080 4078
3081unshift @INC, $LIBDIR; 4079#############################################################################
3082 4080
3083my $bug_warning = 0; 4081my $bug_warning = 0;
3084 4082
3085our @WAIT_FOR_TICK;
3086our @WAIT_FOR_TICK_BEGIN;
3087
3088sub wait_for_tick { 4083sub wait_for_tick() {
3089 return unless $TICK_WATCHER->is_active; 4084 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3090 return if $Coro::current == $Coro::main;
3091 4085
3092 my $signal = new Coro::Signal; 4086 $WAIT_FOR_TICK->wait;
3093 push @WAIT_FOR_TICK, $signal;
3094 $signal->wait;
3095} 4087}
3096 4088
3097sub wait_for_tick_begin { 4089sub wait_for_tick_begin() {
3098 return unless $TICK_WATCHER->is_active; 4090 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3099 return if $Coro::current == $Coro::main;
3100 4091
3101 my $signal = new Coro::Signal; 4092 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal; 4093 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait; 4094 $signal->wait;
3104} 4095}
3105 4096
3106 my $min = 1e6;#d# 4097sub tick {
3107 my $avg = 10;
3108$TICK_WATCHER = Event->timer (
3109 reentrant => 0,
3110 parked => 1,
3111 prio => 0,
3112 at => $NEXT_TICK || $TICK,
3113 data => WF_AUTOCANCEL,
3114 cb => sub {
3115 if ($Coro::current != $Coro::main) { 4098 if ($Coro::current != $Coro::main) {
3116 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4099 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3117 unless ++$bug_warning > 10; 4100 unless ++$bug_warning > 10;
3118 return; 4101 return;
3119 } 4102 }
3120 4103
3121 $NOW = $tick_start = Event::time; 4104 cf::one_tick; # one server iteration
3122 4105
3123 cf::server_tick; # one server iteration 4106 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3124 4107
3125 0 && sync_job {#d# 4108 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3126 for(1..10) { 4109 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3127 my $t = Event::time; 4110 Coro::async_pool {
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4111 $Coro::current->{desc} = "runtime saver";
3129 or die; 4112 write_runtime_sync
3130 4113 or error "ERROR: unable to write runtime file: $!";
3131 $map->width (50);
3132 $map->height (50);
3133 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1);
3135 my $t = Event::time - $t;
3136
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 }; 4114 };
4115 }
3147 4116
3148 $RUNTIME += $TICK;
3149 $NEXT_TICK += $TICK;
3150
3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
3153 Coro::async_pool {
3154 write_runtime
3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
3157 }
3158
3159# my $AFTER = Event::time;
3160# warn $AFTER - $NOW;#d#
3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4117 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send; 4118 $sig->send;
3164 } 4119 }
3165 while (my $sig = shift @WAIT_FOR_TICK) { 4120 $WAIT_FOR_TICK->broadcast;
3166 $sig->send;
3167 }
3168 4121
3169 $NOW = Event::time; 4122 $LOAD = ($NOW - $TICK_START) / $TICK;
3170
3171 # if we are delayed by four ticks or more, skip them all
3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3173
3174 $TICK_WATCHER->at ($NEXT_TICK);
3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179 4124
3180 _post_tick; 4125 if (0) {
3181 4126 if ($NEXT_TICK) {
3182 4127 my $jitter = $TICK_START - $NEXT_TICK;
4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4129 debug "jitter $JITTER\n";#d#
4130 }
3183 }, 4131 }
3184); 4132}
3185 4133
3186{ 4134{
3187 BDB::max_poll_time $TICK * 0.1; 4135 # configure BDB
3188 $BDB_POLL_WATCHER = Event->io ( 4136
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3197 4138 BDB::max_poll_reqs $TICK * 0.1;
3198 BDB::set_sync_prepare { 4139 #$AnyEvent::BDB::WATCHER->priority (1);
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212 4140
3213 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3214 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3215 4148
3216 cf::sync_job { 4149 cf::sync_job {
3217 eval { 4150 eval {
3218 BDB::db_env_open 4151 BDB::db_env_open
3219 $DB_ENV, 4152 $DB_ENV,
3221 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4154 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4155 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666; 4156 0666;
3224 4157
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4158 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 }; 4159 };
3230 4160
3231 cf::cleanup "db_env_open(db): $@" if $@; 4161 cf::cleanup "db_env_open(db): $@" if $@;
3232 }; 4162 };
3233 } 4163 }
4164
4165 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4166 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4167 };
4168 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4169 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170 };
4171 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173 };
3234} 4174}
3235 4175
3236{ 4176{
4177 # configure IO::AIO
4178
3237 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
3240 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3241 $AIO_POLL_WATCHER = Event->io ( 4181 undef $AnyEvent::AIO::WATCHER;
3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
3244 fd => IO::AIO::poll_fileno,
3245 poll => 'r',
3246 prio => 6,
3247 cb => \&IO::AIO::poll_cb,
3248 );
3249} 4182}
3250 4183
3251my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3252 4186
3253sub _log_backtrace { 4187sub _log_backtrace {
3254 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3255 4189
3256 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3257 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3258 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3259 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3260 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3261 async { 4200 async {
4201 $Coro::current->{desc} = "abt $msg";
4202
3262 my @bt = fork_call { 4203 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4205 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4206 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266 or die "addr2line: $!"; 4207 or die "addr2line: $!";
3274 } 4215 }
3275 4216
3276 @funcs 4217 @funcs
3277 }; 4218 };
3278 4219
3279 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3280 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3281 --$_log_backtrace; 4223 --$_log_backtrace;
3282 }; 4224 };
3283 } else { 4225 } else {
3284 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3285 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3286 } 4228 }
3287} 4229}
3288 4230
3289# load additional modules 4231# load additional modules
3290use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3291 4234
3292END { cf::emergency_save } 4235END { cf::emergency_save }
3293 4236
32941 42371
3295 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines