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.310 by elmex, Mon Jul 16 15:43:49 2007 UTC vs.
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines