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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $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;
74 120
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $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;
80our $NOW; 138our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off
82 139
83our $BDB_POLL_WATCHER; 140our (%PLAYER, %PLAYER_LOADING); # all users
84our $DB_ENV; 141our (%MAP, %MAP_LOADING ); # all maps
85
86our %CFG;
87
88our $UPTIME; $UPTIME ||= time;
89our $RUNTIME;
90
91our %PLAYER; # all users
92our %MAP; # all maps
93our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
94 143
95# 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 ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 146
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
100our $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;
101 159
102binmode STDOUT; 160binmode STDOUT;
103binmode STDERR; 161binmode STDERR;
104 162
105# read virtual server time, if available 163# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
110} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
111 171
112mkdir $_ 172mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 174
115our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
116 176
117sub cf::map::normalise; 177sub cf::map::normalise;
118 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
119############################################################################# 183#############################################################################
120 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
121=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
122 197
123=over 4 198=over 4
124 199
125=item $cf::UPTIME 200=item $cf::UPTIME
126 201
127The 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.
128 218
129=item $cf::RUNTIME 219=item $cf::RUNTIME
130 220
131The 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
132every server tick. 222every server tick.
138Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
139directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
140unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
141database environment. 231database environment.
142 232
143=item $cf::NOW
144
145The time of the last (current) server tick.
146
147=item $cf::TICK
148
149The interval between server ticks, in seconds.
150
151=item $cf::LOADAVG 233=item $cf::LOADAVG
152 234
153The 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
154(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
155objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
158 240
159The raw value load value from the last tick. 241The raw value load value from the last tick.
160 242
161=item %cf::CFG 243=item %cf::CFG
162 244
163Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 246from wherever your confdir points to.
165 247
166=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
167 249
168These 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
169returns 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
170per 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.
171 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
172=back 283=back
173 284
174=cut 285=cut
175 286
176BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
177 *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 {
178 my $msg = join "", @_; 294 my $msg = join "", @_;
179 295
180 $msg .= "\n" 296 $msg .= "\n"
181 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
182 298
183 $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;
184 300
185 utf8::encode $msg;
186 LOG llevError, $msg; 301 LOG llevWarn, $msg;
187 }; 302};
188} 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};
189 317
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 328for my $pkg (qw(
201 cf::global cf::attachable 329 cf::global cf::attachable
202 cf::object cf::object::player 330 cf::object cf::object::player
203 cf::client cf::player 331 cf::client cf::player
204 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
205 cf::map cf::party cf::region 334 cf::party cf::region
206)) { 335)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 337}
210 338
211$Event::DIED = sub { 339$EV::DIED = sub {
212 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
213}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
214 347
215############################################################################# 348#############################################################################
216 349
217=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
218 351
239 $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;
240 $d 373 $d
241 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
242} 375}
243 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
244=item $ref = cf::from_json $json 391=item $ref = cf::decode_json $json
245 392
246Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
247 394
248=item $json = cf::to_json $ref 395=item $json = cf::encode_json $ref
249 396
250Converts a perl data structure into its JSON representation. 397Converts a perl data structure into its JSON representation.
251 398
252=cut 399=cut
253 400
254our $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
255 402
256sub to_json ($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
257sub 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}
258 467
259=item cf::lock_wait $string 468=item cf::lock_wait $string
260 469
261Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
262 471
263=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
264 473
265Wait 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
266a 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,
267for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
268returned. 477returned.
269 478
479Locks are *not* recursive, locking from the same coro twice results in a
480deadlocked coro.
481
270Lock 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
271uses map_find and cf::map::load uses map_load). 483uses map_find and cf::map::load uses map_load).
272 484
273=item $locked = cf::lock_active $string 485=item $locked = cf::lock_active $string
274 486
275Return 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.
276 488
277=cut 489=cut
278 490
279our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
280 492
281sub lock_wait($) { 493sub lock_wait($) {
282 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 495}
290 496
291sub lock_acquire($) { 497sub lock_acquire($) {
292 my ($key) = @_; 498 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 499}
304 500
305sub lock_active($) { 501sub lock_active($) {
306 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 503}
310 504
311sub freeze_mainloop { 505sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
313 507
314 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
315 $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 }
316 }; 578 }
317 $TICK_WATCHER->stop; 579};
318 $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;
319} 594}
320 595
321=item cf::async { BLOCK } 596=item cf::async { BLOCK }
322 597
323Currently the same as Coro::async_pool, meaning you cannot use 598Currently the same as Coro::async_pool, meaning you cannot use
328 603
329BEGIN { *async = \&Coro::async_pool } 604BEGIN { *async = \&Coro::async_pool }
330 605
331=item cf::sync_job { BLOCK } 606=item cf::sync_job { BLOCK }
332 607
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 608The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 609is always able to handle events or runnable, as Deliantra is only
335partly 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
336acceptable. 611acceptable.
337 612
338If 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
339the given BLOCK in another coroutine while waiting for the result. The 614the given BLOCK in another coroutine while waiting for the result. The
343=cut 618=cut
344 619
345sub sync_job(&) { 620sub sync_job(&) {
346 my ($job) = @_; 621 my ($job) = @_;
347 622
348 if ($Coro::current == $Coro::main) { 623 if (in_main) {
349 my $time = Event::time; 624 my $time = AE::time;
350 625
351 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
353 628
354 # TODO: use suspend/resume instead 629 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 630
356 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
357 632
358 my $busy = 1; 633 my $busy = 1;
359 my @res; 634 my @res;
360 635
361 (async { 636 (async {
637 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 638 @res = eval { $job->() };
363 warn $@ if $@; 639 error $@ if $@;
364 undef $busy; 640 undef $busy;
365 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
366 642
367 while ($busy) { 643 while ($busy) {
368 Coro::cede or Event::one_event; 644 if (Coro::nready) {
645 Coro::cede_notself;
646 } else {
647 EV::loop EV::LOOP_ONESHOT;
369 } 648 }
649 }
370 650
371 $time = Event::time - $time; 651 my $time = AE::time - $time;
372 652
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
377 654
378 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
379 } else { 656 } else {
380 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
381 658
401 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
402 679
403 $coro 680 $coro
404} 681}
405 682
406=item fork_call { }, $args 683=item fork_call { }, @args
407 684
408Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
412 689
413=cut 690=cut
414 691
415sub _store_scalar { 692sub post_fork {
416 open my $fh, ">", \my $buf 693 reset_signals;
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422} 694}
423 695
424sub fork_call(&@) { 696sub fork_call(&@) {
425 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
426 698
427# 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,
428# or die "socketpair: $!"; 700 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 701 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 702
432 if (my $pid = fork) { 703 my @res = Coro::Util::fork_eval {
433 close $fh2; 704 cf::post_fork;
705 &$cb
706 } @args;
434 707
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 708 wantarray ? @res : $res[-1]
436 warn "pst<$res>" unless $res =~ /^pst/; 709}
437 $res = Coro::Storable::thaw $res;
438 710
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 711sub objinfo {
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 } 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
466} 747}
467 748
468=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
469 750
470Returns a single value from the environment database. 751Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 753=item cf::db_put $family => $key => $value
473 754
474Stores 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
475data 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).
476 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
477=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}
478 784
479our $DB; 785our $DB;
480 786
481sub db_init { 787sub db_init {
482 unless ($DB) { 788 $DB ||= db_table "db";
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496} 789}
497 790
498sub db_get($$) { 791sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
500 793
501 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
502 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
503 798
504 $! ? () 799 $! ? ()
505 : $data 800 : $data
506 }
507} 801}
508 802
509sub db_put($$$) { 803sub db_put($$$) {
510 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
539 833
540 my @data; 834 my @data;
541 my $md5; 835 my $md5;
542 836
543 for (0 .. $#$src) { 837 for (0 .. $#$src) {
544 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
545 or Carp::croak "$src->[$_]: $!";
546 } 839 }
547 840
548 # if processing is expensive, check 841 # if processing is expensive, check
549 # checksum first 842 # checksum first
550 if (1) { 843 if (1) {
551 $md5 = 844 $md5 =
552 join "\x00", 845 join "\x00",
553 $processversion, 846 $processversion,
554 map { 847 map {
555 Coro::cede; 848 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 849 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 850 } 0.. $#$src;
558 851
559 852
560 my $dbmd5 = db_get cache => "$id/md5"; 853 my $dbmd5 = db_get cache => "$id/md5";
567 860
568 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data); 862 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
571 864
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
573 866
574 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
577 870
587 880
588=cut 881=cut
589 882
590sub datalog($@) { 883sub datalog($@) {
591 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
592 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
593} 886}
594 887
595=back 888=back
596 889
597=cut 890=cut
598 891
599############################################################################# 892#############################################################################
600 893
601=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
602 895
603Many 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
604attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
606 899
607In 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>
608C<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
609Crossfire TRT). 902Deliantra).
610 903
611=over 4 904=over 4
612 905
613=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
614 907
658=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
659 952
660Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
662 955
663Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
664that 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.
665 958
666These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
667 960
668=over 4 961=over 4
792 1085
793 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
794 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
795 1088
796 } elsif (ref $type) { 1089 } elsif (ref $type) {
797 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
798 1091
799 } else { 1092 } else {
800 shift @arg; 1093 shift @arg;
801 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
802 } 1095 }
803 } 1096 }
804} 1097}
805 1098
806sub _object_attach { 1099sub _object_attach {
816 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
817 } 1110 }
818 1111
819 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
820 } else { 1113 } else {
821 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
822 } 1115 }
823 1116
824 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
825} 1118}
826 1119
866 "; 1159 ";
867 die if $@; 1160 die if $@;
868} 1161}
869 1162
870our $override; 1163our $override;
871our @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?
872 1165
873sub override { 1166sub override {
874 $override = 1; 1167 $override = 1;
875 @invoke_results = (); 1168 @INVOKE_RESULTS = (@_);
876} 1169}
877 1170
878sub do_invoke { 1171sub do_invoke {
879 my $event = shift; 1172 my $event = shift;
880 my $callbacks = shift; 1173 my $callbacks = shift;
881 1174
882 @invoke_results = (); 1175 @INVOKE_RESULTS = ();
883 1176
884 local $override; 1177 local $override;
885 1178
886 for (@$callbacks) { 1179 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
888 1181
889 if ($@) { 1182 if ($@) {
890 warn "$@";
891 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
892 override; 1184 override;
893 } 1185 }
894 1186
895 return 1 if $override; 1187 return 1 if $override;
896 } 1188 }
897 1189
898 0 1190 0
899} 1191}
900 1192
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1194
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1196
905Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
906 1198
907This 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
908removed 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
909results (if you must, access C<@cf::invoke_results> directly). 1201results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1202
911=back 1203=back
912 1204
913=cut 1205=cut
914 1206
915############################################################################# 1207#############################################################################
916# 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}
917 1251
918sub reattach { 1252sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1254 my ($obj) = @_;
921 1255
1256 # no longer needed after getting rid of delete_package?
922 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
923 1258
924 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
925 1260
926 @$registry = (); 1261 @$registry = ();
927 1262
932 for (@$attach) { 1267 for (@$attach) {
933 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
934 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
935 } 1270 }
936 } else { 1271 } else {
937 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
938 } 1273 }
939 } 1274 }
940} 1275}
941 1276
942cf::attachable->attach ( 1277cf::attachable->attach (
943 prio => -1000000, 1278 prio => -1000000,
944 on_instantiate => sub { 1279 on_instantiate => sub {
945 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
946 1281
947 $data = from_json $data; 1282 $data = decode_json $data;
948 1283
949 for (@$data) { 1284 for (@$data) {
950 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
951 1286
952 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1303sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
970 1305
971 sync_job { 1306 sync_job {
972 if (length $$rdata) { 1307 if (length $$rdata) {
1308 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
975 1312
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 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 }
980 close $fh; 1320 aio_close $fh;
981 1321
982 if (@$objs) { 1322 if (@$objs) {
983 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) {
984 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
987 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 }
988 close $fh; 1331 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
990 } 1333 }
991 } else { 1334 } else {
992 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
993 } 1336 }
994 1337
995 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1342 } else {
997 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
998 } 1344 }
999 } else { 1345 } else {
1000 aio_unlink $filename; 1346 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1002 } 1348 }
1003 } 1349 };
1004} 1350}
1005 1351
1006sub object_freezer_as_string { 1352sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1353 my ($rdata, $objs) = @_;
1008 1354
1020 or return; 1366 or return;
1021 1367
1022 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1370 or return;
1371
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1372 my $st = eval { Coro::Storable::thaw $av };
1373 $av = $st->{objs};
1026 } 1374 }
1027 1375
1376 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1380
1030 return ($data, $av); 1381 ($data, $av)
1031} 1382}
1032 1383
1033=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1034 1385
1035=over 4 1386=over 4
1089 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1090 1441
1091 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1092} 1443}
1093 1444
1445use File::Glob ();
1446
1094cf::player->attach ( 1447cf::player->attach (
1095 on_command => sub { 1448 on_unknown_command => sub {
1096 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1097 1450
1098 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1099 or return; 1452 or return;
1100 1453
1108 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1109 1462
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1464
1112 if (ref $msg) { 1465 if (ref $msg) {
1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467
1468 my @reply;
1469
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1470 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1471 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1472 }
1473
1474 $pl->ext_reply ($reply, @reply)
1475 if $reply;
1476
1118 } else { 1477 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1479 }
1121 1480
1122 cf::override; 1481 cf::override;
1123 }, 1482 },
1124); 1483);
1125 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
1126sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1127 cf::sync_job { 1501 cf::sync_job {
1128 my %todo; 1502 my %todo;
1129 1503
1130 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1131 next unless -r $path; 1505 next unless -r $path;
1149 1523
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1526
1153 $ext{source} = 1527 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1155 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1156 . $source 1530 . $source
1157 . "\n};\n1"; 1531 . "\n};\n1";
1158 1532
1159 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1160 } 1534 }
1161 1535
1536 my $pass = 0;
1162 my %done; 1537 my %done;
1163 while (%todo) { 1538 while (%todo) {
1164 my $progress; 1539 my $progress;
1165 1540
1541 ++$pass;
1542
1543 ext:
1166 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip 1546 next ext
1169 unless exists $done{$_}; 1547 unless exists $done{$_};
1170 } 1548 }
1171 1549
1172 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1173 1551
1174 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1175 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1176 : "$v->{base}: extension inactive.\n";
1177 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1178 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1179 warn $msg; 1559
1180 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1181 exit 1; 1561 delete $todo{$k};
1182 } 1562 } else {
1183 1563 $done{$k} = delete $todo{$k};
1184 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1185 } 1569 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
1190 } 1570 }
1191 1571
1192 skip: 1572 unless ($progress) {
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1194 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 }
1195 } 1582 }
1196 }; 1583 };
1197} 1584}
1198 1585
1199############################################################################# 1586#############################################################################
1200 1587
1201=back 1588=back
1202 1589
1203=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1204 1591
1205Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1206 1593
1207=cut 1594=cut
1208 1595
1209package cf::player; 1596package cf::player;
1210 1597
1211use Coro::AIO; 1598use Coro::AIO;
1212 1599
1213=head3 cf::player 1600=head3 cf::player
1214 1601
1215=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}
1216 1617
1217=item cf::player::find $login 1618=item cf::player::find $login
1218 1619
1219Returns the given player object, loading it if necessary (might block). 1620Returns the given player object, loading it if necessary (might block).
1220 1621
1239 1640
1240sub exists($) { 1641sub exists($) {
1241 my ($login) = @_; 1642 my ($login) = @_;
1242 1643
1243 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1245} 1646}
1246 1647
1247sub find($) { 1648sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1650 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1657 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1658 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1659 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1660 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1661
1261 my $pl = load_pl path $login 1662 my $f = new_from_file cf::object::thawer path $login
1262 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;
1263 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1264 } 1671 }
1265 } 1672 }
1266} 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);
1267 1687
1268sub save($) { 1688sub save($) {
1269 my ($pl) = @_; 1689 my ($pl) = @_;
1270 1690
1271 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1276 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1277 1697
1278 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1280 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
1281 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1282 Coro::cede; 1707 cf::cede_to_tick;
1283} 1708}
1284 1709
1285sub new($) { 1710sub new($) {
1286 my ($login) = @_; 1711 my ($login) = @_;
1287 1712
1293 $cf::PLAYER{$login} = $self; 1718 $cf::PLAYER{$login} = $self;
1294 1719
1295 $self 1720 $self
1296} 1721}
1297 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
1298=item $pl->quit_character 1733=item $pl->quit_character
1299 1734
1300Nukes the player without looking back. If logged in, the connection will 1735Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1736be destroyed. May block for a long time.
1302 1737
1306 my ($pl) = @_; 1741 my ($pl) = @_;
1307 1742
1308 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1309 1744
1310 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1311 $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
1312 1747
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1314 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1316 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1317 1756
1318 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1320 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1355 or return []; 1794 or return [];
1356 1795
1357 my @logins; 1796 my @logins;
1358 1797
1359 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") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1807 }
1363 1808
1364 utf8::decode $login; 1809 utf8::decode $login;
1365 push @logins, $login; 1810 push @logins, $login;
1366 } 1811 }
1367 1812
1368 \@logins 1813 \@logins
1369} 1814}
1370 1815
1371=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1372 1819
1373Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1374player. May block. 1821player. May block.
1375 1822
1376=cut 1823=cut
1394 } 1841 }
1395 1842
1396 \@paths 1843 \@paths
1397} 1844}
1398 1845
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1847
1401Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1402 1849
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1850=item $player->ext_reply ($msgid, @msg)
1450 1851
1451Sends an ext reply to the player. 1852Sends an ext reply to the player.
1452 1853
1453=cut 1854=cut
1454 1855
1455sub ext_reply($$%) { 1856sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1857 my ($self, $id, @msg) = @_;
1457 1858
1458 $msg{msgid} = $id; 1859 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1860}
1461 1861
1462=item $player->ext_event ($type, %msg) 1862=item $player->ext_msg ($type, @msg)
1463 1863
1464Sends an ext event to the client. 1864Sends an ext event to the client.
1465 1865
1466=cut 1866=cut
1467 1867
1468sub ext_event($$%) { 1868sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1869 my ($self, $type, @msg) = @_;
1470 1870
1471 $self->ns->ext_event ($type, %msg); 1871 $self->ns->ext_msg ($type, @msg);
1472} 1872}
1473 1873
1474=head3 cf::region 1874=head3 cf::region
1475 1875
1476=over 4 1876=over 4
1485 1885
1486=cut 1886=cut
1487 1887
1488sub find_by_path($) { 1888sub find_by_path($) {
1489 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1490 1892
1491 my ($match, $specificity); 1893 my ($match, $specificity);
1492 1894
1493 for my $region (list) { 1895 for my $region (list) {
1494 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1520our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1522 1924
1523sub generate_random_map { 1925sub generate_random_map {
1524 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1525 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1526 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1530 $rmp->{exit_on_final_map},
1531 $rmp->{xsize}, $rmp->{ysize},
1532 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1533 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1534 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1535 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1536 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1537 (cf::region::find $rmp->{region}), $rmp->{custom}
1538 )
1539} 1931}
1540 1932
1541=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1542 1934
1543Register 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
1548 1940
1549sub register { 1941sub register {
1550 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1551 my $pkg = caller; 1943 my $pkg = caller;
1552 1944
1553 no strict;
1554 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1555 1946
1556 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1557} 1948}
1558 1949
1559# also paths starting with '/' 1950# also paths starting with '/'
1560$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1561 1952
1562sub thawer_merge { 1953sub thawer_merge {
1563 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1564 1955
1565 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1570} 1961}
1571 1962
1572sub normalise { 1963sub normalise {
1573 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1574 1965
1575 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1576 1967
1577 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1578 1969
1579 # map plan: 1970 # map plan:
1580 # 1971 #
1595 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1596 $path = "$base/$path"; 1987 $path = "$base/$path";
1597 } 1988 }
1598 1989
1599 for ($path) { 1990 for ($path) {
1600 redo if s{//}{/};
1601 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1602 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1603 } 1993 }
1604 1994
1605 $path 1995 $path
1619 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1620 return $self; 2010 return $self;
1621 } 2011 }
1622 } 2012 }
1623 2013
1624 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1625 () 2015 ()
1626} 2016}
1627 2017
2018# may re-bless or do other evil things
1628sub init { 2019sub init {
1629 my ($self) = @_; 2020 my ($self) = @_;
1630 2021
1631 $self 2022 $self
1632} 2023}
1651 2042
1652# the temporary/swap location 2043# the temporary/swap location
1653sub save_path { 2044sub save_path {
1654 my ($self) = @_; 2045 my ($self) = @_;
1655 2046
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1658} 2049}
1659 2050
1660# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1661sub uniq_path { 2052sub uniq_path {
1662 my ($self) = @_; 2053 my ($self) = @_;
1663 2054
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 2057}
1676 2058
1677sub decay_objects { 2059sub decay_objects {
1678 my ($self) = @_; 2060 my ($self) = @_;
1679 2061
1692 2074
1693sub load_header_from($) { 2075sub load_header_from($) {
1694 my ($self, $path) = @_; 2076 my ($self, $path) = @_;
1695 2077
1696 utf8::encode $path; 2078 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 2079 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 2080 or return;
1702 2081
2082 $self->_load_header ($f)
2083 or return;
2084
2085 local $MAP_LOADING{$self->{path}} = $self;
2086 $f->resolve_delayed_derefs;
2087
1703 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1704 2089
1705 1 2090 1
1706} 2091}
1707 2092
2093# used to laod the header of an original map
1708sub load_header_orig { 2094sub load_header_orig {
1709 my ($self) = @_; 2095 my ($self) = @_;
1710 2096
1711 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1712} 2098}
1713 2099
2100# used to laod the header of an instantiated map
1714sub load_header_temp { 2101sub load_header_temp {
1715 my ($self) = @_; 2102 my ($self) = @_;
1716 2103
1717 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1718} 2105}
1719 2106
2107# called after loading the header from an instantiated map
1720sub prepare_temp { 2108sub prepare_temp {
1721 my ($self) = @_; 2109 my ($self) = @_;
1722 2110
1723 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1724 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1725 # safety 2113 # safety
1726 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1727 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1728} 2116}
1729 2117
2118# called after loading the header from an original map
1730sub prepare_orig { 2119sub prepare_orig {
1731 my ($self) = @_; 2120 my ($self) = @_;
1732 2121
1733 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1734 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1758 2147
1759sub find; 2148sub find;
1760sub find { 2149sub find {
1761 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1762 2151
2152 cf::cede_to_tick;
2153
1763 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1764 2155
2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1766 2158
1767 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1770 or return; 2161 or return;
1771 2162
1772 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1773 2164
1775 or return; 2166 or return;
1776 2167
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
2172 undef $guard1;
1780 $map->reset; 2173 $map->reset;
1781 undef $guard;
1782 return find $path; 2174 return find $path;
1783 } 2175 }
1784 2176
1785 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1786 } 2178 }
1787} 2179}
1788 2180
1789sub pre_load { } 2181sub pre_load { }
1790sub post_load { } 2182#sub post_load { } # XS
1791 2183
1792sub load { 2184sub load {
1793 my ($self) = @_; 2185 my ($self) = @_;
1794 2186
1795 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1796 2188
1797 my $path = $self->{path}; 2189 my $path = $self->{path};
1798 2190
1799 { 2191 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1801 2193
2194 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1803
1804 $self->in_memory (cf::MAP_LOADING);
1805 2196
1806 $self->alloc; 2197 $self->alloc;
1807 2198
1808 $self->pre_load; 2199 $self->pre_load;
1809 Coro::cede; 2200 cf::cede_to_tick;
1810 2201
1811 $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)
1812 or return; 2206 or return;
1813 2207
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1815 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1816 2210
1817 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2212 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2213 unless (aio_stat $uniq) {
2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2215 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2216 $self->_load_objects ($f);
2217 $f->resolve_delayed_derefs;
2218 }
2219 }
1822 } 2220 }
1823 }
1824 2221
1825 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;
1826 # now do the right thing for maps 2231 # now do the right thing for maps
1827 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2234 unless $self->difficulty;
1830 Coro::cede; 2235 cf::cede_to_tick;
1831 2236
1832 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2238 $self->decay_objects;
1834 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1835 $self->update_buttons; 2240 $self->update_buttons;
1836 Coro::cede; 2241 cf::cede_to_tick;
1837 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1838 Coro::cede;
1839 $self->activate;
1840 } 2243 }
1841 2244
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2245 $self->{last_save} = $cf::RUNTIME;
2246 $self->last_access ($cf::RUNTIME);
1843 } 2247 }
1844 2248
1845 $self->post_load; 2249 $self->post_load;
1846}
1847 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
1848sub customise_for { 2257sub customise_for {
1849 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
1850 2259
1851 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
1852 if $self->per_player; 2261 if $self->per_player;
1855# if $self->per_party; 2264# if $self->per_party;
1856 2265
1857 $self 2266 $self
1858} 2267}
1859 2268
1860# find and load all maps in the 3x3 area around a map
1861sub load_diag {
1862 my ($map) = @_;
1863
1864 my @diag; # diagonal neighbours
1865
1866 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_)
1868 or next;
1869 $neigh = find $neigh, $map
1870 or next;
1871 $neigh->load;
1872
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 }
1876
1877 for (@diag) {
1878 my $neigh = find @$_
1879 or next;
1880 $neigh->load;
1881 }
1882}
1883
1884sub find_sync { 2269sub find_sync {
1885 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
1886 2271
1887 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
1888} 2277}
1889 2278
1890sub do_load_sync { 2279sub do_load_sync {
1891 my ($map) = @_; 2280 my ($map) = @_;
1892 2281
1893 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;
1894} 2287}
1895 2288
1896our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
1898 2291
1899sub find_async { 2292sub find_async {
1900 my ($path, $origin) = @_; 2293 my ($path, $origin, $load) = @_;
1901 2294
1902 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
1903 2296
1904 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
1906 } 2299 }
1907 2300
1908 undef $MAP_PREFETCH{$path}; 2301 $MAP_PREFETCH{$path} |= $load;
2302
1909 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2304 $Coro::current->{desc} = "map prefetcher";
2305
1910 while (%MAP_PREFETCH) { 2306 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2307 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2308 if (my $map = find $k) {
1913 $map->load; 2309 $map->load if $v;
1914 } 2310 }
1915 2311
1916 delete $MAP_PREFETCH{$path}; 2312 delete $MAP_PREFETCH{$k};
1917 } 2313 }
1918 } 2314 }
1919 undef $MAP_PREFETCHER; 2315 undef $MAP_PREFETCHER;
1920 }; 2316 };
1921 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
1922 2318
1923 () 2319 ()
1924} 2320}
1925 2321
2322# common code, used by both ->save and ->swapout
1926sub save { 2323sub _save {
1927 my ($self) = @_; 2324 my ($self) = @_;
1928
1929 my $lock = cf::lock_acquire "map_data:" . $self->path;
1930 2325
1931 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
1932 2327
1933 return unless $self->dirty; 2328 return unless $self->dirty;
1934 2329
1940 return if $self->{deny_save}; 2335 return if $self->{deny_save};
1941 2336
1942 local $self->{last_access} = $self->last_access;#d# 2337 local $self->{last_access} = $self->last_access;#d#
1943 2338
1944 cf::async { 2339 cf::async {
2340 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
1946 }; 2342 };
2343
2344 cf::get_slot 0.02;
1947 2345
1948 if ($uniq) { 2346 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2349 } else {
1952 $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);
1953 } 2351 }
1954} 2352}
1955 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
1956sub swap_out { 2362sub swap_out {
1957 my ($self) = @_; 2363 my ($self) = @_;
1958 2364
1959 # save first because save cedes
1960 $self->save;
1961
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
1964 return if $self->players; 2369 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save};
1967 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
1968 $self->clear; 2380 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2381}
1971 2382
1972sub reset_at { 2383sub reset_at {
1973 my ($self) = @_; 2384 my ($self) = @_;
1974 2385
1992 2403
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2405
1995 return if $self->players; 2406 return if $self->players;
1996 2407
1997 warn "resetting map ", $self->path; 2408 cf::trace "resetting map ", $self->path, "\n";
1998 2409
1999 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2000 2411
2001 # need to save uniques path 2412 # need to save uniques path
2002 unless ($self->{deny_save}) { 2413 unless ($self->{deny_save}) {
2003 my $uniq = $self->uniq_path; utf8::encode $uniq; 2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2004 2415
2006 if $uniq; 2417 if $uniq;
2007 } 2418 }
2008 2419
2009 delete $cf::MAP{$self->path}; 2420 delete $cf::MAP{$self->path};
2010 2421
2422 $self->deactivate;
2423 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2424 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2425
2015 $self->unlink_save; 2426 $self->unlink_save;
2016 $self->destroy; 2427 $self->destroy;
2017} 2428}
2018 2429
2019my $nuke_counter = "aaaa"; 2430my $nuke_counter = "aaaa";
2020 2431
2021sub nuke { 2432sub nuke {
2022 my ($self) = @_; 2433 my ($self) = @_;
2023 2434
2435 {
2436 my $lock = cf::lock_acquire "map_data:$self->{path}";
2437
2024 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2025 2439
2026 $self->unlink_save; 2440 $self->unlink_save;
2027 2441
2028 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2029 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2447
2034 $cf::MAP{$self->path} = $self; 2448 $cf::MAP{$self->path} = $self;
2449 }
2035 2450
2036 $self->reset; # polite request, might not happen 2451 $self->reset; # polite request, might not happen
2037} 2452}
2038 2453
2039=item $maps = cf::map::tmp_maps 2454=item $maps = cf::map::tmp_maps
2081 2496
2082sub unique_maps() { 2497sub unique_maps() {
2083 [ 2498 [
2084 map { 2499 map {
2085 utf8::decode $_; 2500 utf8::decode $_;
2086 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2087 ? normalise $_ 2504 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2506 ]
2091} 2507}
2092 2508
2093package 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}
2094 2540
2095=back 2541=back
2096 2542
2097=head3 cf::object 2543=head3 cf::object
2098 2544
2102 2548
2103=over 4 2549=over 4
2104 2550
2105=item $ob->inv_recursive 2551=item $ob->inv_recursive
2106 2552
2107Returns 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.
2108 2555
2109=cut 2556=cut
2110 2557
2111sub inv_recursive_; 2558sub inv_recursive_;
2112sub inv_recursive_ { 2559sub inv_recursive_ {
2115 2562
2116sub inv_recursive { 2563sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2118} 2565}
2119 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
2120package cf; 2595package cf;
2121 2596
2122=back 2597=back
2123 2598
2124=head3 cf::object::player 2599=head3 cf::object::player
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2607dialogue with the given NPC character.
2133 2608
2134=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};
2135 2624
2136# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2626# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2146 2635
2147 } else { 2636 } else {
2148 my $pl = $self->contr; 2637 my $pl = $self->contr;
2149 2638
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2639 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2642
2159 } else { 2643 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2646 }
2163 } 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 (@_);
2164} 2658}
2165 2659
2166=item $player_object->may ("access") 2660=item $player_object->may ("access")
2167 2661
2168Returns wether the given player is authorized to access resource "access" 2662Returns wether the given player is authorized to access resource "access"
2181 2675
2182=item $player_object->enter_link 2676=item $player_object->enter_link
2183 2677
2184Freezes 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}>).
2185 2679
2186The 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.
2187I<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.
2188 2684
2189Will never block. 2685Will never block.
2190 2686
2191=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2192 2688
2212sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2213 my ($self) = @_; 2709 my ($self) = @_;
2214 2710
2215 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2216 2712
2713 ++$self->{_link_recursion};
2714
2217 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2218 2716
2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2220 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2221 2719
2222 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2223} 2721}
2224 2722
2225sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2226 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2227 2725
2244 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2246 2744
2247 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2250 2748
2251 $map->load; 2749 $map->load;
2252 $map->load_diag;
2253 2750
2254 return unless $self->contr->active; 2751 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2752
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2259} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2260 2760
2761}
2762
2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2262 2764
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2769be called at the end of this process.
2268 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 >>.
2773
2269=cut 2774=cut
2270 2775
2271our $GOTOGEN; 2776our $GOTOGEN;
2272 2777
2273sub cf::object::player::goto { 2778sub cf::object::player::goto {
2274 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2275 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 }
2786
2276 # 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
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2789
2279 $self->enter_link; 2790 $self->enter_link;
2280 2791
2281 (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
2282 my $map = eval { 2814 my $map = eval {
2283 my $map = cf::map::find $path; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2284 2816
2285 if ($map) { 2817 if ($map) {
2286 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2288 } else { 2820 } else {
2289 $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);
2290 } 2822 }
2291 2823
2292 $map 2824 $map
2293 }; 2825 };
2294 2826
2300 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2301 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2302 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2303 } 2835 }
2304 2836
2305 $done->() if $done; 2837 $done->($self) if $done;
2306 })->prio (1); 2838 })->prio (1);
2307} 2839}
2308 2840
2309=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2310 2842
2330} 2862}
2331 2863
2332sub prepare_random_map { 2864sub prepare_random_map {
2333 my ($exit) = @_; 2865 my ($exit) = @_;
2334 2866
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2869 # that depends on the exit object
2340 2870
2341 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2343 if ($exit->map) { 2873 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2348 } 2880 }
2349 2881
2350 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2351 2883
2352 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2355 2887
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2890 undef $fh;
2359 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2360 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2363 } 2899 }
2364} 2900}
2365 2901
2366sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2368 2904
2369 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2370 2906
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2907 $self->enter_link;
2383 2908
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2909 (async {
2389 $self->deactivate_recursive; # just to be sure 2910 $Coro::current->{desc} = "enter_exit";
2911
2390 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
2391 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2392 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
2393 1; 2948 1
2394 }) { 2949 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "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. "
2397 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2954
2400 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2401 $self->leave_link; 2956 $self->leave_link;
2402 } 2957 }
2403 })->prio (1); 2958 })->prio (1);
2404} 2959}
2405 2960
2419 2974
2420 utf8::encode $text; 2975 utf8::encode $text;
2421 $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);
2422} 2977}
2423 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
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 3005
2426Send 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
2427client 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
2428the 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
2429the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2430 3010
2431=cut 3011=cut
2432 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
2433sub cf::client::send_msg { 3127sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2435 3129
2436 $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 }
2437 3151
2438 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2439 3153
2440 if ($self->can_msg) { 3154 # default colour, mask it out
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2442 } else { 3156 if $color & cf::NDI_DEF;
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452 3157
2453 if ($color >= 0) { 3158 my $pkt = "msg "
2454 if (0 && $msg =~ /\[/) { 3159 . $self->{json_coder}->encode (
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2456 } else { 3161 );
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463 3162
3163 $self->send_big_packet ($pkt);
3164}
3165
2464=item $client->ext_event ($type, %msg) 3166=item $client->ext_msg ($type, @msg)
2465 3167
2466Sends an ext event to the client. 3168Sends an ext event to the client.
2467 3169
2468=cut 3170=cut
2469 3171
2470sub cf::client::ext_event($$%) { 3172sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 3173 my ($self, $type, @msg) = @_;
2472 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
3178 push @msg, msgtype => "event_$type";
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
2473 return unless $self->extcmd; 3192 return unless $self->extcmd == 2;
2474 3193
2475 $msg{msgtype} = "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2477} 3195}
2478 3196
2479=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2480 3198
2481Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2537 3255
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 3257
2540 if (ref $msg) { 3258 if (ref $msg) {
3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3260
3261 my @reply;
3262
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3263 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3264 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3265 }
3266
3267 $ns->ext_reply ($reply, @reply)
3268 if $reply;
3269
2547 } else { 3270 } else {
2548 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";
2549 } 3272 }
2550 3273
2551 cf::override; 3274 cf::override;
2552 }, 3275 },
2553); 3276);
2573 3296
2574 $coro 3297 $coro
2575} 3298}
2576 3299
2577cf::client->attach ( 3300cf::client->attach (
2578 on_destroy => sub { 3301 on_client_destroy => sub {
2579 my ($ns) = @_; 3302 my ($ns) = @_;
2580 3303
2581 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2582 }, 3305 },
2583); 3306);
2598our $safe = new Safe "safe"; 3321our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2600 3323
2601$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2602 3325
2603$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));
2604 3331
2605# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2606 3333
2607=pod 3334=pod
2608 3335
2609The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2610 3337
2611 cf::object 3338 cf::object
2612 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
2613 insert remove 3340 insert remove name archname title slaying race decrease split
3341 value
2614 3342
2615 cf::object::player 3343 cf::object::player
2616 player 3344 player
2617 3345
2618 cf::player 3346 cf::player
2623 3351
2624=cut 3352=cut
2625 3353
2626for ( 3354for (
2627 ["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
2628 insert remove)], 3356 insert remove inv nrof name archname title slaying race
3357 decrease split destroy change_exp value msg lore send_msg)],
2629 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2631 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2632) { 3361) {
2633 no strict 'refs';
2634 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2635 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2636 for @funs; 3364 for @funs;
2637} 3365}
2638 3366
2653 3381
2654 my $qcode = $code; 3382 my $qcode = $code;
2655 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2656 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2657 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2658 local $_; 3389 local $_;
2659 local @safe::cf::_safe_eval_args = values %vars;
2660 3390
2661 my $eval = 3391 my $eval =
2662 "do {\n" 3392 "do {\n"
2663 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2664 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2665 . $code 3395 . $code
2666 . "\n}" 3396 . "\n}"
2667 ; 3397 ;
2668 3398
3399 if ($CFG{safe_eval}) {
2669 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2670 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2671 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 }
2672 3408
2673 if ($@) { 3409 if ($@) {
2674 warn "$@"; 3410 warn "$@",
2675 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2676 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2677 } 3413 }
2678 3414
2679 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
2680} 3416}
2681 3417
2695=cut 3431=cut
2696 3432
2697sub register_script_function { 3433sub register_script_function {
2698 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
2699 3435
2700 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
2701 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
2702} 3438}
2703 3439
2704=back 3440=back
2705 3441
2706=cut 3442=cut
2709# the server's init and main functions 3445# the server's init and main functions
2710 3446
2711sub load_facedata($) { 3447sub load_facedata($) {
2712 my ($path) = @_; 3448 my ($path) = @_;
2713 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
2714 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
2715 3457
2716 my $facedata; 3458 my $facedata = decode_storable load_file $path;
2717 0 < aio_load $path, $facedata
2718 or die "$path: $!";
2719
2720 $facedata = Coro::Storable::thaw $facedata;
2721 3459
2722 $facedata->{version} == 2 3460 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 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
2725 { 3472 {
2726 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
2727 3474
2728 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
2730 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2734 3483
2735 cf::cede_to_tick; 3484 cf::cede_to_tick;
2736 } 3485 }
2737 3486
2738 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
2740 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
2741 or next; 3491 or next;
3492
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3496 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
2747 } 3498 }
2748 3499
2749 cf::cede_to_tick; 3500 cf::cede_to_tick;
2750 } 3501 }
2751 } 3502 }
2760 3511
2761 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
2762 } 3513 }
2763 3514
2764 { 3515 {
2765 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3517
2770 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3519 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778 3521
2779 if ($name =~ /\.jpg$/) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3523 cf::face::set_type $idx, $info->{type};
2782 } else { 3524 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3525 $RESOURCE{$name} = $info; # unused
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3526 }
2789 3527
2790 cf::cede_to_tick; 3528 cf::cede_to_tick;
2791 } 3529 }
2792 } 3530 }
2793 3531
3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3533
2794 1 3534 1
2795} 3535}
2796 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
2797sub 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
2798 load_resource_file "$MAPDIR/regions" 3560 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3561 or die "unable to load regions file\n";
2800 3562
2801 for (cf::region::list) { 3563 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3564 $_->{match} = qr/$_->{match}/
2810} 3572}
2811 3573
2812sub reload_archetypes { 3574sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes" 3575 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n"; 3576 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2818 load_resource_file "$DATADIR/archetypes"
2819 or die "unable to load archetypes\n";
2820} 3577}
2821 3578
2822sub reload_treasures { 3579sub reload_treasures {
2823 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
2824 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
2825} 3582}
2826 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
2827sub reload_resources { 3604sub reload_resources {
2828 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
2829 3606
3607 reload_exp_table;
3608 reload_materials;
3609 reload_facedata;
3610 reload_sound;
3611 reload_archetypes;
2830 reload_regions; 3612 reload_regions;
2831 reload_facedata;
2832 #reload_archetypes;#d#
2833 reload_archetypes;
2834 reload_treasures; 3613 reload_treasures;
2835 3614
2836 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
2837} 3616}
2838 3617
2839sub init { 3618sub reload_config {
2840 reload_resources; 3619 trace "reloading config file...\n";
2841}
2842 3620
2843sub cfg_load { 3621 my $config = load_file "$CONFDIR/config";
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3622 utf8::decode $config;
2845 or return; 3623 *CFG = decode_yaml $config;
2846 3624
2847 local $/;
2848 *CFG = YAML::Syck::Load <$fh>;
2849
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2851 3626
2852 $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};
2853 $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};
2854 3629
2855 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
2859 }; 3634 };
2860 warn $@ if $@; 3635 warn $@ if $@;
2861 } 3636 }
2862} 3637}
2863 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
2864sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2012 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
2865 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
2867 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#
2868 (async { 3680 (async {
2869 Event::one_event; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3682 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
2871 }; 3684 };
2872 3685
2873 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;
2874 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
2875 load_extensions; 3709 load_extensions;
2876 3710
2877 $TICK_WATCHER->start; 3711 utime time, time, $RUNTIMEFILE;
2878 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;
2879} 3728}
2880 3729
2881############################################################################# 3730#############################################################################
2882# initialisation and cleanup 3731# initialisation and cleanup
2883 3732
2884# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
2885BEGIN { 3734BEGIN {
3735 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
2894 },
2895 ); 3739 };
2896 } 3740 }
2897} 3741}
2898 3742
2899sub write_runtime { 3743sub write_runtime_sync {
2900 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
2901 3745
2902 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
2904 3748
2905 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2906 3750
2907 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
2908 3752
2909 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2910 or return; 3754 or return;
2911 3755
2912 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
2913 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
2914 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
2924 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
2925 3769
2926 close $fh 3770 close $fh
2927 or return; 3771 or return;
2928 3772
2929 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2930 and return; 3774 and return;
2931 3775
2932 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2933 3777
2934 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 };
2935} 3829}
2936 3830
2937sub emergency_save() { 3831sub emergency_save() {
2938 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
2939 3833
2940 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;
2941 3840
2942 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
2943 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
2944 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
2945 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
2947 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3850 $pl->valid or next;
3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3852 $pl->save;
2951 } 3853 }
2952 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
2953 3855
2954 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";
2955 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
2956 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
2957 $map->valid or next; 3861 $map->valid or next;
2958 $map->save; 3862 $map->save;
2959 } 3863 }
2960 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
2961 3865
2962 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";
2963 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
2964 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
2965 }; 3894 };
2966 3895
2967 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
2968} 3897}
2969 3898
2970sub post_cleanup { 3899sub post_cleanup {
2971 my ($make_core) = @_; 3900 my ($make_core) = @_;
2972 3901
3902 IO::AIO::flush;
3903
2973 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
2974 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 }
2975} 3934}
2976 3935
2977sub do_reload_perl() { 3936sub do_reload_perl() {
2978 # can/must only be called in main 3937 # can/must only be called in main
2979 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
2980 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
2981 return; 3940 return;
2982 } 3941 }
2983 3942
2984 warn "reloading..."; 3943 return if $RELOAD++;
2985 3944
2986 warn "entering sync_job"; 3945 my $t1 = AE::time;
2987 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
2988 cf::sync_job { 3953 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark
2990 cf::emergency_save; 3954 #cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark
2992 3955
2993 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV;
2995
2996 # if anything goes wrong in here, we should simply crash as we already saved
2997
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002
3003 warn "flushing outstanding aio requests";
3004 for (;;) {
3005 BDB::flush;
3006 IO::AIO::flush;
3007 Coro::cede;
3008 last unless IO::AIO::nreqs || BDB::nreqs;
3009 warn "iterate...";
3010 }
3011
3012 ++$RELOAD;
3013
3014 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3015 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3016 %EXT_CORO = (); 3958 %EXT_CORO = ();
3017 3959
3018 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3019 %COMMAND = (); 3961 %COMMAND = ();
3020 3962
3021 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3022 %EXTCMD = (); 3964 %EXTCMD = ();
3023 %EXTICMD = (); 3965 %EXTICMD = ();
3024 3966
3025 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3026 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3027 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3028 3970
3029 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3030 eval { 3972 eval {
3031 $cb->($pkg); 3973 $cb->($pkg);
3032 1 3974 1
3033 } 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;
3034 } 3980 }
3035 3981
3036 warn "... nuking $pkg";
3037 Symbol::delete_package $pkg;
3038 }
3039
3040 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3041 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3043 3985
3044 warn "... unloading $k"; 3986 trace "... unloading $k";
3045 delete $INC{$k}; 3987 delete $INC{$k};
3046 3988
3047 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3048 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3049 3991
3050 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3051 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3052 } 3997 }
3053 3998
3054 Symbol::delete_package $k;
3055 }
3056
3057 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3058 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3059 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);
3060 4002
3061 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3062 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3063 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3064 4006
3065 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3066 # and global variables created in xs 4008 # and global variables created in xs
3067 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3068 4010
3069 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3070 4012
3071 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3072 require cf; 4014 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3074 4016
3075 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3076 cf::cfg_load; 4018 cf::reload_config;
3077 4019
3078 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3079 cf::load_extensions; 4021 cf::load_extensions;
3080 4022
4023 if ($REATTACH_ON_RELOAD) {
3081 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3082 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3083 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3084 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3085 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3086 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3087 4031
3088 warn "leaving sync_job"; 4032 cf::_post_init 1;
3089 4033
4034 trace "perl_reload: leaving sync_job";
4035
3090 1 4036 1
3091 } or do { 4037 } or do {
3092 warn $@; 4038 error $@;
3093 warn "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3094 exit 1; 4040 };
4041
4042 --$RELOAD;
3095 }; 4043 }
3096 4044
3097 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3098}; 4047};
3099 4048
3100our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3101 4050
3102sub reload_perl() { 4051sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3105 4054
3106 $RELOAD_WATCHER ||= Event->timer ( 4055 $RELOAD_WATCHER ||= cf::async {
3107 reentrant => 0, 4056 Coro::AIO::aio_wait cache_extensions;
3108 after => 0, 4057
3109 data => WF_AUTOCANCEL, 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3110 cb => sub {
3111 do_reload_perl; 4059 do_reload_perl;
3112 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3113 }, 4061 };
3114 ); 4062 };
3115} 4063}
3116 4064
3117register_command "reload" => sub { 4065register_command "reload" => sub {
3118 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3119 4067
3120 if ($who->flag (FLAG_WIZ)) { 4068 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 4069 $who->message ("reloading server.");
4070 async {
4071 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 4072 reload_perl;
4073 };
3123 } 4074 }
3124}; 4075};
3125 4076
3126unshift @INC, $LIBDIR; 4077#############################################################################
3127 4078
3128my $bug_warning = 0; 4079my $bug_warning = 0;
3129 4080
3130our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN;
3132
3133sub wait_for_tick { 4081sub wait_for_tick() {
3134 return unless $TICK_WATCHER->is_active; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3135 return if $Coro::current == $Coro::main;
3136 4083
3137 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3138 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait;
3140} 4085}
3141 4086
3142sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3143 return unless $TICK_WATCHER->is_active; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3144 return if $Coro::current == $Coro::main;
3145 4089
3146 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 4092 $signal->wait;
3149} 4093}
3150 4094
3151 my $min = 1e6;#d# 4095sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3161 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"
3162 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3163 return; 4099 return;
3164 } 4100 }
3165 4101
3166 $NOW = $tick_start = Event::time; 4102 cf::one_tick; # one server iteration
3167 4103
3168 cf::server_tick; # one server iteration 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3169 4105
3170 0 && sync_job {#d# 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3171 for(1..10) { 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3172 my $t = Event::time; 4108 Coro::async_pool {
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4109 $Coro::current->{desc} = "runtime saver";
3174 or die; 4110 write_runtime_sync
3175 4111 or error "ERROR: unable to write runtime file: $!";
3176 $map->width (50);
3177 $map->height (50);
3178 $map->alloc;
3179 $map->_load_objects ("/tmp/x.map", 1);
3180 my $t = Event::time - $t;
3181
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 4112 };
4113 }
3192 4114
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 4116 $sig->send;
3209 } 4117 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3211 $sig->send;
3212 }
3213 4119
3214 $NOW = Event::time; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 4122
3225 _post_tick; 4123 if (0) {
3226 4124 if ($NEXT_TICK) {
3227 4125 my $jitter = $TICK_START - $NEXT_TICK;
4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4127 debug "jitter $JITTER\n";#d#
4128 }
3228 }, 4129 }
3229); 4130}
3230 4131
3231{ 4132{
3232 BDB::max_poll_time $TICK * 0.1; 4133 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 4134
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3242 4136 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 4138
3258 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3259 $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);
3260 4146
3261 cf::sync_job { 4147 cf::sync_job {
3262 eval { 4148 eval {
3263 BDB::db_env_open 4149 BDB::db_env_open
3264 $DB_ENV, 4150 $DB_ENV,
3266 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
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4153 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 4154 0666;
3269 4155
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4156 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 4157 };
3275 4158
3276 cf::cleanup "db_env_open(db): $@" if $@; 4159 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 4160 };
3278 } 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 };
3279} 4172}
3280 4173
3281{ 4174{
4175 # configure IO::AIO
4176
3282 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 4179 undef $AnyEvent::AIO::WATCHER;
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 4180}
3295 4181
3296my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3297 4184
3298sub _log_backtrace { 4185sub _log_backtrace {
3299 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3300 4187
3301 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3302 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3303 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3305 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3306 async { 4198 async {
4199 $Coro::current->{desc} = "abt $msg";
4200
3307 my @bt = fork_call { 4201 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4203 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 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 |"
3311 or die "addr2line: $!"; 4205 or die "addr2line: $!";
3319 } 4213 }
3320 4214
3321 @funcs 4215 @funcs
3322 }; 4216 };
3323 4217
3324 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3325 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3326 --$_log_backtrace; 4221 --$_log_backtrace;
3327 }; 4222 };
3328 } else { 4223 } else {
3329 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3330 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3331 } 4226 }
3332} 4227}
3333 4228
3334# load additional modules 4229# load additional modules
3335use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3336 4232
3337END { cf::emergency_save } 4233END { cf::emergency_save }
3338 4234
33391 42351
3340 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines