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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines