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.372 by root, Sat Sep 15 13:25:33 2007 UTC vs.
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines