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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines