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.357 by root, Tue Sep 4 08:42:58 2007 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines