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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines