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.343 by root, Mon Aug 27 01:13:48 2007 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines