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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 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
113our %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
691
692sub post_fork {
693 reset_signals;
694}
413 695
414sub fork_call(&@) { 696sub fork_call(&@) {
415 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
416 698
417# 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,
418# or die "socketpair: $!"; 700 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 701 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 702
422 if (my $pid = fork) { 703 my @res = Coro::Util::fork_eval {
423 close $fh2; 704 cf::post_fork;
705 &$cb
706 } @args;
424 707
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 708 wantarray ? @res : $res[-1]
426 warn "pst<$res>" unless $res =~ /^pst/; 709}
427 $res = Coro::Storable::thaw $res;
428 710
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 711sub objinfo {
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals;
436 local $SIG{__WARN__};
437 local $SIG{__DIE__};
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442
443 my @res = eval { $cb->(@args) };
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 } 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
460} 747}
461 748
462=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
463 750
464Returns a single value from the environment database. 751Returns a single value from the environment database.
466=item cf::db_put $family => $key => $value 753=item cf::db_put $family => $key => $value
467 754
468Stores 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
469data 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).
470 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
471=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}
472 784
473our $DB; 785our $DB;
474 786
475sub db_init { 787sub db_init {
476 unless ($DB) { 788 $DB ||= db_table "db";
477 $DB = BDB::db_create $DB_ENV;
478
479 cf::sync_job {
480 eval {
481 $DB->set_flags (BDB::CHKSUM);
482
483 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
484 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
485 cf::cleanup "db_open(db): $!" if $!;
486 };
487 cf::cleanup "db_open(db): $@" if $@;
488 };
489 }
490} 789}
491 790
492sub db_get($$) { 791sub db_get($$) {
493 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
494 793
495 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
496 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
497 798
498 $! ? () 799 $! ? ()
499 : $data 800 : $data
500 }
501} 801}
502 802
503sub db_put($$$) { 803sub db_put($$$) {
504 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
505 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
533 833
534 my @data; 834 my @data;
535 my $md5; 835 my $md5;
536 836
537 for (0 .. $#$src) { 837 for (0 .. $#$src) {
538 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
539 or Carp::croak "$src->[$_]: $!";
540 } 839 }
541 840
542 # if processing is expensive, check 841 # if processing is expensive, check
543 # checksum first 842 # checksum first
544 if (1) { 843 if (1) {
545 $md5 = 844 $md5 =
546 join "\x00", 845 join "\x00",
547 $processversion, 846 $processversion,
548 map { 847 map {
549 Coro::cede; 848 cf::cede_to_tick;
550 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 849 ($src->[$_], Digest::MD5::md5_hex $data[$_])
551 } 0.. $#$src; 850 } 0.. $#$src;
552 851
553 852
554 my $dbmd5 = db_get cache => "$id/md5"; 853 my $dbmd5 = db_get cache => "$id/md5";
561 860
562 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
563 my $data = $process->(\@data); 862 my $data = $process->(\@data);
564 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
565 864
566 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
567 866
568 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
569 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
570 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
571 870
581 880
582=cut 881=cut
583 882
584sub datalog($@) { 883sub datalog($@) {
585 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
586 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
587} 886}
588 887
589=back 888=back
590 889
591=cut 890=cut
592 891
593############################################################################# 892#############################################################################
594 893
595=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
596 895
597Many 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
598attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
599to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
600 899
601In 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>
602C<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
603Crossfire TRT). 902Deliantra).
604 903
605=over 4 904=over 4
606 905
607=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
608 907
652=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
653 952
654Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
655given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
656 955
657Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
658that 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.
659 958
660These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
661 960
662=over 4 961=over 4
786 1085
787 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
788 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
789 1088
790 } elsif (ref $type) { 1089 } elsif (ref $type) {
791 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
792 1091
793 } else { 1092 } else {
794 shift @arg; 1093 shift @arg;
795 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
796 } 1095 }
797 } 1096 }
798} 1097}
799 1098
800sub _object_attach { 1099sub _object_attach {
810 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
811 } 1110 }
812 1111
813 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
814 } else { 1113 } else {
815 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
816 } 1115 }
817 1116
818 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
819} 1118}
820 1119
860 "; 1159 ";
861 die if $@; 1160 die if $@;
862} 1161}
863 1162
864our $override; 1163our $override;
865our @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?
866 1165
867sub override { 1166sub override {
868 $override = 1; 1167 $override = 1;
869 @invoke_results = (); 1168 @INVOKE_RESULTS = (@_);
870} 1169}
871 1170
872sub do_invoke { 1171sub do_invoke {
873 my $event = shift; 1172 my $event = shift;
874 my $callbacks = shift; 1173 my $callbacks = shift;
875 1174
876 @invoke_results = (); 1175 @INVOKE_RESULTS = ();
877 1176
878 local $override; 1177 local $override;
879 1178
880 for (@$callbacks) { 1179 for (@$callbacks) {
881 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
882 1181
883 if ($@) { 1182 if ($@) {
884 warn "$@";
885 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
886 override; 1184 override;
887 } 1185 }
888 1186
889 return 1 if $override; 1187 return 1 if $override;
890 } 1188 }
891 1189
892 0 1190 0
893} 1191}
894 1192
895=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
896 1194
897=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
898 1196
899Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
900 1198
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 1201results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 1202
905=back 1203=back
906 1204
907=cut 1205=cut
908 1206
909############################################################################# 1207#############################################################################
910# 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}
911 1251
912sub reattach { 1252sub reattach {
913 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 1254 my ($obj) = @_;
915 1255
1256 # no longer needed after getting rid of delete_package?
916 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
917 1258
918 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
919 1260
920 @$registry = (); 1261 @$registry = ();
921 1262
926 for (@$attach) { 1267 for (@$attach) {
927 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
928 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
929 } 1270 }
930 } else { 1271 } else {
931 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
932 } 1273 }
933 } 1274 }
934} 1275}
935 1276
936cf::attachable->attach ( 1277cf::attachable->attach (
937 prio => -1000000, 1278 prio => -1000000,
938 on_instantiate => sub { 1279 on_instantiate => sub {
939 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
940 1281
941 $data = from_json $data; 1282 $data = decode_json $data;
942 1283
943 for (@$data) { 1284 for (@$data) {
944 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
945 1286
946 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
962sub object_freezer_save { 1303sub object_freezer_save {
963 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
964 1305
965 sync_job { 1306 sync_job {
966 if (length $$rdata) { 1307 if (length $$rdata) {
1308 utf8::decode (my $decname = $filename);
967 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
968 $filename, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
969 1312
970 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
971 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
972 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
973 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 }
974 close $fh; 1320 aio_close $fh;
975 1321
976 if (@$objs) { 1322 if (@$objs) {
977 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) {
978 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
979 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
980 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
981 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 }
982 close $fh; 1331 aio_close $fh;
983 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
984 } 1333 }
985 } else { 1334 } else {
986 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
987 } 1336 }
988 1337
989 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
990 } else { 1342 } else {
991 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
992 } 1344 }
993 } else { 1345 } else {
994 aio_unlink $filename; 1346 aio_unlink $filename;
995 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
996 } 1348 }
997 } 1349 };
998} 1350}
999 1351
1000sub object_freezer_as_string { 1352sub object_freezer_as_string {
1001 my ($rdata, $objs) = @_; 1353 my ($rdata, $objs) = @_;
1002 1354
1014 or return; 1366 or return;
1015 1367
1016 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
1017 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
1018 or return; 1370 or return;
1371
1019 $av = eval { (Storable::thaw $av)->{objs} }; 1372 my $st = eval { Coro::Storable::thaw $av };
1373 $av = $st->{objs};
1020 } 1374 }
1021 1375
1376 utf8::decode (my $decname = $filename);
1022 warn sprintf "loading %s (%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1023 $filename, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1380
1024 return ($data, $av); 1381 ($data, $av)
1025} 1382}
1026 1383
1027=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1028 1385
1029=over 4 1386=over 4
1083 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1084 1441
1085 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1086} 1443}
1087 1444
1445use File::Glob ();
1446
1088cf::player->attach ( 1447cf::player->attach (
1089 on_command => sub { 1448 on_unknown_command => sub {
1090 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1091 1450
1092 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1093 or return; 1452 or return;
1094 1453
1102 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1103 1462
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1464
1106 if (ref $msg) { 1465 if (ref $msg) {
1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467
1468 my @reply;
1469
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1470 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1471 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1472 }
1473
1474 $pl->ext_reply ($reply, @reply)
1475 if $reply;
1476
1112 } else { 1477 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1479 }
1115 1480
1116 cf::override; 1481 cf::override;
1117 }, 1482 },
1118); 1483);
1119 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
1120sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1121 cf::sync_job { 1501 cf::sync_job {
1122 my %todo; 1502 my %todo;
1123 1503
1124 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1125 next unless -r $path; 1505 next unless -r $path;
1143 1523
1144 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1145 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1146 1526
1147 $ext{source} = 1527 $ext{source} =
1148 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1149 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1150 . $source 1530 . $source
1151 . "\n};\n1"; 1531 . "\n};\n1";
1152 1532
1153 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1154 } 1534 }
1155 1535
1536 my $pass = 0;
1156 my %done; 1537 my %done;
1157 while (%todo) { 1538 while (%todo) {
1158 my $progress; 1539 my $progress;
1159 1540
1541 ++$pass;
1542
1543 ext:
1160 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1161 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1162 goto skip 1546 next ext
1163 unless exists $done{$_}; 1547 unless exists $done{$_};
1164 } 1548 }
1165 1549
1166 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1167 1551
1168 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1169 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1170 : "$v->{base}: extension inactive.\n";
1171 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1172 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1173 warn $msg; 1559
1174 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1175 exit 1; 1561 delete $todo{$k};
1176 } 1562 } else {
1177 1563 $done{$k} = delete $todo{$k};
1178 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1179 } 1569 }
1180
1181 $done{$k} = delete $todo{$k};
1182 push @EXTS, $v->{pkg};
1183 $progress = 1;
1184 } 1570 }
1185 1571
1186 skip: 1572 unless ($progress) {
1187 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1188 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 }
1189 } 1582 }
1190 }; 1583 };
1191} 1584}
1192 1585
1193############################################################################# 1586#############################################################################
1194 1587
1195=back 1588=back
1196 1589
1197=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1198 1591
1199Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1200 1593
1201=cut 1594=cut
1202 1595
1203package cf::player; 1596package cf::player;
1204 1597
1205use Coro::AIO; 1598use Coro::AIO;
1206 1599
1207=head3 cf::player 1600=head3 cf::player
1208 1601
1209=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}
1210 1617
1211=item cf::player::find $login 1618=item cf::player::find $login
1212 1619
1213Returns the given player object, loading it if necessary (might block). 1620Returns the given player object, loading it if necessary (might block).
1214 1621
1233 1640
1234sub exists($) { 1641sub exists($) {
1235 my ($login) = @_; 1642 my ($login) = @_;
1236 1643
1237 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1238 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1239} 1646}
1240 1647
1241sub find($) { 1648sub find($) {
1242 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1243 my $login = $_[0]; 1650 my $login = $_[0];
1250 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1657 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1251 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1658 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1252 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1659 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1253 aio_unlink +(playerdir $login) . "/$login.pl"; 1660 aio_unlink +(playerdir $login) . "/$login.pl";
1254 1661
1255 my $pl = load_pl path $login 1662 my $f = new_from_file cf::object::thawer path $login
1256 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;
1257 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1258 } 1671 }
1259 } 1672 }
1260} 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);
1261 1687
1262sub save($) { 1688sub save($) {
1263 my ($pl) = @_; 1689 my ($pl) = @_;
1264 1690
1265 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1270 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1271 1697
1272 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1273 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1274 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
1275 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1276 Coro::cede; 1707 cf::cede_to_tick;
1277} 1708}
1278 1709
1279sub new($) { 1710sub new($) {
1280 my ($login) = @_; 1711 my ($login) = @_;
1281 1712
1287 $cf::PLAYER{$login} = $self; 1718 $cf::PLAYER{$login} = $self;
1288 1719
1289 $self 1720 $self
1290} 1721}
1291 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
1292=item $pl->quit_character 1733=item $pl->quit_character
1293 1734
1294Nukes the player without looking back. If logged in, the connection will 1735Nukes the player without looking back. If logged in, the connection will
1295be destroyed. May block for a long time. 1736be destroyed. May block for a long time.
1296 1737
1300 my ($pl) = @_; 1741 my ($pl) = @_;
1301 1742
1302 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1303 1744
1304 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1305 $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
1306 1747
1307 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1308 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1309 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1310 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1311 1756
1312 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1313 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1314 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1349 or return []; 1794 or return [];
1350 1795
1351 my @logins; 1796 my @logins;
1352 1797
1353 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") {
1354 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1355 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1356 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1807 }
1357 1808
1358 utf8::decode $login; 1809 utf8::decode $login;
1359 push @logins, $login; 1810 push @logins, $login;
1360 } 1811 }
1361 1812
1362 \@logins 1813 \@logins
1363} 1814}
1364 1815
1365=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1366 1819
1367Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1368player. May block. 1821player. May block.
1369 1822
1370=cut 1823=cut
1388 } 1841 }
1389 1842
1390 \@paths 1843 \@paths
1391} 1844}
1392 1845
1393=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1394 1847
1395Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1396 1849
1397=cut
1398
1399sub expand_cfpod {
1400 ((my $self), (local $_)) = @_;
1401
1402 # escape & and <
1403 s/&/&amp;/g;
1404 s/(?<![BIUGH])</&lt;/g;
1405
1406 # this is buggy, it needs to properly take care of nested <'s
1407
1408 1 while
1409 # replace B<>, I<>, U<> etc.
1410 s/B<([^\>]*)>/<b>$1<\/b>/
1411 || s/I<([^\>]*)>/<i>$1<\/i>/
1412 || s/U<([^\>]*)>/<u>$1<\/u>/
1413 # replace G<male|female> tags
1414 || s{G<([^>|]*)\|([^>]*)>}{
1415 $self->gender ? $2 : $1
1416 }ge
1417 # replace H<hint text>
1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1425
1426 # create single paragraphs (very hackish)
1427 s/(?<=\S)\n(?=\w)/ /g;
1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1441}
1442
1443=item $player->ext_reply ($msgid, %msg) 1850=item $player->ext_reply ($msgid, @msg)
1444 1851
1445Sends an ext reply to the player. 1852Sends an ext reply to the player.
1446 1853
1447=cut 1854=cut
1448 1855
1449sub ext_reply($$%) { 1856sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1857 my ($self, $id, @msg) = @_;
1451 1858
1452 $msg{msgid} = $id; 1859 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1860}
1455 1861
1456=item $player->ext_event ($type, %msg) 1862=item $player->ext_msg ($type, @msg)
1457 1863
1458Sends an ext event to the client. 1864Sends an ext event to the client.
1459 1865
1460=cut 1866=cut
1461 1867
1462sub ext_event($$%) { 1868sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1869 my ($self, $type, @msg) = @_;
1464 1870
1465 $self->ns->ext_event ($type, %msg); 1871 $self->ns->ext_msg ($type, @msg);
1466} 1872}
1467 1873
1468=head3 cf::region 1874=head3 cf::region
1469 1875
1470=over 4 1876=over 4
1480=cut 1886=cut
1481 1887
1482sub find_by_path($) { 1888sub find_by_path($) {
1483 my ($path) = @_; 1889 my ($path) = @_;
1484 1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1892
1485 my ($match, $specificity); 1893 my ($match, $specificity);
1486 1894
1487 for my $region (list) { 1895 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1897 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1898 if $region->specificity > $specificity;
1491 } 1899 }
1492 } 1900 }
1493 1901
1514our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1515our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1516 1924
1517sub generate_random_map { 1925sub generate_random_map {
1518 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1519 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1520 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1521 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1522 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1523 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1524 $rmp->{exit_on_final_map},
1525 $rmp->{xsize}, $rmp->{ysize},
1526 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1527 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1528 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1529 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1530 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1531 (cf::region::find $rmp->{region}), $rmp->{custom}
1532 )
1533} 1931}
1534 1932
1535=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1536 1934
1537Register 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
1542 1940
1543sub register { 1941sub register {
1544 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1545 my $pkg = caller; 1943 my $pkg = caller;
1546 1944
1547 no strict;
1548 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1549 1946
1550 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1551} 1948}
1552 1949
1553# also paths starting with '/' 1950# also paths starting with '/'
1554$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1555 1952
1556sub thawer_merge { 1953sub thawer_merge {
1557 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1558 1955
1559 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1564} 1961}
1565 1962
1566sub normalise { 1963sub normalise {
1567 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1568 1965
1569 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1570 1967
1571 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1572 1969
1573 # map plan: 1970 # map plan:
1574 # 1971 #
1589 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1590 $path = "$base/$path"; 1987 $path = "$base/$path";
1591 } 1988 }
1592 1989
1593 for ($path) { 1990 for ($path) {
1594 redo if s{//}{/};
1595 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1596 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1597 } 1993 }
1598 1994
1599 $path 1995 $path
1613 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1614 return $self; 2010 return $self;
1615 } 2011 }
1616 } 2012 }
1617 2013
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1619 () 2015 ()
1620} 2016}
1621 2017
2018# may re-bless or do other evil things
1622sub init { 2019sub init {
1623 my ($self) = @_; 2020 my ($self) = @_;
1624 2021
1625 $self 2022 $self
1626} 2023}
1645 2042
1646# the temporary/swap location 2043# the temporary/swap location
1647sub save_path { 2044sub save_path {
1648 my ($self) = @_; 2045 my ($self) = @_;
1649 2046
1650 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1651 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1652} 2049}
1653 2050
1654# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1655sub uniq_path { 2052sub uniq_path {
1656 my ($self) = @_; 2053 my ($self) = @_;
1657 2054
1658 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1659 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1660}
1661
1662# and all this just because we cannot iterate over
1663# all maps in C++...
1664sub change_all_map_light {
1665 my ($change) = @_;
1666
1667 $_->change_map_light ($change)
1668 for grep $_->outdoor, values %cf::MAP;
1669} 2057}
1670 2058
1671sub decay_objects { 2059sub decay_objects {
1672 my ($self) = @_; 2060 my ($self) = @_;
1673 2061
1686 2074
1687sub load_header_from($) { 2075sub load_header_from($) {
1688 my ($self, $path) = @_; 2076 my ($self, $path) = @_;
1689 2077
1690 utf8::encode $path; 2078 utf8::encode $path;
1691 #aio_open $path, O_RDONLY, 0 2079 my $f = new_from_file cf::object::thawer $path
1692 # or return;
1693
1694 $self->_load_header ($path)
1695 or return; 2080 or return;
1696 2081
2082 $self->_load_header ($f)
2083 or return;
2084
2085 local $MAP_LOADING{$self->{path}} = $self;
2086 $f->resolve_delayed_derefs;
2087
1697 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1698 2089
1699 1 2090 1
1700} 2091}
1701 2092
2093# used to laod the header of an original map
1702sub load_header_orig { 2094sub load_header_orig {
1703 my ($self) = @_; 2095 my ($self) = @_;
1704 2096
1705 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1706} 2098}
1707 2099
2100# used to laod the header of an instantiated map
1708sub load_header_temp { 2101sub load_header_temp {
1709 my ($self) = @_; 2102 my ($self) = @_;
1710 2103
1711 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1712} 2105}
1713 2106
2107# called after loading the header from an instantiated map
1714sub prepare_temp { 2108sub prepare_temp {
1715 my ($self) = @_; 2109 my ($self) = @_;
1716 2110
1717 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1718 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1719 # safety 2113 # safety
1720 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1721 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1722} 2116}
1723 2117
2118# called after loading the header from an original map
1724sub prepare_orig { 2119sub prepare_orig {
1725 my ($self) = @_; 2120 my ($self) = @_;
1726 2121
1727 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1728 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1752 2147
1753sub find; 2148sub find;
1754sub find { 2149sub find {
1755 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1756 2151
2152 cf::cede_to_tick;
2153
1757 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1758 2155
2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1759 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1760 2158
1761 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1762 my $guard = cf::lock_acquire "map_find:$path";
1763 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1764 or return; 2161 or return;
1765 2162
1766 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1767 2164
1769 or return; 2166 or return;
1770 2167
1771 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1772 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1773 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
2172 undef $guard1;
1774 $map->reset; 2173 $map->reset;
1775 undef $guard;
1776 return find $path; 2174 return find $path;
1777 } 2175 }
1778 2176
1779 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1780 } 2178 }
1781} 2179}
1782 2180
1783sub pre_load { } 2181sub pre_load { }
1784sub post_load { } 2182#sub post_load { } # XS
1785 2183
1786sub load { 2184sub load {
1787 my ($self) = @_; 2185 my ($self) = @_;
1788 2186
1789 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1790 2188
1791 my $path = $self->{path}; 2189 my $path = $self->{path};
1792 2190
1793 { 2191 {
1794 my $guard = cf::lock_acquire "map_load:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1795 2193
2194 return unless $self->valid;
1796 return if $self->in_memory != cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1797
1798 $self->in_memory (cf::MAP_LOADING);
1799 2196
1800 $self->alloc; 2197 $self->alloc;
1801 2198
1802 $self->pre_load; 2199 $self->pre_load;
1803 Coro::cede; 2200 cf::cede_to_tick;
1804 2201
1805 $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)
1806 or return; 2206 or return;
1807 2207
1808 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1809 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1810 2210
1811 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1812 utf8::encode $uniq; 2212 utf8::encode $uniq;
1813 if (aio_open $uniq, O_RDONLY, 0) { 2213 unless (aio_stat $uniq) {
2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1814 $self->clear_unique_items; 2215 $self->clear_unique_items;
1815 $self->_load_objects ($uniq, 0); 2216 $self->_load_objects ($f);
2217 $f->resolve_delayed_derefs;
2218 }
2219 }
1816 } 2220 }
1817 }
1818 2221
1819 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;
1820 # now do the right thing for maps 2231 # now do the right thing for maps
1821 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1822 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1823 unless $self->difficulty; 2234 unless $self->difficulty;
1824 Coro::cede; 2235 cf::cede_to_tick;
1825 2236
1826 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1827 $self->decay_objects; 2238 $self->decay_objects;
1828 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1829 $self->update_buttons; 2240 $self->update_buttons;
1830 Coro::cede; 2241 cf::cede_to_tick;
1831 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1832 Coro::cede;
1833 $self->activate;
1834 } 2243 }
1835 2244
1836 $self->in_memory (cf::MAP_IN_MEMORY); 2245 $self->{last_save} = $cf::RUNTIME;
2246 $self->last_access ($cf::RUNTIME);
1837 } 2247 }
1838 2248
1839 $self->post_load; 2249 $self->post_load;
1840}
1841 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
1842sub customise_for { 2257sub customise_for {
1843 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
1844 2259
1845 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
1846 if $self->per_player; 2261 if $self->per_player;
1849# if $self->per_party; 2264# if $self->per_party;
1850 2265
1851 $self 2266 $self
1852} 2267}
1853 2268
1854# find and load all maps in the 3x3 area around a map
1855sub load_diag {
1856 my ($map) = @_;
1857
1858 my @diag; # diagonal neighbours
1859
1860 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_)
1862 or next;
1863 $neigh = find $neigh, $map
1864 or next;
1865 $neigh->load;
1866
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 }
1870
1871 for (@diag) {
1872 my $neigh = find @$_
1873 or next;
1874 $neigh->load;
1875 }
1876}
1877
1878sub find_sync { 2269sub find_sync {
1879 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
1880 2271
1881 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
1882} 2277}
1883 2278
1884sub do_load_sync { 2279sub do_load_sync {
1885 my ($map) = @_; 2280 my ($map) = @_;
1886 2281
1887 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;
1888} 2287}
1889 2288
1890our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
1891our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
1892 2291
1893sub find_async { 2292sub find_async {
1894 my ($path, $origin) = @_; 2293 my ($path, $origin, $load) = @_;
1895 2294
1896 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
1897 2296
1898 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
1899 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
1900 } 2299 }
1901 2300
1902 undef $MAP_PREFETCH{$path}; 2301 $MAP_PREFETCH{$path} |= $load;
2302
1903 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher";
2305
1904 while (%MAP_PREFETCH) { 2306 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 2307 while (my ($k, $v) = each %MAP_PREFETCH) {
1906 my $map = find $path 2308 if (my $map = find $k) {
1907 or next;
1908 $map->load; 2309 $map->load if $v;
2310 }
1909 2311
1910 delete $MAP_PREFETCH{$path}; 2312 delete $MAP_PREFETCH{$k};
1911 } 2313 }
1912 } 2314 }
1913 undef $MAP_PREFETCHER; 2315 undef $MAP_PREFETCHER;
1914 }; 2316 };
1915 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
1916 2318
1917 () 2319 ()
1918} 2320}
1919 2321
2322# common code, used by both ->save and ->swapout
1920sub save { 2323sub _save {
1921 my ($self) = @_; 2324 my ($self) = @_;
1922
1923 my $lock = cf::lock_acquire "map_data:" . $self->path;
1924 2325
1925 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
1926 2327
1927 return unless $self->dirty; 2328 return unless $self->dirty;
1928 2329
1934 return if $self->{deny_save}; 2335 return if $self->{deny_save};
1935 2336
1936 local $self->{last_access} = $self->last_access;#d# 2337 local $self->{last_access} = $self->last_access;#d#
1937 2338
1938 cf::async { 2339 cf::async {
2340 $Coro::current->{desc} = "map player save";
1939 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
1940 }; 2342 };
2343
2344 cf::get_slot 0.02;
1941 2345
1942 if ($uniq) { 2346 if ($uniq) {
1943 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1944 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1945 } else { 2349 } else {
1946 $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);
1947 } 2351 }
1948} 2352}
1949 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
1950sub swap_out { 2362sub swap_out {
1951 my ($self) = @_; 2363 my ($self) = @_;
1952 2364
1953 # save first because save cedes
1954 $self->save;
1955
1956 my $lock = cf::lock_acquire "map_data:" . $self->path; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
1957 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
1958 return if $self->players; 2369 return if $self->players;
1959 return if $self->in_memory != cf::MAP_IN_MEMORY;
1960 return if $self->{deny_save};
1961 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
1962 $self->clear; 2380 $self->clear;
1963 $self->in_memory (cf::MAP_SWAPPED);
1964} 2381}
1965 2382
1966sub reset_at { 2383sub reset_at {
1967 my ($self) = @_; 2384 my ($self) = @_;
1968 2385
1986 2403
1987 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
1988 2405
1989 return if $self->players; 2406 return if $self->players;
1990 2407
1991 warn "resetting map ", $self->path; 2408 cf::trace "resetting map ", $self->path, "\n";
1992 2409
1993 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
1994 2411
1995 # need to save uniques path 2412 # need to save uniques path
1996 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
1997 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
1998 2415
2000 if $uniq; 2417 if $uniq;
2001 } 2418 }
2002 2419
2003 delete $cf::MAP{$self->path}; 2420 delete $cf::MAP{$self->path};
2004 2421
2422 $self->deactivate;
2423 $_->clear_links_to ($self) for values %cf::MAP;
2005 $self->clear; 2424 $self->clear;
2006
2007 $_->clear_links_to ($self) for values %cf::MAP;
2008 2425
2009 $self->unlink_save; 2426 $self->unlink_save;
2010 $self->destroy; 2427 $self->destroy;
2011} 2428}
2012 2429
2013my $nuke_counter = "aaaa"; 2430my $nuke_counter = "aaaa";
2014 2431
2015sub nuke { 2432sub nuke {
2016 my ($self) = @_; 2433 my ($self) = @_;
2017 2434
2435 {
2436 my $lock = cf::lock_acquire "map_data:$self->{path}";
2437
2018 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2019 2439
2020 $self->unlink_save; 2440 $self->unlink_save;
2021 2441
2022 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2023 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2024 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2025 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2026 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2027 2447
2028 $cf::MAP{$self->path} = $self; 2448 $cf::MAP{$self->path} = $self;
2449 }
2029 2450
2030 $self->reset; # polite request, might not happen 2451 $self->reset; # polite request, might not happen
2031} 2452}
2032 2453
2033=item $maps = cf::map::tmp_maps 2454=item $maps = cf::map::tmp_maps
2075 2496
2076sub unique_maps() { 2497sub unique_maps() {
2077 [ 2498 [
2078 map { 2499 map {
2079 utf8::decode $_; 2500 utf8::decode $_;
2080 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2081 ? normalise $_ 2504 : normalise $_
2082 : ()
2083 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2084 ] 2506 ]
2085} 2507}
2086 2508
2087package 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}
2088 2540
2089=back 2541=back
2090 2542
2091=head3 cf::object 2543=head3 cf::object
2092 2544
2096 2548
2097=over 4 2549=over 4
2098 2550
2099=item $ob->inv_recursive 2551=item $ob->inv_recursive
2100 2552
2101Returns 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.
2102 2555
2103=cut 2556=cut
2104 2557
2105sub inv_recursive_; 2558sub inv_recursive_;
2106sub inv_recursive_ { 2559sub inv_recursive_ {
2109 2562
2110sub inv_recursive { 2563sub inv_recursive {
2111 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2112} 2565}
2113 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
2114package cf; 2595package cf;
2115 2596
2116=back 2597=back
2117 2598
2118=head3 cf::object::player 2599=head3 cf::object::player
2124Sends 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>
2125can 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
2126dialogue with the given NPC character. 2607dialogue with the given NPC character.
2127 2608
2128=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};
2129 2624
2130# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2131# with dialog boxes. 2626# with dialog boxes.
2132#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
2133sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2140 2635
2141 } else { 2636 } else {
2142 my $pl = $self->contr; 2637 my $pl = $self->contr;
2143 2638
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2639 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2642
2153 } else { 2643 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2156 } 2646 }
2157 } 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 (@_);
2158} 2658}
2159 2659
2160=item $player_object->may ("access") 2660=item $player_object->may ("access")
2161 2661
2162Returns wether the given player is authorized to access resource "access" 2662Returns wether the given player is authorized to access resource "access"
2175 2675
2176=item $player_object->enter_link 2676=item $player_object->enter_link
2177 2677
2178Freezes 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}>).
2179 2679
2180The 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.
2181I<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.
2182 2684
2183Will never block. 2685Will never block.
2184 2686
2185=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2186 2688
2206sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2207 my ($self) = @_; 2709 my ($self) = @_;
2208 2710
2209 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2210 2712
2713 ++$self->{_link_recursion};
2714
2211 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2212 2716
2213 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2214 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2215 2719
2216 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2217} 2721}
2218 2722
2219sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2220 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2221 2725
2238 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2239 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2240 2744
2241 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2244 2748
2245 $map->load; 2749 $map->load;
2246 $map->load_diag;
2247 2750
2248 return unless $self->contr->active; 2751 return unless $self->contr->active;
2249 $self->activate_recursive;
2250 2752
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2253} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2254 2760
2761}
2762
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2256 2764
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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 >>.
2261 2773
2262=cut 2774=cut
2263 2775
2264our $GOTOGEN; 2776our $GOTOGEN;
2265 2777
2266sub cf::object::player::goto { 2778sub cf::object::player::goto {
2267 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 }
2268 2786
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2789
2272 $self->enter_link; 2790 $self->enter_link;
2273 2791
2274 (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
2275 my $map = eval { 2814 my $map = eval {
2276 my $map = cf::map::find $path; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2277 2816
2278 if ($map) { 2817 if ($map) {
2279 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2280 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2281 } else { 2820 } else {
2282 $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);
2283 } 2822 }
2284 2823
2285 $map 2824 $map
2286 }; 2825 };
2287 2826
2292 2831
2293 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2296 } 2835 }
2836
2837 $done->($self) if $done;
2297 })->prio (1); 2838 })->prio (1);
2298} 2839}
2299 2840
2300=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2301 2842
2321} 2862}
2322 2863
2323sub prepare_random_map { 2864sub prepare_random_map {
2324 my ($exit) = @_; 2865 my ($exit) = @_;
2325 2866
2326 my $guard = cf::lock_acquire "exit_prepare:$exit";
2327
2328 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2329 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2330 # that depends on the exit object 2869 # that depends on the exit object
2331 2870
2332 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2334 if ($exit->map) { 2873 if ($exit->map) {
2335 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2336 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2337 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2338 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2339 } 2880 }
2340 2881
2341 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2342 2883
2343 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2344 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2345 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2346 2887
2347 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2348 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2349 undef $fh; 2890 undef $fh;
2350 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2351 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2352 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2353 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2354 } 2899 }
2355} 2900}
2356 2901
2357sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2358 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2359 2904
2360 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2361 2906
2362 if ($exit->slaying eq "/!") {
2363 #TODO: this should de-fi-ni-te-ly not be a sync-job
2364 # the problem is that $exit might not survive long enough
2365 # so it needs to be done right now, right here
2366 cf::sync_job { prepare_random_map $exit };
2367 }
2368
2369 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2370 my $hp = $exit->stats->hp;
2371 my $sp = $exit->stats->sp;
2372
2373 $self->enter_link; 2907 $self->enter_link;
2374 2908
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2379 (async { 2909 (async {
2380 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
2381 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
2382 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2383 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
2384 1; 2948 1
2385 }) { 2949 }) {
2386 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2387 . "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. "
2388 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2389 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2390 2954
2391 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2392 $self->leave_link; 2956 $self->leave_link;
2393 } 2957 }
2394 })->prio (1); 2958 })->prio (1);
2395} 2959}
2396 2960
2410 2974
2411 utf8::encode $text; 2975 utf8::encode $text;
2412 $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);
2413} 2977}
2414 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
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 3005
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2421 3010
2422=cut 3011=cut
2423 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
2424sub cf::client::send_msg { 3127sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2426 3129
2427 $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 }
2428 3151
2429 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2430 3153
2431 if ($self->can_msg) { 3154 # default colour, mask it out
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2433 } else { 3156 if $color & cf::NDI_DEF;
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443 3157
2444 if ($color >= 0) { 3158 my $pkt = "msg "
2445 if (0 && $msg =~ /\[/) { 3159 . $self->{json_coder}->encode (
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2447 } else { 3161 );
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg")
2450 }
2451 }
2452 }
2453}
2454 3162
3163 $self->send_big_packet ($pkt);
3164}
3165
2455=item $client->ext_event ($type, %msg) 3166=item $client->ext_msg ($type, @msg)
2456 3167
2457Sends an ext event to the client. 3168Sends an ext event to the client.
2458 3169
2459=cut 3170=cut
2460 3171
2461sub cf::client::ext_event($$%) { 3172sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 3173 my ($self, $type, @msg) = @_;
2463 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
2464 $msg{msgtype} = "event_$type"; 3178 push @msg, msgtype => "event_$type";
2465 $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]));
2466} 3195}
2467 3196
2468=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2469 3198
2470Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2525 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2526 3255
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 3257
2529 if (ref $msg) { 3258 if (ref $msg) {
3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3260
3261 my @reply;
3262
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3263 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 3264 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 3265 }
3266
3267 $ns->ext_reply ($reply, @reply)
3268 if $reply;
3269
2536 } else { 3270 } else {
2537 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";
2538 } 3272 }
2539 3273
2540 cf::override; 3274 cf::override;
2541 }, 3275 },
2542); 3276);
2562 3296
2563 $coro 3297 $coro
2564} 3298}
2565 3299
2566cf::client->attach ( 3300cf::client->attach (
2567 on_destroy => sub { 3301 on_client_destroy => sub {
2568 my ($ns) = @_; 3302 my ($ns) = @_;
2569 3303
2570 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2571 }, 3305 },
2572); 3306);
2587our $safe = new Safe "safe"; 3321our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2589 3323
2590$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2591 3325
2592$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));
2593 3331
2594# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2595 3333
2596=pod 3334=pod
2597 3335
2598The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2599 3337
2600 cf::object 3338 cf::object
2601 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
2602 insert remove 3340 insert remove name archname title slaying race decrease split
3341 value
2603 3342
2604 cf::object::player 3343 cf::object::player
2605 player 3344 player
2606 3345
2607 cf::player 3346 cf::player
2612 3351
2613=cut 3352=cut
2614 3353
2615for ( 3354for (
2616 ["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
2617 insert remove)], 3356 insert remove inv nrof name archname title slaying race
3357 decrease split destroy change_exp value msg lore send_msg)],
2618 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2620 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2621) { 3361) {
2622 no strict 'refs';
2623 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2624 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2625 for @funs; 3364 for @funs;
2626} 3365}
2627 3366
2642 3381
2643 my $qcode = $code; 3382 my $qcode = $code;
2644 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2645 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2646 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2647 local $_; 3389 local $_;
2648 local @safe::cf::_safe_eval_args = values %vars;
2649 3390
2650 my $eval = 3391 my $eval =
2651 "do {\n" 3392 "do {\n"
2652 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2653 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2654 . $code 3395 . $code
2655 . "\n}" 3396 . "\n}"
2656 ; 3397 ;
2657 3398
3399 if ($CFG{safe_eval}) {
2658 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2659 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2660 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 }
2661 3408
2662 if ($@) { 3409 if ($@) {
2663 warn "$@"; 3410 warn "$@",
2664 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2665 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2666 } 3413 }
2667 3414
2668 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
2669} 3416}
2670 3417
2684=cut 3431=cut
2685 3432
2686sub register_script_function { 3433sub register_script_function {
2687 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
2688 3435
2689 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
2690 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
2691} 3438}
2692 3439
2693=back 3440=back
2694 3441
2695=cut 3442=cut
2698# the server's init and main functions 3445# the server's init and main functions
2699 3446
2700sub load_facedata($) { 3447sub load_facedata($) {
2701 my ($path) = @_; 3448 my ($path) = @_;
2702 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
2703 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
2704 3457
2705 my $facedata; 3458 my $facedata = decode_storable load_file $path;
2706 0 < aio_load $path, $facedata
2707 or die "$path: $!";
2708
2709 $facedata = Coro::Storable::thaw $facedata;
2710 3459
2711 $facedata->{version} == 2 3460 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 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
2714 { 3472 {
2715 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
2716 3474
2717 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3479 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2722 Coro::cede; 3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3483
3484 cf::cede_to_tick;
2723 } 3485 }
2724 3486
2725 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
2727 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
2728 or next; 3491 or next;
3492
2729 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3494 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 3496 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 3498 }
2734 Coro::cede; 3499
3500 cf::cede_to_tick;
2735 } 3501 }
2736 } 3502 }
2737 3503
2738 { 3504 {
2739 my $anims = $facedata->{animinfo}; 3505 my $anims = $facedata->{animinfo};
2740 3506
2741 while (my ($anim, $info) = each %$anims) { 3507 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3508 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 3509 cf::cede_to_tick;
2744 } 3510 }
2745 3511
2746 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
2747 } 3513 }
2748 3514
3515 {
3516 my $res = $facedata->{resource};
3517
3518 while (my ($name, $info) = each %$res) {
3519 if (defined $info->{type}) {
3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3521
3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3523 cf::face::set_type $idx, $info->{type};
3524 } else {
3525 $RESOURCE{$name} = $info; # unused
3526 }
3527
3528 cf::cede_to_tick;
3529 }
3530 }
3531
3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3533
2749 1 3534 1
2750} 3535}
2751 3536
3537register_exticmd fx_want => sub {
3538 my ($ns, $want) = @_;
3539
3540 while (my ($k, $v) = each %$want) {
3541 $ns->fx_want ($k, $v);
3542 }
3543};
3544
3545sub load_resource_file($) {
3546 my $guard = lock_acquire "load_resource_file";
3547
3548 my $status = load_resource_file_ $_[0];
3549 get_slot 0.1, 100;
3550 cf::arch::commit_load;
3551
3552 $status
3553}
3554
2752sub reload_regions { 3555sub reload_regions {
3556 # HACK to clear player env face cache, we need some signal framework
3557 # for this (global event?)
3558 %ext::player_env::MUSIC_FACE_CACHE = ();
3559
2753 load_resource_file "$MAPDIR/regions" 3560 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 3561 or die "unable to load regions file\n";
3562
3563 for (cf::region::list) {
3564 $_->{match} = qr/$_->{match}/
3565 if exists $_->{match};
3566 }
2755} 3567}
2756 3568
2757sub reload_facedata { 3569sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 3570 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 3571 or die "unable to load facedata\n";
2760} 3572}
2761 3573
2762sub reload_archetypes { 3574sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes" 3575 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n"; 3576 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770} 3577}
2771 3578
2772sub reload_treasures { 3579sub reload_treasures {
2773 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
2774 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
2775} 3582}
2776 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
2777sub reload_resources { 3604sub reload_resources {
2778 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
2779 3606
3607 reload_exp_table;
3608 reload_materials;
3609 reload_facedata;
3610 reload_sound;
3611 reload_archetypes;
2780 reload_regions; 3612 reload_regions;
2781 reload_facedata;
2782 #reload_archetypes;#d#
2783 reload_archetypes;
2784 reload_treasures; 3613 reload_treasures;
2785 3614
2786 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
2787} 3616}
2788 3617
2789sub init { 3618sub reload_config {
2790 reload_resources; 3619 trace "reloading config file...\n";
2791}
2792 3620
2793sub cfg_load { 3621 my $config = load_file "$CONFDIR/config";
2794 open my $fh, "<:utf8", "$CONFDIR/config" 3622 utf8::decode $config;
2795 or return; 3623 *CFG = decode_yaml $config;
2796 3624
2797 local $/;
2798 *CFG = YAML::Syck::Load <$fh>;
2799
2800 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2801 3626
2802 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2803 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2804 3629
2805 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
2809 }; 3634 };
2810 warn $@ if $@; 3635 warn $@ if $@;
2811 } 3636 }
2812} 3637}
2813 3638
3639sub pidfile() {
3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3641 or die "$PIDFILE: $!";
3642 flock $fh, &Fcntl::LOCK_EX
3643 or die "$PIDFILE: flock: $!";
3644 $fh
3645}
3646
3647# make sure only one server instance is running at any one time
3648sub atomic {
3649 my $fh = pidfile;
3650
3651 my $pid = <$fh>;
3652 kill 9, $pid if $pid > 0;
3653
3654 seek $fh, 0, 0;
3655 print $fh $$;
3656}
3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
2814sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3674
3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3676
2815 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
2816 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
2817 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3679 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2818 (async { 3680 (async {
2819 Event::one_event; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3682 EV::loop EV::LOOP_ONESHOT;
2820 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
2821 }; 3684 };
2822 3685
2823 cfg_load; 3686 evthread_start IO::AIO::poll_fileno;
3687
3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3697 reload_resources;
3698 reload_config;
2824 db_init; 3699 db_init;
3700
3701 cf::init_uuid;
3702 cf::init_signals;
3703 cf::init_skills;
3704
3705 cf::init_beforeplay;
3706
3707 atomic;
3708
2825 load_extensions; 3709 load_extensions;
2826 3710
2827 $TICK_WATCHER->start; 3711 utime time, time, $RUNTIMEFILE;
2828 Event::loop; 3712
3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3716
3717 cf::_post_init 0;
3718 };
3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
2829} 3728}
2830 3729
2831############################################################################# 3730#############################################################################
2832# initialisation and cleanup 3731# initialisation and cleanup
2833 3732
2834# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
2835BEGIN { 3734BEGIN {
3735 our %SIGWATCHER = ();
2836 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
2837 Event->signal ( 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2838 reentrant => 0,
2839 data => WF_AUTOCANCEL,
2840 signal => $signal,
2841 prio => 0,
2842 cb => sub {
2843 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
2844 },
2845 ); 3739 };
2846 } 3740 }
2847} 3741}
2848 3742
2849sub write_runtime { 3743sub write_runtime_sync {
2850 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
2851 3745
2852 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
2853 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
2854 3748
2855 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2856 3750
2857 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
2858 3752
2859 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2860 or return; 3754 or return;
2861 3755
2862 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
2863 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
2864 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
2874 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
2875 3769
2876 close $fh 3770 close $fh
2877 or return; 3771 or return;
2878 3772
2879 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2880 and return; 3774 and return;
2881 3775
2882 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2883 3777
2884 1 3778 1
3779}
3780
3781our $uuid_lock;
3782our $uuid_skip;
3783
3784sub write_uuid_sync($) {
3785 $uuid_skip ||= $_[0];
3786
3787 return if $uuid_lock;
3788 local $uuid_lock = 1;
3789
3790 my $uuid = "$LOCALDIR/uuid";
3791
3792 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3793 or return;
3794
3795 my $value = uuid_seq uuid_cur;
3796
3797 unless ($value) {
3798 info "cowardly refusing to write zero uuid value!\n";
3799 return;
3800 }
3801
3802 my $value = uuid_str $value + $uuid_skip;
3803 $uuid_skip = 0;
3804
3805 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3806 and return;
3807
3808 # always fsync - this file is important
3809 aio_fsync $fh
3810 and return;
3811
3812 close $fh
3813 or return;
3814
3815 aio_rename "$uuid~", $uuid
3816 and return;
3817
3818 trace "uuid file written ($value).\n";
3819
3820 1
3821
3822}
3823
3824sub write_uuid($$) {
3825 my ($skip, $sync) = @_;
3826
3827 $sync ? write_uuid_sync $skip
3828 : async { write_uuid_sync $skip };
2885} 3829}
2886 3830
2887sub emergency_save() { 3831sub emergency_save() {
2888 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
2889 3833
2890 warn "enter emergency perl save\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
2891 3840
2892 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
2893 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
2894 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
2895 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
2896 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
2897 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
2898 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
2899 $pl->valid or next; 3850 $pl->valid or next;
3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2900 $pl->save; 3852 $pl->save;
2901 } 3853 }
2902 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
2903 3855
2904 warn "begin emergency map save\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin map save\n";
2905 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
2906 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
2907 $map->valid or next; 3861 $map->valid or next;
2908 $map->save; 3862 $map->save;
2909 } 3863 }
2910 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
2911 3865
2912 warn "begin emergency database checkpoint\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin database checkpoint\n";
2913 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
2914 warn "end emergency database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3871
3872 info "emergency_perl_save: begin write uuid\n";
3873 write_uuid_sync 1;
3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
2915 }; 3894 };
2916 3895
2917 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
2918} 3897}
2919 3898
2920sub post_cleanup { 3899sub post_cleanup {
2921 my ($make_core) = @_; 3900 my ($make_core) = @_;
2922 3901
3902 IO::AIO::flush;
3903
2923 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
2924 if $make_core; 3905 if $make_core;
3906
3907 my $fh = pidfile;
3908 unlink $PIDFILE if <$fh> == $$;
3909}
3910
3911# a safer delete_package, copied from Symbol
3912sub clear_package($) {
3913 my $pkg = shift;
3914
3915 # expand to full symbol table name if needed
3916 unless ($pkg =~ /^main::.*::$/) {
3917 $pkg = "main$pkg" if $pkg =~ /^::/;
3918 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3919 $pkg .= '::' unless $pkg =~ /::$/;
3920 }
3921
3922 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3923 my $stem_symtab = *{$stem}{HASH};
3924
3925 defined $stem_symtab and exists $stem_symtab->{$leaf}
3926 or return;
3927
3928 # clear all symbols
3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3930 for my $name (keys %$leaf_symtab) {
3931 _gv_clear *{"$pkg$name"};
3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3933 }
2925} 3934}
2926 3935
2927sub do_reload_perl() { 3936sub do_reload_perl() {
2928 # can/must only be called in main 3937 # can/must only be called in main
2929 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
2930 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
2931 return; 3940 return;
2932 } 3941 }
2933 3942
2934 warn "reloading..."; 3943 return if $RELOAD++;
2935 3944
2936 warn "entering sync_job"; 3945 my $t1 = AE::time;
2937 3946
3947 while ($RELOAD) {
3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3950
3951 trace "perl_reload: entering sync_job";
3952
2938 cf::sync_job { 3953 cf::sync_job {
2939 cf::write_runtime; # external watchdog should not bark
2940 cf::emergency_save; 3954 #cf::emergency_save;
2941 cf::write_runtime; # external watchdog should not bark
2942 3955
2943 warn "syncing database to disk";
2944 BDB::db_env_txn_checkpoint $DB_ENV;
2945
2946 # if anything goes wrong in here, we should simply crash as we already saved
2947
2948 warn "cancelling all WF_AUTOCANCEL watchers";
2949 for (Event::all_watchers) {
2950 $_->cancel if $_->data & WF_AUTOCANCEL;
2951 }
2952
2953 warn "flushing outstanding aio requests";
2954 for (;;) {
2955 BDB::flush;
2956 IO::AIO::flush;
2957 Coro::cede;
2958 last unless IO::AIO::nreqs || BDB::nreqs;
2959 warn "iterate...";
2960 }
2961
2962 ++$RELOAD;
2963
2964 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
2965 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
2966 %EXT_CORO = (); 3958 %EXT_CORO = ();
2967 3959
2968 warn "removing commands"; 3960 trace "perl_reload: removing commands";
2969 %COMMAND = (); 3961 %COMMAND = ();
2970 3962
2971 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
2972 %EXTCMD = (); 3964 %EXTCMD = ();
2973 %EXTICMD = (); 3965 %EXTICMD = ();
2974 3966
2975 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
2976 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
2977 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
2978 3970
2979 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
2980 eval { 3972 eval {
2981 $cb->($pkg); 3973 $cb->($pkg);
2982 1 3974 1
2983 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3976 }
3977
3978 trace "... clearing $pkg";
3979 clear_package $pkg;
2984 } 3980 }
2985 3981
2986 warn "... nuking $pkg";
2987 Symbol::delete_package $pkg;
2988 }
2989
2990 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2991 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
2992 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2993 3985
2994 warn "... unloading $k"; 3986 trace "... unloading $k";
2995 delete $INC{$k}; 3987 delete $INC{$k};
2996 3988
2997 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
2998 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
2999 3991
3000 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3001 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3002 } 3997 }
3003 3998
3004 Symbol::delete_package $k;
3005 }
3006
3007 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3008 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3009 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3010 4002
3011 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3012 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3013 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3014 4006
3015 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3016 # and global variables created in xs 4008 # and global variables created in xs
3017 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3018 4010
3019 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3020 4012
3021 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3022 require cf; 4014 require cf;
3023 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3024 4016
3025 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3026 cf::cfg_load; 4018 cf::reload_config;
3027 4019
3028 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3029 cf::load_extensions; 4021 cf::load_extensions;
3030 4022
4023 if ($REATTACH_ON_RELOAD) {
3031 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3032 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3033 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3034 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3035 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3036 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3037 4031
3038 warn "leaving sync_job"; 4032 cf::_post_init 1;
3039 4033
4034 trace "perl_reload: leaving sync_job";
4035
3040 1 4036 1
3041 } or do { 4037 } or do {
3042 warn $@; 4038 error $@;
3043 warn "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3044 exit 1; 4040 };
4041
4042 --$RELOAD;
3045 }; 4043 }
3046 4044
3047 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3048}; 4047};
3049 4048
3050our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3051 4050
3052sub reload_perl() { 4051sub reload_perl() {
3053 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3054 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3055 4054
3056 $RELOAD_WATCHER ||= Event->timer ( 4055 $RELOAD_WATCHER ||= cf::async {
3057 reentrant => 0, 4056 Coro::AIO::aio_wait cache_extensions;
3058 after => 0, 4057
3059 data => WF_AUTOCANCEL, 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3060 cb => sub {
3061 do_reload_perl; 4059 do_reload_perl;
3062 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3063 }, 4061 };
3064 ); 4062 };
3065} 4063}
3066 4064
3067register_command "reload" => sub { 4065register_command "reload" => sub {
3068 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3069 4067
3070 if ($who->flag (FLAG_WIZ)) { 4068 if ($who->flag (FLAG_WIZ)) {
3071 $who->message ("reloading server."); 4069 $who->message ("reloading server.");
4070 async {
4071 $Coro::current->{desc} = "perl_reload";
3072 async { reload_perl }; 4072 reload_perl;
4073 };
3073 } 4074 }
3074}; 4075};
3075 4076
3076unshift @INC, $LIBDIR; 4077#############################################################################
3077 4078
3078my $bug_warning = 0; 4079my $bug_warning = 0;
3079 4080
3080our @WAIT_FOR_TICK;
3081our @WAIT_FOR_TICK_BEGIN;
3082
3083sub wait_for_tick { 4081sub wait_for_tick() {
3084 return unless $TICK_WATCHER->is_active; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3085 return if $Coro::current == $Coro::main;
3086 4083
3087 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3088 push @WAIT_FOR_TICK, $signal;
3089 $signal->wait;
3090} 4085}
3091 4086
3092sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3093 return unless $TICK_WATCHER->is_active; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3094 return if $Coro::current == $Coro::main;
3095 4089
3096 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3097 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3098 $signal->wait; 4092 $signal->wait;
3099} 4093}
3100 4094
3101 my $min = 1e6;#d# 4095sub tick {
3102 my $avg = 10;
3103$TICK_WATCHER = Event->timer (
3104 reentrant => 0,
3105 parked => 1,
3106 prio => 0,
3107 at => $NEXT_TICK || $TICK,
3108 data => WF_AUTOCANCEL,
3109 cb => sub {
3110 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3111 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3112 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3113 return; 4099 return;
3114 } 4100 }
3115 4101
3116 $NOW = $tick_start = Event::time; 4102 cf::one_tick; # one server iteration
3117 4103
3118 cf::server_tick; # one server iteration 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3119 4105
3120 0 && sync_job {#d# 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 for(1..10) { 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3122 my $t = Event::time; 4108 Coro::async_pool {
3123 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4109 $Coro::current->{desc} = "runtime saver";
3124 or die; 4110 write_runtime_sync
3125 4111 or error "ERROR: unable to write runtime file: $!";
3126 $map->width (50);
3127 $map->height (50);
3128 $map->alloc;
3129 $map->_load_objects ("/tmp/x.map", 1);
3130 my $t = Event::time - $t;
3131
3132 #next unless $t < 0.0013;#d#
3133 if ($t < $min) {
3134 $min = $t;
3135 }
3136 $avg = $avg * 0.99 + $t * 0.01;
3137 }
3138 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3139 exit 0;
3140 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3141 }; 4112 };
4113 }
3142 4114
3143 $RUNTIME += $TICK;
3144 $NEXT_TICK += $TICK;
3145
3146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3147 $NEXT_RUNTIME_WRITE = $NOW + 10;
3148 Coro::async_pool {
3149 write_runtime
3150 or warn "ERROR: unable to write runtime file: $!";
3151 };
3152 }
3153
3154# my $AFTER = Event::time;
3155# warn $AFTER - $NOW;#d#
3156
3157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3158 $sig->send; 4116 $sig->send;
3159 } 4117 }
3160 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3161 $sig->send;
3162 }
3163 4119
3164 $NOW = Event::time; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3165
3166 # if we are delayed by four ticks or more, skip them all
3167 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3168
3169 $TICK_WATCHER->at ($NEXT_TICK);
3170 $TICK_WATCHER->start;
3171
3172 $LOAD = ($NOW - $tick_start) / $TICK;
3173 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3174 4122
3175 _post_tick; 4123 if (0) {
3176 4124 if ($NEXT_TICK) {
3177 4125 my $jitter = $TICK_START - $NEXT_TICK;
4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4127 debug "jitter $JITTER\n";#d#
4128 }
3178 }, 4129 }
3179); 4130}
3180 4131
3181{ 4132{
3182 BDB::max_poll_time $TICK * 0.1; 4133 # configure BDB
3183 $BDB_POLL_WATCHER = Event->io ( 4134
3184 reentrant => 0,
3185 fd => BDB::poll_fileno,
3186 poll => 'r',
3187 prio => 0,
3188 data => WF_AUTOCANCEL,
3189 cb => \&BDB::poll_cb,
3190 );
3191 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3192 4136 BDB::max_poll_reqs $TICK * 0.1;
3193 BDB::set_sync_prepare { 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3194 my $status;
3195 my $current = $Coro::current;
3196 (
3197 sub {
3198 $status = $!;
3199 $current->ready; undef $current;
3200 },
3201 sub {
3202 Coro::schedule while defined $current;
3203 $! = $status;
3204 },
3205 )
3206 };
3207 4138
3208 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3209 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3210 4146
3211 cf::sync_job { 4147 cf::sync_job {
3212 eval { 4148 eval {
3213 BDB::db_env_open 4149 BDB::db_env_open
3214 $DB_ENV, 4150 $DB_ENV,
3216 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4152 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3217 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4153 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3218 0666; 4154 0666;
3219 4155
3220 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4156 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3221
3222 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3223 $DB_ENV->set_lk_detect;
3224 }; 4157 };
3225 4158
3226 cf::cleanup "db_env_open(db): $@" if $@; 4159 cf::cleanup "db_env_open(db): $@" if $@;
3227 }; 4160 };
3228 } 4161 }
4162
4163 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4164 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4165 };
4166 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4167 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4168 };
4169 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4170 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4171 };
3229} 4172}
3230 4173
3231{ 4174{
4175 # configure IO::AIO
4176
3232 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3233
3234 undef $Coro::AIO::WATCHER;
3235 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3236 $AIO_POLL_WATCHER = Event->io ( 4179 undef $AnyEvent::AIO::WATCHER;
3237 reentrant => 0,
3238 data => WF_AUTOCANCEL,
3239 fd => IO::AIO::poll_fileno,
3240 poll => 'r',
3241 prio => 6,
3242 cb => \&IO::AIO::poll_cb,
3243 );
3244} 4180}
3245 4181
3246my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3247 4184
3248sub _log_backtrace { 4185sub _log_backtrace {
3249 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3250 4187
3251 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3252 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3253 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3254 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3255 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3256 async { 4198 async {
4199 $Coro::current->{desc} = "abt $msg";
4200
3257 my @bt = fork_call { 4201 my @bt = fork_call {
3258 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3259 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4203 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3260 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4204 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3261 or die "addr2line: $!"; 4205 or die "addr2line: $!";
3269 } 4213 }
3270 4214
3271 @funcs 4215 @funcs
3272 }; 4216 };
3273 4217
3274 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3275 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3276 --$_log_backtrace; 4221 --$_log_backtrace;
3277 }; 4222 };
3278 } else { 4223 } else {
3279 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3280 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3281 } 4226 }
3282} 4227}
3283 4228
3284# load additional modules 4229# load additional modules
3285use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3286 4232
3287END { cf::emergency_save } 4233END { cf::emergency_save }
3288 4234
32891 42351
3290 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines