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.347 by root, Thu Aug 30 05:16:09 2007 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines