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.366 by root, Tue Sep 11 16:05:35 2007 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 56use Fcntl;
31use YAML::Syck (); 57use YAML::XS ();
32use IO::AIO 2.32 (); 58use IO::AIO ();
33use Time::HiRes; 59use Time::HiRes;
34use Compress::LZF; 60use Compress::LZF;
35use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
36 64
37# configure various modules to our taste 65# configure various modules to our taste
38# 66#
39$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 75
43$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
44 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 78
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54 85
55our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
65our $DATADIR = datadir; 99our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
69our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
75 120
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 123our $NEXT_TICK;
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
2328 print "find async $path (from $origin)\n";#d#
2329
2041 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2331 return $map if !$load || $map->linkable;
2043 } 2332 }
2044 2333
2045 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2046 2335
2047 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2337 $Coro::current->{desc} = "map prefetcher";
2338
2048 while (%MAP_PREFETCH) { 2339 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2340 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2341 if (my $map = find $k) {
2051 $map->load if $v; 2342 $map->load if $v;
2052 } 2343 }
2059 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2060 2351
2061 () 2352 ()
2062} 2353}
2063 2354
2355# common code, used by both ->save and ->swapout
2064sub save { 2356sub _save {
2065 my ($self) = @_; 2357 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2358
2069 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2070 2360
2071 return unless $self->dirty; 2361 return unless $self->dirty;
2072 2362
2078 return if $self->{deny_save}; 2368 return if $self->{deny_save};
2079 2369
2080 local $self->{last_access} = $self->last_access;#d# 2370 local $self->{last_access} = $self->last_access;#d#
2081 2371
2082 cf::async { 2372 cf::async {
2373 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2374 $_->contr->save for $self->players;
2084 }; 2375 };
2376
2377 cf::get_slot 0.02;
2085 2378
2086 if ($uniq) { 2379 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2381 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2382 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2384 }
2092} 2385}
2093 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2094sub swap_out { 2395sub swap_out {
2095 my ($self) = @_; 2396 my ($self) = @_;
2096 2397
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2102 return if $self->players; 2402 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2104 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2105 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2106 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2107 2454
2108 $self->deactivate; 2455 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2457 $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 2458
2156 $self->unlink_save; 2459 $self->unlink_save;
2157 $self->destroy; 2460 $self->destroy;
2158} 2461}
2159 2462
2167 2470
2168 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2169 2472
2170 $self->unlink_save; 2473 $self->unlink_save;
2171 2474
2172 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2480
2226 2529
2227sub unique_maps() { 2530sub unique_maps() {
2228 [ 2531 [
2229 map { 2532 map {
2230 utf8::decode $_; 2533 utf8::decode $_;
2231 /\.map$/ 2534 s/\.map$//; # TODO future compatibility hack
2535 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2536 ? ()
2232 ? normalise $_ 2537 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2539 ]
2236} 2540}
2237 2541
2238package cf; 2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2239 2573
2240=back 2574=back
2241 2575
2242=head3 cf::object 2576=head3 cf::object
2243 2577
2247 2581
2248=over 4 2582=over 4
2249 2583
2250=item $ob->inv_recursive 2584=item $ob->inv_recursive
2251 2585
2252Returns the inventory of the object _and_ their inventories, recursively. 2586Returns the inventory of the object I<and> their inventories, recursively,
2587but I<not> the object itself.
2253 2588
2254=cut 2589=cut
2255 2590
2256sub inv_recursive_; 2591sub inv_recursive_;
2257sub inv_recursive_ { 2592sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2597 inv_recursive_ inv $_[0]
2263} 2598}
2264 2599
2265=item $ref = $ob->ref 2600=item $ref = $ob->ref
2266 2601
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2602Creates and returns a persistent reference to an object that can be stored as a string.
2268 2603
2269=item $ob = cf::object::deref ($refstring) 2604=item $ob = cf::object::deref ($refstring)
2270 2605
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2606returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2607even if the object actually exists. May block.
2274=cut 2609=cut
2275 2610
2276sub deref { 2611sub deref {
2277 my ($ref) = @_; 2612 my ($ref) = @_;
2278 2613
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2614 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2615 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2616 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2617 or return;
2286 $pl->ob->uuid eq $uuid 2618 $pl->ob->uuid eq $uuid
2287 or return; 2619 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2639can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2640dialogue with the given NPC character.
2309 2641
2310=cut 2642=cut
2311 2643
2644our $SAY_CHANNEL = {
2645 id => "say",
2646 title => "Map",
2647 reply => "say ",
2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2649};
2650
2651our $CHAT_CHANNEL = {
2652 id => "chat",
2653 title => "Chat",
2654 reply => "chat ",
2655 tooltip => "Player chat and shouts, global to the server.",
2656};
2657
2312# rough implementation of a future "reply" method that works 2658# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2659# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2660#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2661sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2662 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2673 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2674 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2675
2330 } else { 2676 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2677 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2678 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2679 }
2334 } 2680 }
2335} 2681}
2336 2682
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2683=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2708
2363=item $player_object->enter_link 2709=item $player_object->enter_link
2364 2710
2365Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2366 2712
2367The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2369 2717
2370Will never block. 2718Will never block.
2371 2719
2372=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2373 2721
2393sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2394 my ($self) = @_; 2742 my ($self) = @_;
2395 2743
2396 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2397 2745
2746 ++$self->{_link_recursion};
2747
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2749
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2402 2752
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2754}
2405 2755
2406sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2408 2758
2425 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2427 2777
2428 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2431 2781
2432 $map->load; 2782 $map->load;
2433 $map->load_neighbours; 2783 $map->load_neighbours;
2434 2784
2435 return unless $self->contr->active; 2785 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2786
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2440} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2441 2794
2795}
2796
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2443 2798
2444Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2803be called at the end of this process.
2449 2804
2805Note that $check will be called with a potentially non-loaded map, so if
2806it needs a loaded map it has to call C<< ->load >>.
2807
2450=cut 2808=cut
2451 2809
2452our $GOTOGEN; 2810our $GOTOGEN;
2453 2811
2454sub cf::object::player::goto { 2812sub cf::object::player::goto {
2455 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2456 2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2820
2457 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2823
2460 $self->enter_link; 2824 $self->enter_link;
2461 2825
2462 (async { 2826 (async {
2827 $Coro::current->{desc} = "player::goto $path $x $y";
2828
2463 # *tag paths override both path and x|y 2829 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2830 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2831 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2832 my $ob = $obs[rand @obs];
2467 2833
2468 # todo: use ob_blocked to check all tiles of the destination "object" 2834 # see if we actually can go there
2469 # for suitability. 2835 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2836 $ob = $obs[rand @obs];
2837 } else {
2838 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2839 }
2840 # else put us there anyways for now #d#
2470 2841
2471 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2842 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2843 } else {
2844 ($path, $x, $y) = (undef, undef, undef);
2472 } 2845 }
2473 } 2846 }
2474 2847
2475 my $map = eval { 2848 my $map = eval {
2476 my $map = cf::map::find $path; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2477 2850
2478 if ($map) { 2851 if ($map) {
2479 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2481 } else { 2854 } else {
2482 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2856 }
2484 2857
2485 $map 2858 $map
2486 }; 2859 };
2487 2860
2493 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2495 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2496 } 2869 }
2497 2870
2498 $done->() if $done; 2871 $done->($self) if $done;
2499 })->prio (1); 2872 })->prio (1);
2500} 2873}
2501 2874
2502=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2503 2876
2523} 2896}
2524 2897
2525sub prepare_random_map { 2898sub prepare_random_map {
2526 my ($exit) = @_; 2899 my ($exit) = @_;
2527 2900
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2901 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2902 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2903 # that depends on the exit object
2533 2904
2534 my $rmp = parse_random_map_params $exit->msg; 2905 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2907 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2908 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2909 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2910 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2911 $rmp->{origin_y} = $exit->y;
2912
2913 $exit->map->touch;
2541 } 2914 }
2542 2915
2543 $rmp->{random_seed} ||= $exit->random_seed; 2916 $rmp->{random_seed} ||= $exit->random_seed;
2544 2917
2545 my $data = cf::to_json $rmp; 2918 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2919 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2920 my $meta = "$RANDOMDIR/$md5.meta";
2548 2921
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2922 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2923 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2924 undef $fh;
2552 aio_rename "$meta~", $meta; 2925 aio_rename "$meta~", $meta;
2553 2926
2927 my $slaying = "?random/$md5";
2928
2929 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2930 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2931 $exit->msg (undef);
2932 }
2556 } 2933 }
2557} 2934}
2558 2935
2559sub cf::object::player::enter_exit { 2936sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2937 my ($self, $exit) = @_;
2561 2938
2562 return unless $self->type == cf::PLAYER; 2939 return unless $self->type == cf::PLAYER;
2563 2940
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2941 $self->enter_link;
2576 2942
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2943 (async {
2582 $self->deactivate_recursive; # just to be sure 2944 $Coro::current->{desc} = "enter_exit";
2945
2583 unless (eval { 2946 unless (eval {
2947 $self->deactivate_recursive; # just to be sure
2948
2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2950 my $x = $exit->stats->hp;
2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2975
2584 $self->goto ($slaying, $hp, $sp); 2976 $self->goto ($map, $x, $y);
2585 2977
2978 # if exit is damned, update players death & WoR home-position
2979 $self->contr->savebed ($map, $x, $y)
2980 if $exit->flag (cf::FLAG_DAMNED);
2981
2586 1; 2982 1
2587 }) { 2983 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2988
2593 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2594 $self->leave_link; 2990 $self->leave_link;
2595 } 2991 }
2596 })->prio (1); 2992 })->prio (1);
2597} 2993}
2598 2994
2610sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2611 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2612 3008
2613 utf8::encode $text; 3009 utf8::encode $text;
2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2615} 3036}
2616 3037
2617=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2618 3039
2619Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2621the message, with C<log> being the default. If C<$color> is negative, suppress 3042the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 3043the message unless the client supports the msg packet.
2623 3044
2624=cut 3045=cut
2625 3046
3047# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2627 "c/identify" => { 3055 "c/identify" => {
2628 id => "identify", 3056 id => "infobox",
2629 title => "Identify", 3057 title => "Identify",
2630 reply => undef, 3058 reply => undef,
2631 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2632 }, 3060 },
2633 "c/examine" => { 3061 "c/examine" => {
2634 id => "examine", 3062 id => "infobox",
2635 title => "Examine", 3063 title => "Examine",
2636 reply => undef, 3064 reply => undef,
2637 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
2638 }, 3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
3072 },
3073 "c/book" => {
3074 id => "infobox",
3075 title => "Book",
3076 reply => undef,
3077 tooltip => "The contents of a note or book",
3078 },
3079 "c/lookat" => {
3080 id => "infobox",
3081 title => "Look",
3082 reply => undef,
3083 tooltip => "What you saw there",
3084 },
3085 "c/who" => {
3086 id => "infobox",
3087 title => "Players",
3088 reply => undef,
3089 tooltip => "Shows players who are currently online",
3090 },
3091 "c/body" => {
3092 id => "infobox",
3093 title => "Body Parts",
3094 reply => undef,
3095 tooltip => "Shows which body parts you posess and are available",
3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
3133 "c/uptime" => {
3134 id => "infobox",
3135 title => "Uptime",
3136 reply => undef,
3137 tooltip => "How long the server has been running since last restart",
3138 },
3139 "c/mapinfo" => {
3140 id => "infobox",
3141 title => "Map Info",
3142 reply => undef,
3143 tooltip => "Information related to the maps",
3144 },
3145 "c/party" => {
3146 id => "party",
3147 title => "Party",
3148 reply => "gsay ",
3149 tooltip => "Messages and chat related to your party",
3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2639); 3159);
2640 3160
2641sub cf::client::send_msg { 3161sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2643 3163
2644 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2645 3166
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 3168
2648 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3170 if ($CHANNEL{$channel}) {
3171 $channel = $CHANNEL{$channel};
2650 3172
3173 $self->ext_msg (channel_info => $channel);
3174 $channel = $channel->{id};
3175
2651 if (ref $channel) { 3176 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 3181 }
2658 3182
2659 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2660 } 3184 }
2661 3185
2662 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2663 3187
2664 if ($self->can_msg) {
2665 # default colour, mask it out 3188 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2668 3191
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 3195 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 3196
2683 $color &= cf::NDI_COLOR_MASK; 3197 $self->send_big_packet ($pkt);
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696} 3198}
2697 3199
2698=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2699 3201
2700Sends an ext event to the client. 3202Sends an ext event to the client.
2703 3205
2704sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2705 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2706 3208
2707 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2710 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 } 3214 }
2713} 3215}
2714 3216
2715=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2716 3218
2720 3222
2721sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2723 3225
2724 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove 3229 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 } 3232 }
2731} 3233}
2732 3234
2733=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2734 3236
2805 3307
2806 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
2807 if $reply; 3309 if $reply;
2808 3310
2809 } else { 3311 } else {
2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2811 } 3313 }
2812 3314
2813 cf::override; 3315 cf::override;
2814 }, 3316 },
2815); 3317);
2835 3337
2836 $coro 3338 $coro
2837} 3339}
2838 3340
2839cf::client->attach ( 3341cf::client->attach (
2840 on_destroy => sub { 3342 on_client_destroy => sub {
2841 my ($ns) = @_; 3343 my ($ns) = @_;
2842 3344
2843 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2844 }, 3346 },
2845); 3347);
2861our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
2862 3364
2863$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
2864 3366
2865$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
2867 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
2868 sort time 3370 sort time
2869)); 3371));
2870 3372
2871# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
2873=pod 3375=pod
2874 3376
2875The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
2876 3378
2877 cf::object 3379 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3380 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3381 insert remove name archname title slaying race decrease split
3382 value
2880 3383
2881 cf::object::player 3384 cf::object::player
2882 player 3385 player
2883 3386
2884 cf::player 3387 cf::player
2889 3392
2890=cut 3393=cut
2891 3394
2892for ( 3395for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3398 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
2899) { 3402) {
2900 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2903 for @funs; 3405 for @funs;
2904} 3406}
2905 3407
2920 3422
2921 my $qcode = $code; 3423 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
2924 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
2925 local $_; 3430 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars;
2927 3431
2928 my $eval = 3432 my $eval =
2929 "do {\n" 3433 "do {\n"
2930 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2931 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
2932 . $code 3436 . $code
2933 . "\n}" 3437 . "\n}"
2934 ; 3438 ;
2935 3439
3440 if ($CFG{safe_eval}) {
2936 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
2937 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2938 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
2939 3449
2940 if ($@) { 3450 if ($@) {
2941 warn "$@"; 3451 warn "$@",
2942 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
2943 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
2944 } 3454 }
2945 3455
2946 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
2947} 3457}
2948 3458
2962=cut 3472=cut
2963 3473
2964sub register_script_function { 3474sub register_script_function {
2965 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
2966 3476
2967 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
2968 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
2969} 3479}
2970 3480
2971=back 3481=back
2972 3482
2973=cut 3483=cut
2982 # for this (global event?) 3492 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
2984 3494
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986 3496
2987 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
2988 3498
2989 my $facedata; 3499 my $facedata = decode_storable load_file $path;
2990 0 < aio_load $path, $facedata
2991 or die "$path: $!";
2992
2993 $facedata = Coro::Storable::thaw $facedata;
2994 3500
2995 $facedata->{version} == 2 3501 $facedata->{version} == 2
2996 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997 3503
2998 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2999 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC, 3507 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3002 }; 3510 };
3003 cf::cede_to_tick; 3511 cf::cede_to_tick;
3004 3512
3005 { 3513 {
3006 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3007 3515
3008 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3518
3010 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3014 3524
3015 cf::cede_to_tick; 3525 cf::cede_to_tick;
3016 } 3526 }
3017 3527
3018 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3529 next unless $info->{smooth};
3530
3020 my $idx = cf::face::find $face 3531 my $idx = cf::face::find $face
3021 or next; 3532 or next;
3533
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3537 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3027 } 3539 }
3028 3540
3029 cf::cede_to_tick; 3541 cf::cede_to_tick;
3030 } 3542 }
3031 } 3543 }
3040 3552
3041 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3042 } 3554 }
3043 3555
3044 { 3556 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3048 3558
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3560 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054 3562
3055 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3056 # prepend meta info 3564 cf::face::set_type $idx, $info->{type};
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else { 3565 } else {
3065 $data = $info->{data}; 3566 $RESOURCE{$name} = $info; # unused
3066 } 3567 }
3067 3568
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3569 cf::cede_to_tick;
3072 } 3570 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3571 }
3572
3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3574
3093 1 3575 1
3094} 3576}
3095 3577
3096register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3098 3580
3099 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3582 $ns->fx_want ($k, $v);
3101 } 3583 }
3102}; 3584};
3585
3586sub load_resource_file($) {
3587 my $guard = lock_acquire "load_resource_file";
3588
3589 my $status = load_resource_file_ $_[0];
3590 get_slot 0.1, 100;
3591 cf::arch::commit_load;
3592
3593 $status
3594}
3103 3595
3104sub reload_regions { 3596sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3597 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3598 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3599 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3613}
3122 3614
3123sub reload_archetypes { 3615sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3616 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3617 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3618}
3132 3619
3133sub reload_treasures { 3620sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3136} 3623}
3137 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3138sub reload_resources { 3645sub reload_resources {
3139 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3140 3647
3648 reload_exp_table;
3649 reload_materials;
3650 reload_facedata;
3651 reload_sound;
3652 reload_archetypes;
3141 reload_regions; 3653 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3654 reload_treasures;
3146 3655
3147 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3148}
3149
3150sub init {
3151 reload_resources;
3152} 3657}
3153 3658
3154sub reload_config { 3659sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3156 or return;
3157 3661
3158 local $/; 3662 my $config = load_file "$CONFDIR/config";
3159 *CFG = YAML::Syck::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3160 3665
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3162 3667
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3165 3670
3166 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3170 }; 3675 };
3171 warn $@ if $@; 3676 warn $@ if $@;
3172 } 3677 }
3173} 3678}
3174 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3175sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
3176 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3721 (async {
3180 Event::one_event; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3723 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3182 }; 3725 };
3183 3726
3727 evthread_start IO::AIO::poll_fileno;
3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3184 reload_config; 3739 reload_config;
3185 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3186 load_extensions; 3750 load_extensions;
3187 3751
3188 $TICK_WATCHER->start; 3752 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3753
3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3190} 3770}
3191 3771
3192############################################################################# 3772#############################################################################
3193# initialisation and cleanup 3773# initialisation and cleanup
3194 3774
3195# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3196BEGIN { 3776BEGIN {
3777 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3205 },
3206 ); 3781 };
3207 } 3782 }
3208} 3783}
3209 3784
3210sub write_runtime { 3785sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3212 3787
3213 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3215 3790
3216 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3792
3218 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3219 3794
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3221 or return; 3796 or return;
3222 3797
3223 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3236 3811
3237 close $fh 3812 close $fh
3238 or return; 3813 or return;
3239 3814
3240 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3816 and return;
3242 3817
3243 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3244 3819
3245 1 3820 1
3821}
3822
3823our $uuid_lock;
3824our $uuid_skip;
3825
3826sub write_uuid_sync($) {
3827 $uuid_skip ||= $_[0];
3828
3829 return if $uuid_lock;
3830 local $uuid_lock = 1;
3831
3832 my $uuid = "$LOCALDIR/uuid";
3833
3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3835 or return;
3836
3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3845 $uuid_skip = 0;
3846
3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3848 and return;
3849
3850 # always fsync - this file is important
3851 aio_fsync $fh
3852 and return;
3853
3854 close $fh
3855 or return;
3856
3857 aio_rename "$uuid~", $uuid
3858 and return;
3859
3860 trace "uuid file written ($value).\n";
3861
3862 1
3863
3864}
3865
3866sub write_uuid($$) {
3867 my ($skip, $sync) = @_;
3868
3869 $sync ? write_uuid_sync $skip
3870 : async { write_uuid_sync $skip };
3246} 3871}
3247 3872
3248sub emergency_save() { 3873sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3250 3875
3251 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3252 3882
3253 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3254 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3892 $pl->valid or next;
3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3894 $pl->save;
3262 } 3895 }
3263 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3264 3897
3265 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3903 $map->valid or next;
3269 $map->save; 3904 $map->save;
3270 } 3905 }
3271 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3272 3907
3273 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3913
3914 info "emergency_perl_save: begin write uuid\n";
3915 write_uuid_sync 1;
3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3276 }; 3936 };
3277 3937
3278 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3279} 3939}
3280 3940
3281sub post_cleanup { 3941sub post_cleanup {
3282 my ($make_core) = @_; 3942 my ($make_core) = @_;
3283 3943
3944 IO::AIO::flush;
3945
3284 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
3286} 3976}
3287 3977
3288sub do_reload_perl() { 3978sub do_reload_perl() {
3289 # can/must only be called in main 3979 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3291 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3292 return; 3982 return;
3293 } 3983 }
3294 3984
3295 warn "reloading..."; 3985 return if $RELOAD++;
3296 3986
3297 warn "entering sync_job"; 3987 my $t1 = AE::time;
3298 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
3299 cf::sync_job { 3995 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark
3301 cf::emergency_save; 3996 #cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark
3303 3997
3304 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV;
3306
3307 # if anything goes wrong in here, we should simply crash as we already saved
3308
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate...";
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = (); 4000 %EXT_CORO = ();
3328 4001
3329 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3330 %COMMAND = (); 4003 %COMMAND = ();
3331 4004
3332 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3333 %EXTCMD = (); 4006 %EXTCMD = ();
3334 %EXTICMD = (); 4007 %EXTICMD = ();
3335 4008
3336 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3337 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3339 4012
3340 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3341 eval { 4014 eval {
3342 $cb->($pkg); 4015 $cb->($pkg);
3343 1 4016 1
3344 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
3345 } 4022 }
3346 4023
3347 warn "... nuking $pkg";
3348 Symbol::delete_package $pkg;
3349 }
3350
3351 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3352 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 4027
3355 warn "... unloading $k"; 4028 trace "... unloading $k";
3356 delete $INC{$k}; 4029 delete $INC{$k};
3357 4030
3358 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3360 4033
3361 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
3362 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
3363 } 4039 }
3364 4040
3365 Symbol::delete_package $k;
3366 }
3367
3368 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 4044
3372 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 4048
3376 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3377 # and global variables created in xs 4050 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3379 4052
3380 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3381 4054
3382 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3383 require cf; 4056 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3385 4058
3386 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3387 cf::reload_config; 4060 cf::reload_config;
3388 4061
3389 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3390 cf::load_extensions; 4063 cf::load_extensions;
3391 4064
4065 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3395 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3398 4073
3399 warn "leaving sync_job"; 4074 cf::_post_init 1;
3400 4075
4076 trace "perl_reload: leaving sync_job";
4077
3401 1 4078 1
3402 } or do { 4079 } or do {
3403 warn $@; 4080 error $@;
3404 warn "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3405 exit 1; 4082 };
4083
4084 --$RELOAD;
3406 }; 4085 }
3407 4086
3408 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3409}; 4089};
3410 4090
3411our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3412 4092
3413sub reload_perl() { 4093sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3416 4096
3417 $RELOAD_WATCHER ||= Event->timer ( 4097 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 4098 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 4099
3420 data => WF_AUTOCANCEL, 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 4101 do_reload_perl;
3423 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
3424 }, 4103 };
3425 ); 4104 };
3426} 4105}
3427 4106
3428register_command "reload" => sub { 4107register_command "reload" => sub {
3429 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3430 4109
3431 if ($who->flag (FLAG_WIZ)) { 4110 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 4111 $who->message ("reloading server.");
4112 async {
4113 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 4114 reload_perl;
4115 };
3434 } 4116 }
3435}; 4117};
3436 4118
3437unshift @INC, $LIBDIR; 4119#############################################################################
3438 4120
3439my $bug_warning = 0; 4121my $bug_warning = 0;
3440 4122
3441our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN;
3443
3444sub wait_for_tick { 4123sub wait_for_tick() {
3445 return unless $TICK_WATCHER->is_active; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3446 return if $Coro::current == $Coro::main;
3447 4125
3448 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3449 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait;
3451} 4127}
3452 4128
3453sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3454 return unless $TICK_WATCHER->is_active; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3455 return if $Coro::current == $Coro::main;
3456 4131
3457 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 4134 $signal->wait;
3460} 4135}
3461 4136
3462our $stat_fh; 4137sub tick {
3463sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3464
3465$TICK_WATCHER = Event->timer (
3466 reentrant => 0,
3467 parked => 1,
3468 prio => 0,
3469 at => $NEXT_TICK || $TICK,
3470 data => WF_AUTOCANCEL,
3471 cb => sub {
3472 if ($Coro::current != $Coro::main) { 4138 if ($Coro::current != $Coro::main) {
3473 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3474 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3475 return; 4141 return;
3476 } 4142 }
3477 4143
3478 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d# 4144 cf::one_tick; # one server iteration
3479 4145
3480 $NOW = $tick_start = Event::time; 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3481 4147
3482 cf::server_tick; # one server iteration
3483
3484 $RUNTIME += $TICK;
3485 $NEXT_TICK += $TICK;
3486
3487 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3488 $NEXT_RUNTIME_WRITE = $NOW + 10; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3489 Coro::async_pool { 4150 Coro::async_pool {
4151 $Coro::current->{desc} = "runtime saver";
3490 write_runtime 4152 write_runtime_sync
3491 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3492 };
3493 } 4154 };
4155 }
3494 4156
3495# my $AFTER = Event::time;
3496# warn $AFTER - $NOW;#d#
3497
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 4158 $sig->send;
3500 } 4159 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3502 $sig->send;
3503 }
3504 4161
3505 $NOW = Event::time; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 4164
3516 _post_tick; 4165 if (0) {
3517 4166 if ($NEXT_TICK) {
3518 # gather some statistics#d# 4167 my $jitter = $TICK_START - $NEXT_TICK;
3519 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3520 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 4169 debug "jitter $JITTER\n";#d#
4170 }
3521 }, 4171 }
3522); 4172}
3523 4173
3524{ 4174{
4175 # configure BDB
4176
3525 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3526 BDB::max_poll_time $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3527 $BDB_POLL_WATCHER = Event->io ( 4179 $AnyEvent::BDB::WATCHER->priority (1);
3528 reentrant => 0,
3529 fd => BDB::poll_fileno,
3530 poll => 'r',
3531 prio => 0,
3532 data => WF_AUTOCANCEL,
3533 cb => \&BDB::poll_cb,
3534 );
3535
3536 BDB::set_sync_prepare {
3537 my $status;
3538 my $current = $Coro::current;
3539 (
3540 sub {
3541 $status = $!;
3542 $current->ready; undef $current;
3543 },
3544 sub {
3545 Coro::schedule while defined $current;
3546 $! = $status;
3547 },
3548 )
3549 };
3550 4180
3551 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3552 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
4183 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4184 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4185 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4186 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4187 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4188
3554 cf::sync_job { 4189 cf::sync_job {
3555 eval { 4190 eval {
3556 BDB::db_env_open 4191 BDB::db_env_open
3557 $DB_ENV, 4192 $DB_ENV,
3559 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4194 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3560 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4195 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3561 0666; 4196 0666;
3562 4197
3563 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4198 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3564
3565 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3566 | BDB::LOG_AUTOREMOVE, 1);
3567 $DB_ENV->set_lk_detect;
3568 }; 4199 };
3569 4200
3570 cf::cleanup "db_env_open(db): $@" if $@; 4201 cf::cleanup "db_env_open(db): $@" if $@;
3571 }; 4202 };
3572 } 4203 }
3573 4204
3574 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4205 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3575 after => 11, 4206 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3576 interval => 60, 4207 };
3577 hard => 1, 4208 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3578 prio => 0,
3579 data => WF_AUTOCANCEL,
3580 cb => sub {
3581 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4209 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3582 },
3583 ); 4210 };
3584 $BDB_TRICKLE_WATCHER = Event->timer ( 4211 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3585 after => 5,
3586 interval => 10,
3587 hard => 1,
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => sub {
3591 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4212 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3592 },
3593 ); 4213 };
3594} 4214}
3595 4215
3596{ 4216{
4217 # configure IO::AIO
4218
3597 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3598
3599 undef $Coro::AIO::WATCHER;
3600 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3601 $AIO_POLL_WATCHER = Event->io ( 4221 undef $AnyEvent::AIO::WATCHER;
3602 reentrant => 0,
3603 data => WF_AUTOCANCEL,
3604 fd => IO::AIO::poll_fileno,
3605 poll => 'r',
3606 prio => 6,
3607 cb => \&IO::AIO::poll_cb,
3608 );
3609} 4222}
3610 4223
3611my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3612 4226
3613sub _log_backtrace { 4227sub _log_backtrace {
3614 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3615 4229
3616 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3617 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3618 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3619 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3620 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3621 async { 4240 async {
4241 $Coro::current->{desc} = "abt $msg";
4242
3622 my @bt = fork_call { 4243 my @bt = fork_call {
3623 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3624 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4245 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3625 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4246 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3626 or die "addr2line: $!"; 4247 or die "addr2line: $!";
3634 } 4255 }
3635 4256
3636 @funcs 4257 @funcs
3637 }; 4258 };
3638 4259
3639 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3640 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3641 --$_log_backtrace; 4263 --$_log_backtrace;
3642 }; 4264 };
3643 } else { 4265 } else {
3644 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3645 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3646 } 4268 }
3647} 4269}
3648 4270
3649# load additional modules 4271# load additional modules
3650use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3651 4274
3652END { cf::emergency_save } 4275END { cf::emergency_save }
3653 4276
36541 42771
3655 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines