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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.571 by root, Wed May 4 19:04:45 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines