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.290 by root, Mon Jul 2 03:15:30 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.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
34 64
35# configure various modules to our taste 65# configure various modules to our taste
36# 66#
37$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40 75
41$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
42 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 78
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
52 85
53our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
63our $DATADIR = datadir; 99our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
67our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
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;
73 120
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 123our $NEXT_TICK;
124our $USE_FSYNC = 1; # use fsync to write maps - default on
125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
128our $BDB_TRICKLE_WATCHER;
129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
133our %CFG;
134
135our $UPTIME; $UPTIME ||= time;
136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
79our $NOW; 138our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off
81 139
82our $BDB_POLL_WATCHER; 140our (%PLAYER, %PLAYER_LOADING); # all users
83our $DB_ENV; 141our (%MAP, %MAP_LOADING ); # all maps
84
85our %CFG;
86
87our $UPTIME; $UPTIME ||= time;
88our $RUNTIME;
89
90our %PLAYER; # all users
91our %MAP; # all maps
92our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
93 143
94# used to convert map paths into valid unix filenames by replacing / by ∕ 144# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 146
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 150our $TICK_START; # for load detecting purposes
151
152our @POST_INIT;
153
154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
100 159
101binmode STDOUT; 160binmode STDOUT;
102binmode STDERR; 161binmode STDERR;
103 162
104# read virtual server time, if available 163# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
109} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
110 171
111mkdir $_ 172mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 174
114our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
115 176
116sub cf::map::normalise; 177sub cf::map::normalise;
117 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
118############################################################################# 183#############################################################################
119 184
185%REFLECT = ();
186for (@REFLECT) {
187 my $reflect = JSON::XS::decode_json $_;
188 $REFLECT{$reflect->{class}} = $reflect;
189}
190
191# this is decidedly evil
192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
193
194#############################################################################
195
120=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
121 197
122=over 4 198=over 4
123 199
124=item $cf::UPTIME 200=item $cf::UPTIME
125 201
126The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
127 218
128=item $cf::RUNTIME 219=item $cf::RUNTIME
129 220
130The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
131every server tick. 222every server tick.
137Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
138directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
139unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
140database environment. 231database environment.
141 232
142=item $cf::NOW
143
144The time of the last (current) server tick.
145
146=item $cf::TICK
147
148The interval between server ticks, in seconds.
149
150=item $cf::LOADAVG 233=item $cf::LOADAVG
151 234
152The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
153(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
154objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
157 240
158The raw value load value from the last tick. 241The raw value load value from the last tick.
159 242
160=item %cf::CFG 243=item %cf::CFG
161 244
162Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 246from wherever your confdir points to.
164 247
165=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
166 249
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
271=item @cf::INVOKE_RESULTS
272
273This array contains the results of the last C<invoke ()> call. When
274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
275that call.
276
277=item %cf::REFLECT
278
279Contains, for each (C++) class name, a hash reference with information
280about object members (methods, scalars, arrays and flags) and other
281metadata, which is useful for introspection.
282
171=back 283=back
172 284
173=cut 285=cut
174 286
175BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
176 *CORE::GLOBAL::warn = sub { 288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
293$Coro::State::WARNHOOK = sub {
177 my $msg = join "", @_; 294 my $msg = join "", @_;
178 295
179 $msg .= "\n" 296 $msg .= "\n"
180 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
181 298
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 300
184 utf8::encode $msg;
185 LOG llevError, $msg; 301 LOG llevWarn, $msg;
186 }; 302};
187} 303
304$Coro::State::DIEHOOK = sub {
305 return unless $^S eq 0; # "eq", not "=="
306
307 error Carp::longmess $_[0];
308
309 if (in_main) {#d#
310 error "DIEHOOK called in main context, Coro bug?\n";#d#
311 return;#d#
312 }#d#
313
314 # kill coroutine otherwise
315 Coro::terminate
316};
188 317
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 328for my $pkg (qw(
200 cf::global cf::attachable 329 cf::global cf::attachable
201 cf::object cf::object::player 330 cf::object cf::object::player
202 cf::client cf::player 331 cf::client cf::player
203 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
204 cf::map cf::party cf::region 334 cf::party cf::region
205)) { 335)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 337}
209 338
210$Event::DIED = sub { 339$EV::DIED = sub {
211 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
212}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
213 347
214############################################################################# 348#############################################################################
215 349
216=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
217 351
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 373 $d
240 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
241} 375}
242 376
377=item $scalar = 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
243=item $ref = cf::from_json $json 429=item $ref = cf::decode_json $json
244 430
245Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
246 432
247=item $json = cf::to_json $ref 433=item $json = cf::encode_json $ref
248 434
249Converts a perl data structure into its JSON representation. 435Converts a perl data structure into its JSON representation.
250 436
251=cut 437=cut
252 438
253our $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
254 440
255sub to_json ($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
256sub 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}
257 505
258=item cf::lock_wait $string 506=item cf::lock_wait $string
259 507
260Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
261 509
262=item my $lock = cf::lock_acquire $string 510=item my $lock = cf::lock_acquire $string
263 511
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 514for example when the coroutine gets canceled), the lock is automatically
267returned. 515returned.
268 516
517Locks are *not* recursive, locking from the same coro twice results in a
518deadlocked coro.
519
269Lock names should begin with a unique identifier (for example, cf::map::find 520Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 521uses map_find and cf::map::load uses map_load).
271 522
272=item $locked = cf::lock_active $string 523=item $locked = cf::lock_active $string
273 524
274Return 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.
275 526
276=cut 527=cut
277 528
278our %LOCK; 529our $LOCKS = new Coro::SemaphoreSet;
279 530
280sub lock_wait($) { 531sub lock_wait($) {
281 my ($key) = @_; 532 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 533}
289 534
290sub lock_acquire($) { 535sub lock_acquire($) {
291 my ($key) = @_; 536 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 537}
303 538
304sub lock_active($) { 539sub lock_active($) {
305 my ($key) = @_; 540 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 541}
309 542
310sub freeze_mainloop { 543sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 544 tick_inhibit_inc;
312 545
313 my $guard = Coro::guard { 546 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 547}
548
549=item cf::periodic $interval, $cb
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
562}
563
564=item cf::get_slot $time[, $priority[, $name]]
565
566Allocate $time seconds of blocking CPU time at priority C<$priority>
567(default: 0): This call blocks and returns only when you have at least
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.
573
574The optional C<$name> can be used to identify the job to run. It might be
575used for statistical purposes and should identify the same time-class.
576
577Useful for short background jobs.
578
579=cut
580
581our @SLOT_QUEUE;
582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
584
585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
586$SLOT_QUEUE = Coro::async {
587 $Coro::current->desc ("timeslot manager");
588
589 my $signal = new Coro::Signal;
590 my $busy;
591
592 while () {
593 next_job:
594
595 my $avail = cf::till_tick;
596
597 for (0 .. $#SLOT_QUEUE) {
598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
600 my $job = splice @SLOT_QUEUE, $_, 1, ();
601 $job->[2]->send;
602 Coro::cede;
603 goto next_job;
604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
606 }
607 }
608
609 if (@SLOT_QUEUE) {
610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
611 $WAIT_FOR_TICK->wait;
612 } else {
613 $busy = 0;
614 Coro::schedule;
615 }
315 }; 616 }
316 $TICK_WATCHER->stop; 617};
317 $guard 618
619sub get_slot($;$$) {
620 return if tick_inhibit || $Coro::current == $Coro::main;
621
622 my ($time, $pri, $name) = @_;
623
624 $time = clamp $time, 0.01, $TICK * .6;
625
626 my $sig = new Coro::Signal;
627
628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
630 $SLOT_QUEUE->ready;
631 $sig->wait;
318} 632}
319 633
320=item cf::async { BLOCK } 634=item cf::async { BLOCK }
321 635
322Currently the same as Coro::async_pool, meaning you cannot use 636Currently the same as Coro::async_pool, meaning you cannot use
327 641
328BEGIN { *async = \&Coro::async_pool } 642BEGIN { *async = \&Coro::async_pool }
329 643
330=item cf::sync_job { BLOCK } 644=item cf::sync_job { BLOCK }
331 645
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 646The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 647is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 648partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 649acceptable.
336 650
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 652the given BLOCK in another coroutine while waiting for the result. The
342=cut 656=cut
343 657
344sub sync_job(&) { 658sub sync_job(&) {
345 my ($job) = @_; 659 my ($job) = @_;
346 660
347 if ($Coro::current == $Coro::main) { 661 if (in_main) {
348 my $time = Event::time; 662 my $time = AE::time;
349 663
350 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
352 666
353 # TODO: use suspend/resume instead 667 #LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 668
355 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
356 670
357 my $busy = 1; 671 my $busy = 1;
358 my @res; 672 my @res;
359 673
360 (async { 674 (async {
675 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 676 @res = eval { $job->() };
362 warn $@ if $@; 677 error $@ if $@;
363 undef $busy; 678 undef $busy;
364 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
365 680
366 while ($busy) { 681 while ($busy) {
367 Coro::cede or Event::one_event; 682 if (Coro::nready) {
683 Coro::cede_notself;
684 } else {
685 EV::loop EV::LOOP_ONESHOT;
368 } 686 }
687 }
369 688
370 $time = Event::time - $time; 689 my $time = AE::time - $time;
371 690
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
376 692
377 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
378 } else { 694 } else {
379 # we are in another coroutine, how wonderful, everything just works 695 # we are in another coroutine, how wonderful, everything just works
380 696
400 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
401 717
402 $coro 718 $coro
403} 719}
404 720
405=item fork_call { }, $args 721=item fork_call { }, @args
406 722
407Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 726never block itself or use any form of event handling.
411 727
412=cut 728=cut
729
730sub post_fork {
731 reset_signals;
732}
413 733
414sub fork_call(&@) { 734sub fork_call(&@) {
415 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
416 736
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 737 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 738 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 739 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 740
422 if (my $pid = fork) { 741 my @res = Coro::Util::fork_eval {
423 close $fh2; 742 cf::post_fork;
743 &$cb
744 } @args;
424 745
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 746 wantarray ? @res : $res[-1]
426 $res = Coro::Storable::thaw $res; 747}
427 748
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 749sub objinfo {
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals;
435 local $SIG{__WARN__};
436 local $SIG{__DIE__};
437 eval {
438 close $fh1;
439
440 my @res = eval { $cb->(@args) };
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 } 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
447} 785}
448 786
449=item $value = cf::db_get $family => $key 787=item $value = cf::db_get $family => $key
450 788
451Returns a single value from the environment database. 789Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 791=item cf::db_put $family => $key => $value
454 792
455Stores 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
456data 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).
457 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
458=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}
459 822
460our $DB; 823our $DB;
461 824
462sub db_init { 825sub db_init {
463 unless ($DB) { 826 $DB ||= db_table "db";
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job {
467 eval {
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 }
477} 827}
478 828
479sub db_get($$) { 829sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
481 831
482 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
483 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
484 836
485 $! ? () 837 $! ? ()
486 : $data 838 : $data
487 }
488} 839}
489 840
490sub db_put($$$) { 841sub db_put($$$) {
491 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
492 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
520 871
521 my @data; 872 my @data;
522 my $md5; 873 my $md5;
523 874
524 for (0 .. $#$src) { 875 for (0 .. $#$src) {
525 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
526 or Carp::croak "$src->[$_]: $!";
527 } 877 }
528 878
529 # if processing is expensive, check 879 # if processing is expensive, check
530 # checksum first 880 # checksum first
531 if (1) { 881 if (1) {
532 $md5 = 882 $md5 =
533 join "\x00", 883 join "\x00",
534 $processversion, 884 $processversion,
535 map { 885 map {
536 Coro::cede; 886 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 887 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 888 } 0.. $#$src;
539 889
540 890
541 my $dbmd5 = db_get cache => "$id/md5"; 891 my $dbmd5 = db_get cache => "$id/md5";
548 898
549 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
550 my $data = $process->(\@data); 900 my $data = $process->(\@data);
551 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
552 902
553 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
554 904
555 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
556 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
557 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
558 908
568 918
569=cut 919=cut
570 920
571sub datalog($@) { 921sub datalog($@) {
572 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
573 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
574} 924}
575 925
576=back 926=back
577 927
578=cut 928=cut
579 929
580############################################################################# 930#############################################################################
581 931
582=head2 ATTACHABLE OBJECTS 932=head2 ATTACHABLE OBJECTS
583 933
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 935attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 936to it. All such attachable objects support the following methods.
587 937
588In 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>
589C<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
590Crossfire TRT). 940Deliantra).
591 941
592=over 4 942=over 4
593 943
594=item $attachable->attach ($attachment, key => $value...) 944=item $attachable->attach ($attachment, key => $value...)
595 945
639=item cf::CLASS::attachment $name, ... 989=item cf::CLASS::attachment $name, ...
640 990
641Register an attachment by C<$name> through which attachable objects of the 991Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 992given CLASS can refer to this attachment.
643 993
644Some classes such as crossfire maps and objects can specify attachments 994Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 996
647These calls expect any number of the following handler/hook descriptions: 997These calls expect any number of the following handler/hook descriptions:
648 998
649=over 4 999=over 4
773 1123
774 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
775 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
776 1126
777 } elsif (ref $type) { 1127 } elsif (ref $type) {
778 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
779 1129
780 } else { 1130 } else {
781 shift @arg; 1131 shift @arg;
782 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
783 } 1133 }
784 } 1134 }
785} 1135}
786 1136
787sub _object_attach { 1137sub _object_attach {
797 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
798 } 1148 }
799 1149
800 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
801 } else { 1151 } else {
802 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
803 } 1153 }
804 1154
805 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
806} 1156}
807 1157
847 "; 1197 ";
848 die if $@; 1198 die if $@;
849} 1199}
850 1200
851our $override; 1201our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1202our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 1203
854sub override { 1204sub override {
855 $override = 1; 1205 $override = 1;
856 @invoke_results = (); 1206 @INVOKE_RESULTS = (@_);
857} 1207}
858 1208
859sub do_invoke { 1209sub do_invoke {
860 my $event = shift; 1210 my $event = shift;
861 my $callbacks = shift; 1211 my $callbacks = shift;
862 1212
863 @invoke_results = (); 1213 @INVOKE_RESULTS = ();
864 1214
865 local $override; 1215 local $override;
866 1216
867 for (@$callbacks) { 1217 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
869 1219
870 if ($@) { 1220 if ($@) {
871 warn "$@";
872 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
873 override; 1222 override;
874 } 1223 }
875 1224
876 return 1 if $override; 1225 return 1 if $override;
877 } 1226 }
878 1227
879 0 1228 0
880} 1229}
881 1230
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1231=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1232
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1233=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1234
886Generate an object-specific event with the given arguments. 1235Generate an object-specific event with the given arguments.
887 1236
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1237This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1238removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1239results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1240
892=back 1241=back
893 1242
894=cut 1243=cut
895 1244
896############################################################################# 1245#############################################################################
897# object support 1246# object support
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#
1281sub _can_merge {
1282 my ($ob1, $ob2) = @_;
1283
1284 ++$SLOW_MERGES;#d#
1285
1286 # we do the slow way here
1287 return _object_equal $ob1, $ob2
1288}
898 1289
899sub reattach { 1290sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1291 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1292 my ($obj) = @_;
902 1293
1294 # no longer needed after getting rid of delete_package?
903 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
904 1296
905 my $registry = $obj->registry; 1297 my $registry = $obj->registry;
906 1298
907 @$registry = (); 1299 @$registry = ();
908 1300
913 for (@$attach) { 1305 for (@$attach) {
914 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
915 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
916 } 1308 }
917 } else { 1309 } else {
918 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
919 } 1311 }
920 } 1312 }
921} 1313}
922 1314
923cf::attachable->attach ( 1315cf::attachable->attach (
924 prio => -1000000, 1316 prio => -1000000,
925 on_instantiate => sub { 1317 on_instantiate => sub {
926 my ($obj, $data) = @_; 1318 my ($obj, $data) = @_;
927 1319
928 $data = from_json $data; 1320 $data = decode_json $data;
929 1321
930 for (@$data) { 1322 for (@$data) {
931 my ($name, $args) = @$_; 1323 my ($name, $args) = @$_;
932 1324
933 $obj->attach ($name, %{$args || {} }); 1325 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1341sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
951 1343
952 sync_job { 1344 sync_job {
953 if (length $$rdata) { 1345 if (length $$rdata) {
1346 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
956 1350
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1352 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 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 }
961 close $fh; 1358 aio_close $fh;
962 1359
963 if (@$objs) { 1360 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1362 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1363 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1364 aio_write $fh, 0, (length $data), $data, 0;
968 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 }
969 close $fh; 1369 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1370 aio_rename "$filename.pst~", "$filename.pst";
971 } 1371 }
972 } else { 1372 } else {
973 aio_unlink "$filename.pst"; 1373 aio_unlink "$filename.pst";
974 } 1374 }
975 1375
976 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1377
1378 $filename =~ s%/[^/]+$%%;
1379 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1380 } else {
978 warn "FATAL: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
979 } 1382 }
980 } else { 1383 } else {
981 aio_unlink $filename; 1384 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
983 } 1386 }
984 } 1387 };
985} 1388}
986 1389
987sub object_freezer_as_string { 1390sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1391 my ($rdata, $objs) = @_;
989 1392
1001 or return; 1404 or return;
1002 1405
1003 unless (aio_stat "$filename.pst") { 1406 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1407 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1408 or return;
1409
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1410 my $st = eval { Coro::Storable::thaw $av };
1411 $av = $st->{objs};
1007 } 1412 }
1008 1413
1414 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1418
1011 return ($data, $av); 1419 ($data, $av)
1012} 1420}
1013 1421
1014=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1015 1423
1016=over 4 1424=over 4
1070 my ($name, $cb) = @_; 1478 my ($name, $cb) = @_;
1071 1479
1072 $EXTICMD{$name} = $cb; 1480 $EXTICMD{$name} = $cb;
1073} 1481}
1074 1482
1483use File::Glob ();
1484
1075cf::player->attach ( 1485cf::player->attach (
1076 on_command => sub { 1486 on_unknown_command => sub {
1077 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1078 1488
1079 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1080 or return; 1490 or return;
1081 1491
1089 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1090 1500
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1502
1093 if (ref $msg) { 1503 if (ref $msg) {
1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1505
1506 my @reply;
1507
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1508 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1509 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1510 }
1511
1512 $pl->ext_reply ($reply, @reply)
1513 if $reply;
1514
1099 } else { 1515 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1517 }
1102 1518
1103 cf::override; 1519 cf::override;
1104 }, 1520 },
1105); 1521);
1106 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
1107sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1108 cf::sync_job { 1539 cf::sync_job {
1109 my %todo; 1540 my %todo;
1110 1541
1111 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1112 next unless -r $path; 1543 next unless -r $path;
1130 1561
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1564
1134 $ext{source} = 1565 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1136 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1137 . $source 1568 . $source
1138 . "\n};\n1"; 1569 . "\n};\n1";
1139 1570
1140 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1141 } 1572 }
1142 1573
1574 my $pass = 0;
1143 my %done; 1575 my %done;
1144 while (%todo) { 1576 while (%todo) {
1145 my $progress; 1577 my $progress;
1146 1578
1579 ++$pass;
1580
1581 ext:
1147 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip 1584 next ext
1150 unless exists $done{$_}; 1585 unless exists $done{$_};
1151 } 1586 }
1152 1587
1153 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1154 1589
1155 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1156 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1157 : "$v->{base}: extension inactive.\n";
1158 1594
1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1159 if (exists $v->{meta}{mandatory}) { 1596 if exists $v->{meta}{mandatory};
1160 warn $msg; 1597
1161 warn "mandatory extension failed to load, exiting.\n"; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1162 exit 1; 1599 delete $todo{$k};
1163 } 1600 } else {
1164 1601 $done{$k} = delete $todo{$k};
1165 warn $msg; 1602 push @EXTS, $v->{pkg};
1603 $progress = 1;
1604
1605 info "$v->{base}: extension inactive.\n"
1606 unless $active;
1166 } 1607 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
1171 } 1608 }
1172 1609
1173 skip: 1610 unless ($progress) {
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1175 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 }
1176 } 1620 }
1177 }; 1621 };
1178} 1622}
1179 1623
1180############################################################################# 1624#############################################################################
1181 1625
1182=back 1626=back
1183 1627
1184=head2 CORE EXTENSIONS 1628=head2 CORE EXTENSIONS
1185 1629
1186Functions and methods that extend core crossfire objects. 1630Functions and methods that extend core deliantra objects.
1187 1631
1188=cut 1632=cut
1189 1633
1190package cf::player; 1634package cf::player;
1191 1635
1192use Coro::AIO; 1636use Coro::AIO;
1193 1637
1194=head3 cf::player 1638=head3 cf::player
1195 1639
1196=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}
1197 1655
1198=item cf::player::find $login 1656=item cf::player::find $login
1199 1657
1200Returns the given player object, loading it if necessary (might block). 1658Returns the given player object, loading it if necessary (might block).
1201 1659
1220 1678
1221sub exists($) { 1679sub exists($) {
1222 my ($login) = @_; 1680 my ($login) = @_;
1223 1681
1224 $cf::PLAYER{$login} 1682 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1683 or !aio_stat path $login
1226} 1684}
1227 1685
1228sub find($) { 1686sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1687 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1688 my $login = $_[0];
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1695 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1696 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1697 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1698 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1699
1242 my $pl = load_pl path $login 1700 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1245 } 1709 }
1246 } 1710 }
1247} 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);
1248 1725
1249sub save($) { 1726sub save($) {
1250 my ($pl) = @_; 1727 my ($pl) = @_;
1251 1728
1252 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1257 return if $pl->{deny_save}; 1734 return if $pl->{deny_save};
1258 1735
1259 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1261 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];
1743
1262 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1263 Coro::cede; 1745 cf::cede_to_tick;
1264} 1746}
1265 1747
1266sub new($) { 1748sub new($) {
1267 my ($login) = @_; 1749 my ($login) = @_;
1268 1750
1274 $cf::PLAYER{$login} = $self; 1756 $cf::PLAYER{$login} = $self;
1275 1757
1276 $self 1758 $self
1277} 1759}
1278 1760
1761=item $player->send_msg ($channel, $msg, $color, [extra...])
1762
1763=cut
1764
1765sub send_msg {
1766 my $ns = shift->ns
1767 or return;
1768 $ns->send_msg (@_);
1769}
1770
1279=item $pl->quit_character 1771=item $pl->quit_character
1280 1772
1281Nukes the player without looking back. If logged in, the connection will 1773Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1774be destroyed. May block for a long time.
1283 1775
1287 my ($pl) = @_; 1779 my ($pl) = @_;
1288 1780
1289 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1290 1782
1291 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1292 $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
1293 1785
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1295 $pl->deactivate; 1787 $pl->deactivate;
1788
1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1297 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1298 1794
1299 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1301 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1336 or return []; 1832 or return [];
1337 1833
1338 my @logins; 1834 my @logins;
1339 1835
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1842 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1843 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1844 $buf !~ /^password -------------$/m or next; # official not-valid tag
1845 }
1344 1846
1345 utf8::decode $login; 1847 utf8::decode $login;
1346 push @logins, $login; 1848 push @logins, $login;
1347 } 1849 }
1348 1850
1349 \@logins 1851 \@logins
1350} 1852}
1351 1853
1352=item $player->maps 1854=item $player->maps
1855
1856=item cf::player::maps $login
1353 1857
1354Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1355player. May block. 1859player. May block.
1356 1860
1357=cut 1861=cut
1375 } 1879 }
1376 1880
1377 \@paths 1881 \@paths
1378} 1882}
1379 1883
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1884=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1885
1382Expand crossfire pod fragments into protocol xml. 1886Expand deliantra pod fragments into protocol xml.
1383 1887
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1888=item $player->ext_reply ($msgid, @msg)
1414 1889
1415Sends an ext reply to the player. 1890Sends an ext reply to the player.
1416 1891
1417=cut 1892=cut
1418 1893
1419sub ext_reply($$%) { 1894sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1895 my ($self, $id, @msg) = @_;
1421 1896
1422 $msg{msgid} = $id; 1897 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1898}
1425 1899
1426=item $player->ext_event ($type, %msg) 1900=item $player->ext_msg ($type, @msg)
1427 1901
1428Sends an ext event to the client. 1902Sends an ext event to the client.
1429 1903
1430=cut 1904=cut
1431 1905
1432sub ext_event($$%) { 1906sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1907 my ($self, $type, @msg) = @_;
1434 1908
1435 $self->ns->ext_event ($type, %msg); 1909 $self->ns->ext_msg ($type, @msg);
1436} 1910}
1437 1911
1438=head3 cf::region 1912=head3 cf::region
1439 1913
1440=over 4 1914=over 4
1450=cut 1924=cut
1451 1925
1452sub find_by_path($) { 1926sub find_by_path($) {
1453 my ($path) = @_; 1927 my ($path) = @_;
1454 1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1930
1455 my ($match, $specificity); 1931 my ($match, $specificity);
1456 1932
1457 for my $region (list) { 1933 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1935 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1936 if $region->specificity > $specificity;
1461 } 1937 }
1462 } 1938 }
1463 1939
1484our $MAX_RESET = 3600; 1960our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1961our $DEFAULT_RESET = 3000;
1486 1962
1487sub generate_random_map { 1963sub generate_random_map {
1488 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1489 # mit "rum" bekleckern, nicht 1965
1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1967
1490 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1494 $rmp->{exit_on_final_map},
1495 $rmp->{xsize}, $rmp->{ysize},
1496 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1497 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1498 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1499 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1500 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1501 (cf::region::find $rmp->{region}), $rmp->{custom}
1502 )
1503} 1969}
1504 1970
1505=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1506 1972
1507Register 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
1512 1978
1513sub register { 1979sub register {
1514 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1515 my $pkg = caller; 1981 my $pkg = caller;
1516 1982
1517 no strict;
1518 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1519 1984
1520 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1521} 1986}
1522 1987
1523# also paths starting with '/' 1988# also paths starting with '/'
1524$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1525 1990
1526sub thawer_merge { 1991sub thawer_merge {
1527 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1528 1993
1529 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1534} 1999}
1535 2000
1536sub normalise { 2001sub normalise {
1537 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1538 2003
1539 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1540 2005
1541 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1542 2007
1543 # map plan: 2008 # map plan:
1544 # 2009 #
1559 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1560 $path = "$base/$path"; 2025 $path = "$base/$path";
1561 } 2026 }
1562 2027
1563 for ($path) { 2028 for ($path) {
1564 redo if s{//}{/};
1565 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1566 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1567 } 2031 }
1568 2032
1569 $path 2033 $path
1583 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1584 return $self; 2048 return $self;
1585 } 2049 }
1586 } 2050 }
1587 2051
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1589 () 2053 ()
1590} 2054}
1591 2055
2056# may re-bless or do other evil things
1592sub init { 2057sub init {
1593 my ($self) = @_; 2058 my ($self) = @_;
1594 2059
1595 $self 2060 $self
1596} 2061}
1615 2080
1616# the temporary/swap location 2081# the temporary/swap location
1617sub save_path { 2082sub save_path {
1618 my ($self) = @_; 2083 my ($self) = @_;
1619 2084
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2085 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 2086 "$TMPDIR/$path.map"
1622} 2087}
1623 2088
1624# the unique path, undef == no special unique path 2089# the unique path, undef == no special unique path
1625sub uniq_path { 2090sub uniq_path {
1626 my ($self) = @_; 2091 my ($self) = @_;
1627 2092
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2093 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 2094 "$UNIQUEDIR/$path"
1630}
1631
1632# and all this just because we cannot iterate over
1633# all maps in C++...
1634sub change_all_map_light {
1635 my ($change) = @_;
1636
1637 $_->change_map_light ($change)
1638 for grep $_->outdoor, values %cf::MAP;
1639} 2095}
1640 2096
1641sub decay_objects { 2097sub decay_objects {
1642 my ($self) = @_; 2098 my ($self) = @_;
1643 2099
1656 2112
1657sub load_header_from($) { 2113sub load_header_from($) {
1658 my ($self, $path) = @_; 2114 my ($self, $path) = @_;
1659 2115
1660 utf8::encode $path; 2116 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 2117 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 or return; 2118 or return;
1666 2119
2120 $self->_load_header ($f)
2121 or return;
2122
2123 local $MAP_LOADING{$self->{path}} = $self;
2124 $f->resolve_delayed_derefs;
2125
1667 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1668 2127
1669 1 2128 1
1670} 2129}
1671 2130
2131# used to laod the header of an original map
1672sub load_header_orig { 2132sub load_header_orig {
1673 my ($self) = @_; 2133 my ($self) = @_;
1674 2134
1675 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1676} 2136}
1677 2137
2138# used to laod the header of an instantiated map
1678sub load_header_temp { 2139sub load_header_temp {
1679 my ($self) = @_; 2140 my ($self) = @_;
1680 2141
1681 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1682} 2143}
1683 2144
2145# called after loading the header from an instantiated map
1684sub prepare_temp { 2146sub prepare_temp {
1685 my ($self) = @_; 2147 my ($self) = @_;
1686 2148
1687 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1688 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1689 # safety 2151 # safety
1690 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1691 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1692} 2154}
1693 2155
2156# called after loading the header from an original map
1694sub prepare_orig { 2157sub prepare_orig {
1695 my ($self) = @_; 2158 my ($self) = @_;
1696 2159
1697 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1698 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
1722 2185
1723sub find; 2186sub find;
1724sub find { 2187sub find {
1725 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
1726 2189
2190 cf::cede_to_tick;
2191
1727 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
1728 2193
2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
1730 2196
1731 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
1732 my $guard = cf::lock_acquire "map_find:$path";
1733 my $map = new_from_path cf::map $path 2198 my $map = new_from_path cf::map $path
1734 or return; 2199 or return;
1735 2200
1736 $map->{last_save} = $cf::RUNTIME; 2201 $map->{last_save} = $cf::RUNTIME;
1737 2202
1739 or return; 2204 or return;
1740 2205
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2206 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 2207 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 2208 #$cf::WAIT_FOR_TICK->wait;
2209 undef $guard2;
2210 undef $guard1;
1744 $map->reset; 2211 $map->reset;
1745 undef $guard;
1746 return find $path; 2212 return find $path;
1747 } 2213 }
1748 2214
1749 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
1750 } 2216 }
1751} 2217}
1752 2218
1753sub pre_load { } 2219sub pre_load { }
1754sub post_load { } 2220#sub post_load { } # XS
1755 2221
1756sub load { 2222sub load {
1757 my ($self) = @_; 2223 my ($self) = @_;
1758 2224
1759 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
1760 2226
1761 my $path = $self->{path}; 2227 my $path = $self->{path};
1762 2228
1763 { 2229 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
1765 2231
2232 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
1767
1768 $self->in_memory (cf::MAP_LOADING);
1769 2234
1770 $self->alloc; 2235 $self->alloc;
1771 2236
1772 $self->pre_load; 2237 $self->pre_load;
1773 Coro::cede; 2238 cf::cede_to_tick;
1774 2239
1775 $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)
1776 or return; 2244 or return;
1777 2245
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2246 $self->post_load_original
1779 if delete $self->{load_original}; 2247 if delete $self->{load_original};
1780 2248
1781 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2250 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2251 unless (aio_stat $uniq) {
2252 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2253 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2254 $self->_load_objects ($f);
2255 $f->resolve_delayed_derefs;
2256 }
2257 }
1786 } 2258 }
1787 }
1788 2259
1789 Coro::cede; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2267
2268 cf::cede_to_tick;
1790 # now do the right thing for maps 2269 # now do the right thing for maps
1791 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2272 unless $self->difficulty;
1794 Coro::cede; 2273 cf::cede_to_tick;
1795 2274
1796 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2276 $self->decay_objects;
1798 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
1799 $self->update_buttons; 2278 $self->update_buttons;
1800 Coro::cede; 2279 cf::cede_to_tick;
1801 $self->set_darkness_map; 2280 #$self->activate; # no longer activate maps automatically
1802 Coro::cede;
1803 $self->activate;
1804 } 2281 }
1805 2282
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2283 $self->{last_save} = $cf::RUNTIME;
2284 $self->last_access ($cf::RUNTIME);
1807 } 2285 }
1808 2286
1809 $self->post_load; 2287 $self->post_load;
1810}
1811 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
1812sub customise_for { 2295sub customise_for {
1813 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
1814 2297
1815 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
1816 if $self->per_player; 2299 if $self->per_player;
1819# if $self->per_party; 2302# if $self->per_party;
1820 2303
1821 $self 2304 $self
1822} 2305}
1823 2306
1824# find and load all maps in the 3x3 area around a map
1825sub load_diag {
1826 my ($map) = @_;
1827
1828 my @diag; # diagonal neighbours
1829
1830 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_)
1832 or next;
1833 $neigh = find $neigh, $map
1834 or next;
1835 $neigh->load;
1836
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 }
1840
1841 for (@diag) {
1842 my $neigh = find @$_
1843 or next;
1844 $neigh->load;
1845 }
1846}
1847
1848sub find_sync { 2307sub find_sync {
1849 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
1850 2309
1851 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
1852} 2315}
1853 2316
1854sub do_load_sync { 2317sub do_load_sync {
1855 my ($map) = @_; 2318 my ($map) = @_;
1856 2319
1857 cf::sync_job { $map->load }; 2320 # it's a bug to call this from the main context
2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2322 if $Coro::current == $Coro::main;
2323
2324 $map->load;
1858} 2325}
1859 2326
1860our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
1862 2329
1863sub find_async { 2330sub find_async {
1864 my ($path, $origin) = @_; 2331 my ($path, $origin, $load) = @_;
1865 2332
1866 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
1867 2334
1868 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2336 return $map if !$load || $map->linkable;
1870 } 2337 }
1871 2338
1872 undef $MAP_PREFETCH{$path}; 2339 $MAP_PREFETCH{$path} |= $load;
2340
1873 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2342 $Coro::current->{desc} = "map prefetcher";
2343
1874 while (%MAP_PREFETCH) { 2344 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2345 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2346 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2347 $map->load if $v;
2348 }
1879 2349
1880 delete $MAP_PREFETCH{$path}; 2350 delete $MAP_PREFETCH{$k};
1881 } 2351 }
1882 } 2352 }
1883 undef $MAP_PREFETCHER; 2353 undef $MAP_PREFETCHER;
1884 }; 2354 };
1885 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
1886 2356
1887 () 2357 ()
1888} 2358}
1889 2359
2360# common code, used by both ->save and ->swapout
1890sub save { 2361sub _save {
1891 my ($self) = @_; 2362 my ($self) = @_;
1892
1893 my $lock = cf::lock_acquire "map_data:" . $self->path;
1894 2363
1895 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
1896 2365
1897 return unless $self->dirty; 2366 return unless $self->dirty;
1898 2367
1904 return if $self->{deny_save}; 2373 return if $self->{deny_save};
1905 2374
1906 local $self->{last_access} = $self->last_access;#d# 2375 local $self->{last_access} = $self->last_access;#d#
1907 2376
1908 cf::async { 2377 cf::async {
2378 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2379 $_->contr->save for $self->players;
1910 }; 2380 };
2381
2382 cf::get_slot 0.02;
1911 2383
1912 if ($uniq) { 2384 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2385 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2386 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2387 } else {
1916 $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);
1917 } 2389 }
1918} 2390}
1919 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
1920sub swap_out { 2400sub swap_out {
1921 my ($self) = @_; 2401 my ($self) = @_;
1922 2402
1923 # save first because save cedes
1924 $self->save;
1925
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
1928 return if $self->players; 2407 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY;
1930 return if $self->{deny_save};
1931 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
1932 $self->clear; 2418 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2419}
1935 2420
1936sub reset_at { 2421sub reset_at {
1937 my ($self) = @_; 2422 my ($self) = @_;
1938 2423
1956 2441
1957 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
1958 2443
1959 return if $self->players; 2444 return if $self->players;
1960 2445
1961 warn "resetting map ", $self->path; 2446 cf::trace "resetting map ", $self->path, "\n";
1962 2447
1963 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
1964 2449
1965 # need to save uniques path 2450 # need to save uniques path
1966 unless ($self->{deny_save}) { 2451 unless ($self->{deny_save}) {
1967 my $uniq = $self->uniq_path; utf8::encode $uniq; 2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
1968 2453
1970 if $uniq; 2455 if $uniq;
1971 } 2456 }
1972 2457
1973 delete $cf::MAP{$self->path}; 2458 delete $cf::MAP{$self->path};
1974 2459
2460 $self->deactivate;
2461 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2462 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2463
1979 $self->unlink_save; 2464 $self->unlink_save;
1980 $self->destroy; 2465 $self->destroy;
1981} 2466}
1982 2467
1983my $nuke_counter = "aaaa"; 2468my $nuke_counter = "aaaa";
1984 2469
1985sub nuke { 2470sub nuke {
1986 my ($self) = @_; 2471 my ($self) = @_;
1987 2472
2473 {
2474 my $lock = cf::lock_acquire "map_data:$self->{path}";
2475
1988 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
1989 2477
1990 $self->unlink_save; 2478 $self->unlink_save;
1991 2479
1992 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
1993 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2485
1998 $cf::MAP{$self->path} = $self; 2486 $cf::MAP{$self->path} = $self;
2487 }
1999 2488
2000 $self->reset; # polite request, might not happen 2489 $self->reset; # polite request, might not happen
2001} 2490}
2002 2491
2003=item $maps = cf::map::tmp_maps 2492=item $maps = cf::map::tmp_maps
2045 2534
2046sub unique_maps() { 2535sub unique_maps() {
2047 [ 2536 [
2048 map { 2537 map {
2049 utf8::decode $_; 2538 utf8::decode $_;
2050 /\.map$/ 2539 s/\.map$//; # TODO future compatibility hack
2540 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2541 ? ()
2051 ? normalise $_ 2542 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2543 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2544 ]
2055} 2545}
2056 2546
2057package 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}
2058 2578
2059=back 2579=back
2060 2580
2061=head3 cf::object 2581=head3 cf::object
2062 2582
2066 2586
2067=over 4 2587=over 4
2068 2588
2069=item $ob->inv_recursive 2589=item $ob->inv_recursive
2070 2590
2071Returns 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.
2072 2593
2073=cut 2594=cut
2074 2595
2075sub inv_recursive_; 2596sub inv_recursive_;
2076sub inv_recursive_ { 2597sub inv_recursive_ {
2079 2600
2080sub inv_recursive { 2601sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2602 inv_recursive_ inv $_[0]
2082} 2603}
2083 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
2084package cf; 2633package cf;
2085 2634
2086=back 2635=back
2087 2636
2088=head3 cf::object::player 2637=head3 cf::object::player
2094Sends 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>
2095can 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
2096dialogue with the given NPC character. 2645dialogue with the given NPC character.
2097 2646
2098=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};
2099 2662
2100# rough implementation of a future "reply" method that works 2663# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2664# with dialog boxes.
2102#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
2103sub cf::object::player::reply($$$;$) { 2666sub cf::object::player::reply($$$;$) {
2110 2673
2111 } else { 2674 } else {
2112 my $pl = $self->contr; 2675 my $pl = $self->contr;
2113 2676
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2677 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2678 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2679 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2680
2123 } else { 2681 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2682 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2683 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2684 }
2127 } 2685 }
2686}
2687
2688=item $object->send_msg ($channel, $msg, $color, [extra...])
2689
2690=cut
2691
2692sub cf::object::send_msg {
2693 my $pl = shift->contr
2694 or return;
2695 $pl->send_msg (@_);
2128} 2696}
2129 2697
2130=item $player_object->may ("access") 2698=item $player_object->may ("access")
2131 2699
2132Returns wether the given player is authorized to access resource "access" 2700Returns wether the given player is authorized to access resource "access"
2145 2713
2146=item $player_object->enter_link 2714=item $player_object->enter_link
2147 2715
2148Freezes 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}>).
2149 2717
2150The 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.
2151I<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.
2152 2722
2153Will never block. 2723Will never block.
2154 2724
2155=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2156 2726
2176sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2177 my ($self) = @_; 2747 my ($self) = @_;
2178 2748
2179 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2180 2750
2751 ++$self->{_link_recursion};
2752
2181 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2182 2754
2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2184 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2185 2757
2186 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2187} 2759}
2188 2760
2189sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2190 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2191 2763
2208 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2209 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2210 2782
2211 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2214 2786
2215 $map->load; 2787 $map->load;
2216 $map->load_diag;
2217 2788
2218 return unless $self->contr->active; 2789 return unless $self->contr->active;
2219 $self->activate_recursive;
2220 2790
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2223} 2793 # entering was successful
2794 delete $self->{_link_recursion};
2795 # only activate afterwards, to support waiting in hooks
2796 $self->activate_recursive;
2797 }
2224 2798
2799}
2800
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2226 2802
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the new (success) or old (failed) map position. 2806the new (success) or old (failed) map position. In either case, $done will
2807be called at the end of this process.
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 >>.
2231 2811
2232=cut 2812=cut
2233 2813
2234our $GOTOGEN; 2814our $GOTOGEN;
2235 2815
2236sub cf::object::player::goto { 2816sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
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 }
2238 2824
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2827
2242 $self->enter_link; 2828 $self->enter_link;
2243 2829
2244 (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
2245 my $map = eval { 2852 my $map = eval {
2246 my $map = cf::map::find $path; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2247 2854
2248 if ($map) { 2855 if ($map) {
2249 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2251 } else { 2858 } else {
2252 $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);
2253 } 2860 }
2254 2861
2255 $map 2862 $map
2256 }; 2863 };
2257 2864
2262 2869
2263 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2266 } 2873 }
2874
2875 $done->($self) if $done;
2267 })->prio (1); 2876 })->prio (1);
2268} 2877}
2269 2878
2270=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2271 2880
2291} 2900}
2292 2901
2293sub prepare_random_map { 2902sub prepare_random_map {
2294 my ($exit) = @_; 2903 my ($exit) = @_;
2295 2904
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2905 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2906 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2907 # that depends on the exit object
2301 2908
2302 my $rmp = parse_random_map_params $exit->msg; 2909 my $rmp = parse_random_map_params $exit->msg;
2304 if ($exit->map) { 2911 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2912 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2913 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2914 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2915 $rmp->{origin_y} = $exit->y;
2916
2917 $exit->map->touch;
2309 } 2918 }
2310 2919
2311 $rmp->{random_seed} ||= $exit->random_seed; 2920 $rmp->{random_seed} ||= $exit->random_seed;
2312 2921
2313 my $data = cf::to_json $rmp; 2922 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2923 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2924 my $meta = "$RANDOMDIR/$md5.meta";
2316 2925
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2927 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2928 undef $fh;
2320 aio_rename "$meta~", $meta; 2929 aio_rename "$meta~", $meta;
2321 2930
2931 my $slaying = "?random/$md5";
2932
2933 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2934 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2935 $exit->msg (undef);
2936 }
2324 } 2937 }
2325} 2938}
2326 2939
2327sub cf::object::player::enter_exit { 2940sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2941 my ($self, $exit) = @_;
2329 2942
2330 return unless $self->type == cf::PLAYER; 2943 return unless $self->type == cf::PLAYER;
2331 2944
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2945 $self->enter_link;
2344 2946
2345 (async { 2947 (async {
2346 $self->deactivate_recursive; # just to be sure 2948 $Coro::current->{desc} = "enter_exit";
2949
2347 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
2348 $self->goto ($slaying, $hp, $sp); 2980 $self->goto ($map, $x, $y);
2349 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
2350 1; 2986 1
2351 }) { 2987 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "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. "
2354 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2992
2357 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2358 $self->leave_link; 2994 $self->leave_link;
2359 } 2995 }
2360 })->prio (1); 2996 })->prio (1);
2361} 2997}
2362 2998
2376 3012
2377 utf8::encode $text; 3013 utf8::encode $text;
2378 $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);
2379} 3015}
2380 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);
3040}
3041
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 3043
2383Send 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
2384client if neccessary. C<$type> should be a string identifying the type of 3045client if neccessary. C<$type> should be a string identifying the type of
2385the 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
2386the message unless the client supports the msg packet. 3047the message unless the client supports the msg packet.
2387 3048
2388=cut 3049=cut
2389 3050
3051# non-persistent channels (usually the info channel)
3052our %CHANNEL = (
3053 "c/motd" => {
3054 id => "infobox",
3055 title => "MOTD",
3056 reply => undef,
3057 tooltip => "The message of the day",
3058 },
3059 "c/identify" => {
3060 id => "infobox",
3061 title => "Identify",
3062 reply => undef,
3063 tooltip => "Items recently identified",
3064 },
3065 "c/examine" => {
3066 id => "infobox",
3067 title => "Examine",
3068 reply => undef,
3069 tooltip => "Signs and other items you examined",
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,
3163);
3164
2390sub cf::client::send_msg { 3165sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 3166 my ($self, $channel, $msg, $color, @extra) = @_;
2392 3167
2393 $msg = $self->pl->expand_cfpod ($msg); 3168 $msg = $self->pl->expand_cfpod ($msg)
3169 unless $color & cf::NDI_VERBATIM;
2394 3170
2395 if ($self->can_msg) { 3171 $color &= cf::NDI_CLIENT_MASK; # just in case...
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407 3172
2408 if ($color >= 0) { 3173 # check predefined channels, for the benefit of C
2409 if (0 && $msg =~ /\[/) { 3174 if ($CHANNEL{$channel}) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 3175 $channel = $CHANNEL{$channel};
2411 } else { 3176
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 3177 $self->ext_msg (channel_info => $channel);
2413 $self->send_packet ("drawinfo $color $msg") 3178 $channel = $channel->{id};
3179
3180 } elsif (ref $channel) {
3181 # send meta info to client, if not yet sent
3182 unless (exists $self->{channel}{$channel->{id}}) {
3183 $self->{channel}{$channel->{id}} = $channel;
3184 $self->ext_msg (channel_info => $channel);
2414 } 3185 }
2415 }
2416 }
2417}
2418 3186
3187 $channel = $channel->{id};
3188 }
3189
3190 return unless @extra || length $msg;
3191
3192 # default colour, mask it out
3193 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3194 if $color & cf::NDI_DEF;
3195
3196 my $pkt = "msg "
3197 . $self->{json_coder}->encode (
3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3199 );
3200
3201 $self->send_big_packet ($pkt);
3202}
3203
2419=item $client->ext_event ($type, %msg) 3204=item $client->ext_msg ($type, @msg)
2420 3205
2421Sends an ext event to the client. 3206Sends an ext event to the client.
2422 3207
2423=cut 3208=cut
2424 3209
2425sub cf::client::ext_event($$%) { 3210sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 3211 my ($self, $type, @msg) = @_;
2427 3212
3213 if ($self->extcmd == 2) {
3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3215 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 3216 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3218 }
3219}
3220
3221=item $client->ext_reply ($msgid, @msg)
3222
3223Sends an ext reply to the client.
3224
3225=cut
3226
3227sub cf::client::ext_reply($$@) {
3228 my ($self, $id, @msg) = @_;
3229
3230 return unless $self->extcmd == 2;
3231
3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2430} 3233}
2431 3234
2432=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2433 3236
2434Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
2489 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
2490 3293
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 3295
2493 if (ref $msg) { 3296 if (ref $msg) {
3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3298
3299 my @reply;
3300
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3301 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 3302 @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 } 3303 }
3304
3305 $ns->ext_reply ($reply, @reply)
3306 if $reply;
3307
2500 } else { 3308 } else {
2501 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";
2502 } 3310 }
2503 3311
2504 cf::override; 3312 cf::override;
2505 }, 3313 },
2506); 3314);
2526 3334
2527 $coro 3335 $coro
2528} 3336}
2529 3337
2530cf::client->attach ( 3338cf::client->attach (
2531 on_destroy => sub { 3339 on_client_destroy => sub {
2532 my ($ns) = @_; 3340 my ($ns) = @_;
2533 3341
2534 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2535 }, 3343 },
2536); 3344);
2551our $safe = new Safe "safe"; 3359our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
2553 3361
2554$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
2555 3363
2556$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3364$safe->permit_only (Opcode::opset qw(
3365 :base_core :base_mem :base_orig :base_math :base_loop
3366 grepstart grepwhile mapstart mapwhile
3367 sort time
3368));
2557 3369
2558# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
2559 3371
2560=pod 3372=pod
2561 3373
2562The following functions and methods are available within a safe environment: 3374The following functions and methods are available within a safe environment:
2563 3375
2564 cf::object contr pay_amount pay_player map 3376 cf::object
3377 contr pay_amount pay_player map x y force_find force_add destroy
3378 insert remove name archname title slaying race decrease split
3379 value
3380
2565 cf::object::player player 3381 cf::object::player
2566 cf::player peaceful 3382 player
2567 cf::map trigger 3383
3384 cf::player
3385 peaceful
3386
3387 cf::map
3388 trigger
2568 3389
2569=cut 3390=cut
2570 3391
2571for ( 3392for (
2572 ["cf::object" => qw(contr pay_amount pay_player map)], 3393 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3394 insert remove inv nrof name archname title slaying race
3395 decrease split destroy change_exp value msg lore send_msg)],
2573 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 3397 ["cf::player" => qw(peaceful send_msg)],
2575 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
2576) { 3399) {
2577 no strict 'refs';
2578 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
2579 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2580 for @funs; 3402 for @funs;
2581} 3403}
2582 3404
2597 3419
2598 my $qcode = $code; 3420 my $qcode = $code;
2599 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2600 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
2601 3423
3424 %vars = (_dummy => 0) unless %vars;
3425
3426 my @res;
2602 local $_; 3427 local $_;
2603 local @safe::cf::_safe_eval_args = values %vars;
2604 3428
2605 my $eval = 3429 my $eval =
2606 "do {\n" 3430 "do {\n"
2607 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2608 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
2609 . $code 3433 . $code
2610 . "\n}" 3434 . "\n}"
2611 ; 3435 ;
2612 3436
3437 if ($CFG{safe_eval}) {
2613 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
2614 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2615 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 }
2616 3446
2617 if ($@) { 3447 if ($@) {
2618 warn "$@"; 3448 warn "$@",
2619 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
2620 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
2621 } 3451 }
2622 3452
2623 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
2624} 3454}
2625 3455
2639=cut 3469=cut
2640 3470
2641sub register_script_function { 3471sub register_script_function {
2642 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
2643 3473
2644 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
2645 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
2646} 3476}
2647 3477
2648=back 3478=back
2649 3479
2650=cut 3480=cut
2653# the server's init and main functions 3483# the server's init and main functions
2654 3484
2655sub load_facedata($) { 3485sub load_facedata($) {
2656 my ($path) = @_; 3486 my ($path) = @_;
2657 3487
3488 # HACK to clear player env face cache, we need some signal framework
3489 # for this (global event?)
3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3491
3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3493
2658 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
2659 3495
2660 my $facedata; 3496 my $facedata = decode_storable load_file $path;
2661 0 < aio_load $path, $facedata
2662 or die "$path: $!";
2663
2664 $facedata = Coro::Storable::thaw $facedata;
2665 3497
2666 $facedata->{version} == 2 3498 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 3500
3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3503 $facedata->{resource}{"res/exp_table"} = {
3504 type => FT_RSRC,
3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3507 };
3508 cf::cede_to_tick;
3509
2669 { 3510 {
2670 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
2671 3512
2672 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3515
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3517 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2677 Coro::cede; 3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3521
3522 cf::cede_to_tick;
2678 } 3523 }
2679 3524
2680 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 3526 next unless $info->{smooth};
3527
2682 my $idx = cf::face::find $face 3528 my $idx = cf::face::find $face
2683 or next; 3529 or next;
3530
2684 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3532 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 3534 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 3536 }
2689 Coro::cede; 3537
3538 cf::cede_to_tick;
2690 } 3539 }
2691 } 3540 }
2692 3541
2693 { 3542 {
2694 my $anims = $facedata->{animinfo}; 3543 my $anims = $facedata->{animinfo};
2695 3544
2696 while (my ($anim, $info) = each %$anims) { 3545 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3546 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 3547 cf::cede_to_tick;
2699 } 3548 }
2700 3549
2701 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
2702 } 3551 }
2703 3552
3553 {
3554 my $res = $facedata->{resource};
3555
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
3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3560
3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3564 } else {
3565# $RESOURCE{$name} = $info; # unused
3566 }
3567
3568 cf::cede_to_tick;
3569 }
3570 }
3571
3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3573
2704 1 3574 1
2705} 3575}
2706 3576
3577register_exticmd fx_want => sub {
3578 my ($ns, $want) = @_;
3579
3580 while (my ($k, $v) = each %$want) {
3581 $ns->fx_want ($k, $v);
3582 }
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}
3594
2707sub reload_regions { 3595sub reload_regions {
3596 # HACK to clear player env face cache, we need some signal framework
3597 # for this (global event?)
3598 %ext::player_env::MUSIC_FACE_CACHE = ();
3599
2708 load_resource_file "$MAPDIR/regions" 3600 load_resource_file "$MAPDIR/regions"
2709 or die "unable to load regions file\n"; 3601 or die "unable to load regions file\n";
3602
3603 for (cf::region::list) {
3604 $_->{match} = qr/$_->{match}/
3605 if exists $_->{match};
3606 }
2710} 3607}
2711 3608
2712sub reload_facedata { 3609sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 3610 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 3611 or die "unable to load facedata\n";
2715} 3612}
2716 3613
2717sub reload_archetypes { 3614sub reload_archetypes {
2718 load_resource_file "$DATADIR/archetypes" 3615 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n"; 3616 or die "unable to load archetypes\n";
2720 #d# NEED to laod twice to resolve forward references
2721 # this really needs to be done in an extra post-pass
2722 # (which needs to be synchronous, so solve it differently)
2723 load_resource_file "$DATADIR/archetypes"
2724 or die "unable to load archetypes\n";
2725} 3617}
2726 3618
2727sub reload_treasures { 3619sub reload_treasures {
2728 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
2729 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
2730} 3622}
2731 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
2732sub reload_resources { 3644sub reload_resources {
2733 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
2734 3646
3647 reload_exp_table;
3648 reload_materials;
3649 reload_facedata;
3650 reload_sound;
3651 reload_archetypes;
2735 reload_regions; 3652 reload_regions;
2736 reload_facedata;
2737 #reload_archetypes;#d#
2738 reload_archetypes;
2739 reload_treasures; 3653 reload_treasures;
2740 3654
2741 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
2742} 3656}
2743 3657
2744sub init { 3658sub reload_config {
2745 reload_resources; 3659 trace "reloading config file...\n";
2746}
2747 3660
2748sub cfg_load { 3661 my $config = load_file "$CONFDIR/config";
2749 open my $fh, "<:utf8", "$CONFDIR/config" 3662 utf8::decode $config;
2750 or return; 3663 *CFG = decode_yaml $config;
2751 3664
2752 local $/;
2753 *CFG = YAML::Syck::Load <$fh>;
2754
2755 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2756 3666
2757 $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};
2758 $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};
2759 3669
2760 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
2764 }; 3674 };
2765 warn $@ if $@; 3675 warn $@ if $@;
2766 } 3676 }
2767} 3677}
2768 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
2769sub 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
2770 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
2771 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
2772 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#
2773 (async { 3720 (async {
2774 Event::one_event; 3721 $Coro::current->{desc} = "IDLE BUG HANDLER";
3722 EV::loop EV::LOOP_ONESHOT;
2775 })->prio (Coro::PRIO_MAX); 3723 })->prio (Coro::PRIO_MAX);
2776 }; 3724 };
2777 3725
2778 cfg_load; 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;
3738 reload_config;
2779 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
2780 load_extensions; 3749 load_extensions;
2781 3750
2782 $TICK_WATCHER->start; 3751 utime time, time, $RUNTIMEFILE;
2783 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;
2784} 3768}
2785 3769
2786############################################################################# 3770#############################################################################
2787# initialisation and cleanup 3771# initialisation and cleanup
2788 3772
2789# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
2790BEGIN { 3774BEGIN {
3775 our %SIGWATCHER = ();
2791 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
2792 Event->signal ( 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2793 reentrant => 0,
2794 data => WF_AUTOCANCEL,
2795 signal => $signal,
2796 prio => 0,
2797 cb => sub {
2798 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
2799 },
2800 ); 3779 };
2801 } 3780 }
2802} 3781}
2803 3782
2804sub write_runtime { 3783sub write_runtime_sync {
2805 my $runtime = "$LOCALDIR/runtime"; 3784 my $t0 = AE::time;
2806 3785
2807 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
2808 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
2809 3788
2810 IO::AIO::aio_utime $runtime, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2811 3790
2812 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
2813 3792
2814 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2815 or return; 3794 or return;
2816 3795
2817 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
2818 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
2819 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
2829 aio_utime $fh, undef, undef; 3808 aio_utime $fh, undef, undef;
2830 3809
2831 close $fh 3810 close $fh
2832 or return; 3811 or return;
2833 3812
2834 aio_rename "$runtime~", $runtime 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2835 and return; 3814 and return;
2836 3815
2837 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2838 3817
2839 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 };
2840} 3869}
2841 3870
2842sub emergency_save() { 3871sub emergency_save() {
2843 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
2844 3873
2845 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;
2846 3880
2847 cf::sync_job { 3881 cf::sync_job {
3882 cf::write_runtime_sync; # external watchdog should not bark
3883
2848 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
2849 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
2850 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
2851 warn "begin emergency player save\n"; 3887 info "emergency_perl_save: begin player save\n";
2852 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
2853 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
2854 $pl->valid or next; 3890 $pl->valid or next;
3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2855 $pl->save; 3892 $pl->save;
2856 } 3893 }
2857 warn "end emergency player save\n"; 3894 info "emergency_perl_save: end player save\n";
2858 3895
2859 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";
2860 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
2861 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
2862 $map->valid or next; 3901 $map->valid or next;
2863 $map->save; 3902 $map->save;
2864 } 3903 }
2865 warn "end emergency map save\n"; 3904 info "emergency_perl_save: end map save\n";
2866 3905
2867 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";
2868 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
2869 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
2870 }; 3934 };
2871 3935
2872 warn "leave emergency perl save\n"; 3936 info "emergency_perl_save: leave\n";
2873} 3937}
2874 3938
2875sub post_cleanup { 3939sub post_cleanup {
2876 my ($make_core) = @_; 3940 my ($make_core) = @_;
2877 3941
3942 IO::AIO::flush;
3943
2878 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
2879 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 }
2880} 3974}
2881 3975
2882sub do_reload_perl() { 3976sub do_reload_perl() {
2883 # can/must only be called in main 3977 # can/must only be called in main
2884 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
2885 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
2886 return; 3980 return;
2887 } 3981 }
2888 3982
2889 warn "reloading..."; 3983 return if $RELOAD++;
2890 3984
2891 warn "entering sync_job"; 3985 my $t1 = AE::time;
2892 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
2893 cf::sync_job { 3993 cf::sync_job {
2894 cf::write_runtime; # external watchdog should not bark
2895 cf::emergency_save; 3994 #cf::emergency_save;
2896 cf::write_runtime; # external watchdog should not bark
2897 3995
2898 warn "syncing database to disk";
2899 BDB::db_env_txn_checkpoint $DB_ENV;
2900
2901 # if anything goes wrong in here, we should simply crash as we already saved
2902
2903 warn "cancelling all WF_AUTOCANCEL watchers";
2904 for (Event::all_watchers) {
2905 $_->cancel if $_->data & WF_AUTOCANCEL;
2906 }
2907
2908 warn "flushing outstanding aio requests";
2909 for (;;) {
2910 BDB::flush;
2911 IO::AIO::flush;
2912 Coro::cede;
2913 last unless IO::AIO::nreqs || BDB::nreqs;
2914 warn "iterate...";
2915 }
2916
2917 ++$RELOAD;
2918
2919 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
2920 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
2921 %EXT_CORO = (); 3998 %EXT_CORO = ();
2922 3999
2923 warn "removing commands"; 4000 trace "perl_reload: removing commands";
2924 %COMMAND = (); 4001 %COMMAND = ();
2925 4002
2926 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
2927 %EXTCMD = (); 4004 %EXTCMD = ();
2928 %EXTICMD = (); 4005 %EXTICMD = ();
2929 4006
2930 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
2931 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
2932 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
2933 4010
2934 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
2935 eval { 4012 eval {
2936 $cb->($pkg); 4013 $cb->($pkg);
2937 1 4014 1
2938 } 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;
2939 } 4020 }
2940 4021
2941 warn "... nuking $pkg";
2942 Symbol::delete_package $pkg;
2943 }
2944
2945 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
2946 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
2947 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2948 4025
2949 warn "... unloading $k"; 4026 trace "... unloading $k";
2950 delete $INC{$k}; 4027 delete $INC{$k};
2951 4028
2952 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
2953 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
2954 4031
2955 if (my $cb = $k->can ("unload_module")) { 4032 if (my $cb = $k->can ("unload_module")) {
2956 $cb->(); 4033 $cb->();
4034 }
4035
4036 clear_package $k;
2957 } 4037 }
2958 4038
2959 Symbol::delete_package $k;
2960 }
2961
2962 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
2963 Symbol::delete_package "safe::$_" 4040 clear_package "safe::$_"
2964 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);
2965 4042
2966 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
2967 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
2968 delete $INC{"cf/pod.pm"}; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2969 4046
2970 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
2971 # and global variables created in xs 4048 # and global variables created in xs
2972 #Symbol::delete_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
2973 4050
2974 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
2975 4052
2976 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
2977 require cf; 4054 require cf;
2978 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
2979 4056
2980 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
2981 cf::cfg_load; 4058 cf::reload_config;
2982 4059
2983 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
2984 cf::load_extensions; 4061 cf::load_extensions;
2985 4062
4063 if ($REATTACH_ON_RELOAD) {
2986 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
2987 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
2988 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
2989 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
2990 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
2991 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
4070 }
2992 4071
2993 warn "leaving sync_job"; 4072 cf::_post_init 1;
2994 4073
4074 trace "perl_reload: leaving sync_job";
4075
2995 1 4076 1
2996 } or do { 4077 } or do {
2997 warn $@; 4078 error $@;
2998 warn "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
2999 exit 1; 4080 };
4081
4082 --$RELOAD;
3000 }; 4083 }
3001 4084
3002 warn "reloaded"; 4085 $t1 = AE::time - $t1;
4086 info "perl_reload: completed in ${t1}s\n";
3003}; 4087};
3004 4088
3005our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3006 4090
3007sub reload_perl() { 4091sub reload_perl() {
3008 # doing reload synchronously and two reloads happen back-to-back, 4092 # doing reload synchronously and two reloads happen back-to-back,
3009 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3010 4094
3011 $RELOAD_WATCHER ||= Event->timer ( 4095 $RELOAD_WATCHER ||= cf::async {
3012 reentrant => 0, 4096 Coro::AIO::aio_wait cache_extensions;
3013 after => 0, 4097
3014 data => WF_AUTOCANCEL, 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3015 cb => sub {
3016 do_reload_perl; 4099 do_reload_perl;
3017 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3018 }, 4101 };
3019 ); 4102 };
3020} 4103}
3021 4104
3022register_command "reload" => sub { 4105register_command "reload" => sub {
3023 my ($who, $arg) = @_; 4106 my ($who, $arg) = @_;
3024 4107
3025 if ($who->flag (FLAG_WIZ)) { 4108 if ($who->flag (FLAG_WIZ)) {
3026 $who->message ("reloading server."); 4109 $who->message ("reloading server.");
4110 async {
4111 $Coro::current->{desc} = "perl_reload";
3027 async { reload_perl }; 4112 reload_perl;
4113 };
3028 } 4114 }
3029}; 4115};
3030 4116
3031unshift @INC, $LIBDIR; 4117#############################################################################
3032 4118
3033my $bug_warning = 0; 4119my $bug_warning = 0;
3034 4120
3035our @WAIT_FOR_TICK;
3036our @WAIT_FOR_TICK_BEGIN;
3037
3038sub wait_for_tick { 4121sub wait_for_tick() {
3039 return unless $TICK_WATCHER->is_active; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3040 return if $Coro::current == $Coro::main;
3041 4123
3042 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3043 push @WAIT_FOR_TICK, $signal;
3044 $signal->wait;
3045} 4125}
3046 4126
3047sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3048 return unless $TICK_WATCHER->is_active; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3049 return if $Coro::current == $Coro::main;
3050 4129
3051 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3052 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3053 $signal->wait; 4132 $signal->wait;
3054} 4133}
3055 4134
3056 my $min = 1e6;#d# 4135sub tick {
3057 my $avg = 10;
3058$TICK_WATCHER = Event->timer (
3059 reentrant => 0,
3060 parked => 1,
3061 prio => 0,
3062 at => $NEXT_TICK || $TICK,
3063 data => WF_AUTOCANCEL,
3064 cb => sub {
3065 if ($Coro::current != $Coro::main) { 4136 if ($Coro::current != $Coro::main) {
3066 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"
3067 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3068 return; 4139 return;
3069 } 4140 }
3070 4141
3071 $NOW = $tick_start = Event::time; 4142 cf::one_tick; # one server iteration
3072 4143
3073 cf::server_tick; # one server iteration 4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3074 4145
3075 0 && sync_job {#d# 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3076 for(1..10) { 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3077 my $t = Event::time; 4148 Coro::async_pool {
3078 my $map = my $map = new_from_path cf::map "/tmp/x.map" 4149 $Coro::current->{desc} = "runtime saver";
3079 or die; 4150 write_runtime_sync
3080 4151 or error "ERROR: unable to write runtime file: $!";
3081 $map->width (50);
3082 $map->height (50);
3083 $map->alloc;
3084 $map->_load_objects ("/tmp/x.map", 1);
3085 my $t = Event::time - $t;
3086
3087 #next unless $t < 0.0013;#d#
3088 if ($t < $min) {
3089 $min = $t;
3090 }
3091 $avg = $avg * 0.99 + $t * 0.01;
3092 }
3093 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3094 exit 0;
3095 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3096 }; 4152 };
4153 }
3097 4154
3098 $RUNTIME += $TICK;
3099 $NEXT_TICK += $TICK;
3100
3101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3102 $NEXT_RUNTIME_WRITE = $NOW + 10;
3103 Coro::async_pool {
3104 write_runtime
3105 or warn "ERROR: unable to write runtime file: $!";
3106 };
3107 }
3108
3109# my $AFTER = Event::time;
3110# warn $AFTER - $NOW;#d#
3111
3112 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3113 $sig->send; 4156 $sig->send;
3114 } 4157 }
3115 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3116 $sig->send;
3117 }
3118 4159
3119 $NOW = Event::time; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3120
3121 # if we are delayed by four ticks or more, skip them all
3122 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3123
3124 $TICK_WATCHER->at ($NEXT_TICK);
3125 $TICK_WATCHER->start;
3126
3127 $LOAD = ($NOW - $tick_start) / $TICK;
3128 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3129 4162
3130 _post_tick; 4163 if (0) {
3131 4164 if ($NEXT_TICK) {
3132 4165 my $jitter = $TICK_START - $NEXT_TICK;
4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4167 debug "jitter $JITTER\n";#d#
4168 }
3133 }, 4169 }
3134); 4170}
3135 4171
3136{ 4172{
3137 BDB::max_poll_time $TICK * 0.1; 4173 # configure BDB
3138 $BDB_POLL_WATCHER = Event->io ( 4174
3139 reentrant => 0,
3140 fd => BDB::poll_fileno,
3141 poll => 'r',
3142 prio => 0,
3143 data => WF_AUTOCANCEL,
3144 cb => \&BDB::poll_cb,
3145 );
3146 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3147 4176 BDB::max_poll_reqs $TICK * 0.1;
3148 BDB::set_sync_prepare { 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3149 my $status;
3150 my $current = $Coro::current;
3151 (
3152 sub {
3153 $status = $!;
3154 $current->ready; undef $current;
3155 },
3156 sub {
3157 Coro::schedule while defined $current;
3158 $! = $status;
3159 },
3160 )
3161 };
3162 4178
3163 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3164 $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);
3165 4186
3166 cf::sync_job { 4187 cf::sync_job {
3167 eval { 4188 eval {
3168 BDB::db_env_open 4189 BDB::db_env_open
3169 $DB_ENV, 4190 $DB_ENV,
3171 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
3172 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4193 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3173 0666; 4194 0666;
3174 4195
3175 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4196 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3176
3177 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3178 $DB_ENV->set_lk_detect;
3179 }; 4197 };
3180 4198
3181 cf::cleanup "db_env_open(db): $@" if $@; 4199 cf::cleanup "db_env_open(db): $@" if $@;
3182 }; 4200 };
3183 } 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 };
3184} 4212}
3185 4213
3186{ 4214{
4215 # configure IO::AIO
4216
3187 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3188
3189 undef $Coro::AIO::WATCHER;
3190 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3191 $AIO_POLL_WATCHER = Event->io ( 4219 undef $AnyEvent::AIO::WATCHER;
3192 reentrant => 0,
3193 data => WF_AUTOCANCEL,
3194 fd => IO::AIO::poll_fileno,
3195 poll => 'r',
3196 prio => 6,
3197 cb => \&IO::AIO::poll_cb,
3198 );
3199} 4220}
3200 4221
3201my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3202 4224
3203sub _log_backtrace { 4225sub _log_backtrace {
3204 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3205 4227
3206 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3207 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3208 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3209 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3210 ++$_log_backtrace; 4236 ++$_log_backtrace;
4237 my $perl_bt = Carp::longmess $msg;
3211 async { 4238 async {
4239 $Coro::current->{desc} = "abt $msg";
4240
3212 my @bt = fork_call { 4241 my @bt = fork_call {
3213 @addr = map { sprintf "%x", $_ } @addr; 4242 @addr = map { sprintf "%x", $_ } @addr;
3214 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4243 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3215 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 |"
3216 or die "addr2line: $!"; 4245 or die "addr2line: $!";
3224 } 4253 }
3225 4254
3226 @funcs 4255 @funcs
3227 }; 4256 };
3228 4257
3229 LOG llevInfo, "[ABT] $msg\n"; 4258 LOG llevInfo, "[ABT] $perl_bt\n";
4259 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3230 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3231 --$_log_backtrace; 4261 --$_log_backtrace;
3232 }; 4262 };
3233 } else { 4263 } else {
3234 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3235 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3236 } 4266 }
3237} 4267}
3238 4268
3239# load additional modules 4269# load additional modules
3240use cf::pod; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3241 4272
3242END { cf::emergency_save } 4273END { cf::emergency_save }
3243 4274
32441 42751
3245 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines