ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.525 by root, Wed Apr 21 03:34:26 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.64 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
24use Coro::Util (); 53use Coro::Util ();
25 54
26use JSON::XS (); 55use JSON::XS 2.01 ();
27use BDB (); 56use BDB ();
28use Data::Dumper; 57use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$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 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
75 115
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $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 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 118our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
83 120
84our $BDB_POLL_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 124our $DB_ENV;
88 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
89our %CFG; 128our %CFG;
90 129
91our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 131our $RUNTIME;
132our $NOW;
93 133
94our (%PLAYER, %PLAYER_LOADING); # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 135our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
97 137
98# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 140
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
104 150
105binmode STDOUT; 151binmode STDOUT;
106binmode STDERR; 152binmode STDERR;
107 153
108# read virtual server time, if available 154# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
113} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
114 162
115mkdir $_ 163mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 165
118our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
119 167
120sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
121 184
122############################################################################# 185#############################################################################
123 186
124=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
125 188
161 224
162The raw value load value from the last tick. 225The raw value load value from the last tick.
163 226
164=item %cf::CFG 227=item %cf::CFG
165 228
166Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 230from wherever your confdir points to.
168 231
169=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
170 233
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
172returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
173per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
174 237
175=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
176 239
177This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
178C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
179that call. 242that call.
180 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
181=back 250=back
182 251
183=cut 252=cut
184 253
185BEGIN { 254$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 255 my $msg = join "", @_;
188 256
189 $msg .= "\n" 257 $msg .= "\n"
190 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
191 259
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 261
194 LOG llevError, $msg; 262 LOG llevError, $msg;
195 }; 263};
196} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
197 278
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 289for my $pkg (qw(
209 cf::global cf::attachable 290 cf::global cf::attachable
210 cf::object cf::object::player 291 cf::object cf::object::player
211 cf::client cf::player 292 cf::client cf::player
212 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
213 cf::map cf::party cf::region 295 cf::party cf::region
214)) { 296)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 298}
218 299
219$Event::DIED = sub { 300$EV::DIED = sub {
220 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
221}; 302};
222 303
223############################################################################# 304#############################################################################
224 305
225=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 329 $d
249 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
250} 331}
251 332
252=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
253 334
254Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
255 336
256=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
257 338
258Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
259 340
260=cut 341=cut
261 342
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 344
264sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
266 361
267=item cf::lock_wait $string 362=item cf::lock_wait $string
268 363
269Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
270 365
271=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
272 367
273Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
276returned. 371returned.
277 372
278Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 374deadlocked coro.
285 380
286Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
287 382
288=cut 383=cut
289 384
290our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 386
293sub lock_wait($) { 387sub lock_wait($) {
294 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 389}
307 390
308sub lock_acquire($) { 391sub lock_acquire($) {
309 my ($key) = @_; 392 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 393}
323 394
324sub lock_active($) { 395sub lock_active($) {
325 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 397}
329 398
330sub freeze_mainloop { 399sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
332 401
333 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 403}
335 }; 404
336 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
337 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
338} 418}
339 419
340=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
341 421
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
350 430
351=cut 431=cut
352 432
353our @SLOT_QUEUE; 433our @SLOT_QUEUE;
354our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
355 436
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
439 $Coro::current->desc ("timeslot manager");
440
358 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
359 443
360 while () { 444 while () {
361 next_job: 445 next_job:
446
362 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
363 if ($avail > 0.01) { 448
364 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
365 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
366 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
367 $job->[2]->send; 453 $job->[2]->send;
368 Coro::cede; 454 Coro::cede;
369 goto next_job; 455 goto next_job;
370 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
371 } 458 }
372 } 459 }
373 460
374 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 464 $signal->wait;
378 } else { 465 } else {
466 $busy = 0;
379 Coro::schedule; 467 Coro::schedule;
380 } 468 }
381 } 469 }
382}; 470};
383 471
384sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
385 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
386 476
387 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
388 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
389 480
390 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
391 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
392 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
403 494
404BEGIN { *async = \&Coro::async_pool } 495BEGIN { *async = \&Coro::async_pool }
405 496
406=item cf::sync_job { BLOCK } 497=item cf::sync_job { BLOCK }
407 498
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 499The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 500is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 501partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 502acceptable.
412 503
413If it must be done, put the blocking parts into C<sync_job>. This will run 504If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 505the given BLOCK in another coroutine while waiting for the result. The
419 510
420sub sync_job(&) { 511sub sync_job(&) {
421 my ($job) = @_; 512 my ($job) = @_;
422 513
423 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 515 my $time = AE::time;
425 516
426 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
428 519
429 # TODO: use suspend/resume instead 520 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 521
431 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
432 523
433 my $busy = 1; 524 my $busy = 1;
434 my @res; 525 my @res;
435 526
436 (async { 527 (async {
528 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 529 @res = eval { $job->() };
438 warn $@ if $@; 530 warn $@ if $@;
439 undef $busy; 531 undef $busy;
440 })->prio (Coro::PRIO_MAX); 532 })->prio (Coro::PRIO_MAX);
441 533
442 while ($busy) { 534 while ($busy) {
443 Coro::cede or Event::one_event; 535 if (Coro::nready) {
536 Coro::cede_notself;
537 } else {
538 EV::loop EV::LOOP_ONESHOT;
444 } 539 }
540 }
445 541
446 $time = Event::time - $time; 542 my $time = AE::time - $time;
447 543
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
452 545
453 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
454 } else { 547 } else {
455 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
456 549
481=item fork_call { }, $args 574=item fork_call { }, $args
482 575
483Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
487 580
488=cut 581=cut
489 582
490sub fork_call(&@) { 583sub fork_call(&@) {
491 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
498 reset_signals; 591 reset_signals;
499 &$cb 592 &$cb
500 }, @args; 593 }, @args;
501 594
502 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
503} 634}
504 635
505=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
506 637
507Returns a single value from the environment database. 638Returns a single value from the environment database.
646 777
647############################################################################# 778#############################################################################
648 779
649=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
650 781
651Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
654 785
655In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 788Deliantra).
658 789
659=over 4 790=over 4
660 791
661=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
662 793
706=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
707 838
708Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
710 841
711Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
713 844
714These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
715 846
716=over 4 847=over 4
944 } 1075 }
945 1076
946 0 1077 0
947} 1078}
948 1079
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1081
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1083
953Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
954 1085
960 1091
961=cut 1092=cut
962 1093
963############################################################################# 1094#############################################################################
964# object support 1095# object support
965#
966 1096
1097sub _object_equal($$);
1098sub _object_equal($$) {
1099 my ($a, $b) = @_;
1100
1101 return 0 unless (ref $a) eq (ref $b);
1102
1103 if ("HASH" eq ref $a) {
1104 my @ka = keys %$a;
1105 my @kb = keys %$b;
1106
1107 return 0 if @ka != @kb;
1108
1109 for (0 .. $#ka) {
1110 return 0 unless $ka[$_] eq $kb[$_];
1111 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1112 }
1113
1114 } elsif ("ARRAY" eq ref $a) {
1115
1116 return 0 if @$a != @$b;
1117
1118 for (0 .. $#$a) {
1119 return 0 unless _object_equal $a->[$_], $b->[$_];
1120 }
1121
1122 } elsif ($a ne $b) {
1123 return 0;
1124 }
1125
1126 1
1127}
1128
1129our $SLOW_MERGES;#d#
967sub _can_merge { 1130sub _can_merge {
968 my ($ob1, $ob2) = @_; 1131 my ($ob1, $ob2) = @_;
969 1132
970 local $Storable::canonical = 1; 1133 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1134
974 $fob1 eq $fob2 1135 # we do the slow way here
1136 return _object_equal $ob1, $ob2
975} 1137}
976 1138
977sub reattach { 1139sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1141 my ($obj) = @_;
980 1142
1143 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1145
983 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
984 1147
985 @$registry = (); 1148 @$registry = ();
986 1149
1001cf::attachable->attach ( 1164cf::attachable->attach (
1002 prio => -1000000, 1165 prio => -1000000,
1003 on_instantiate => sub { 1166 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1005 1168
1006 $data = from_json $data; 1169 $data = decode_json $data;
1007 1170
1008 for (@$data) { 1171 for (@$data) {
1009 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1010 1173
1011 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
1024 }, 1187 },
1025); 1188);
1026 1189
1027sub object_freezer_save { 1190sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1191 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1192
1032 sync_job { 1193 sync_job {
1033 if (length $$rdata) { 1194 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1195 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1037 1198
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1042 close $fh; 1206 aio_close $fh;
1043 1207
1044 if (@$objs) { 1208 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1050 close $fh; 1217 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1219 }
1053 } else { 1220 } else {
1054 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1055 } 1222 }
1056 1223
1057 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1228 } else {
1059 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1060 } 1230 }
1061 } else { 1231 } else {
1062 aio_unlink $filename; 1232 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1064 } 1234 }
1065 }; 1235 };
1066
1067 undef $guard;
1068} 1236}
1069 1237
1070sub object_freezer_as_string { 1238sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1239 my ($rdata, $objs) = @_;
1072 1240
1077 1245
1078sub object_thawer_load { 1246sub object_thawer_load {
1079 my ($filename) = @_; 1247 my ($filename) = @_;
1080 1248
1081 my ($data, $av); 1249 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1250
1085 (aio_load $filename, $data) >= 0 1251 (aio_load $filename, $data) >= 0
1086 or return; 1252 or return;
1087 1253
1088 unless (aio_stat "$filename.pst") { 1254 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1255 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1256 or return;
1091 1257
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1258 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs};
1094 } 1260 }
1095 1261
1096 utf8::decode (my $decname = $filename); 1262 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1263 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1264 $decname, length $data, scalar @{$av || []};
1159 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1160 1326
1161 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1162} 1328}
1163 1329
1330use File::Glob ();
1331
1164cf::player->attach ( 1332cf::player->attach (
1165 on_command => sub { 1333 on_unknown_command => sub {
1166 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1167 1335
1168 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1169 or return; 1337 or return;
1170 1338
1200 1368
1201 cf::override; 1369 cf::override;
1202 }, 1370 },
1203); 1371);
1204 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1205sub load_extensions { 1386sub load_extensions {
1206 cf::sync_job { 1387 cf::sync_job {
1207 my %todo; 1388 my %todo;
1208 1389
1209 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1228 1409
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1412
1232 $ext{source} = 1413 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1235 . $source 1416 . $source
1236 . "\n};\n1"; 1417 . "\n};\n1";
1237 1418
1238 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1239 } 1420 }
1240 1421
1422 my $pass = 0;
1241 my %done; 1423 my %done;
1242 while (%todo) { 1424 while (%todo) {
1243 my $progress; 1425 my $progress;
1244 1426
1427 ++$pass;
1428
1429 ext:
1245 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1432 next ext
1248 unless exists $done{$_}; 1433 unless exists $done{$_};
1249 } 1434 }
1250 1435
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1437
1253 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1258 warn $msg; 1445
1259 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1447 delete $todo{$k};
1261 } 1448 } else {
1262 1449 $done{$k} = delete $todo{$k};
1263 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1264 } 1455 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1456 }
1270 1457
1271 skip: 1458 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1274 } 1466 }
1275 }; 1467 };
1276} 1468}
1277 1469
1278############################################################################# 1470#############################################################################
1279 1471
1280=back 1472=back
1281 1473
1282=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1283 1475
1284Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1285 1477
1286=cut 1478=cut
1287 1479
1288package cf::player; 1480package cf::player;
1289 1481
1332 1524
1333sub exists($) { 1525sub exists($) {
1334 my ($login) = @_; 1526 my ($login) = @_;
1335 1527
1336 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1338} 1530}
1339 1531
1340sub find($) { 1532sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1534 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1544 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1545
1354 my $f = new_from_file cf::object::thawer path $login 1546 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1547 or return;
1356 1548
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1549 my $pl = cf::player::load_pl $f
1359 or return; 1550 or return;
1551
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1552 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1553 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1363 } 1555 }
1364 } 1556 }
1365} 1557}
1366 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1367sub save($) { 1572sub save($) {
1368 my ($pl) = @_; 1573 my ($pl) = @_;
1369 1574
1370 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1371 1576
1374 1579
1375 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1376 1581
1377 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1379 1589
1380 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1591 cf::cede_to_tick;
1382} 1592}
1383 1593
1415 my ($pl) = @_; 1625 my ($pl) = @_;
1416 1626
1417 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1418 1628
1419 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1631
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1426 1638
1427 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1679
1468 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1469 my $path = path $login; 1681 my $path = path $login;
1470 1682
1471 # a .pst is a dead give-away for a valid player 1683 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1689 }
1477 1690
1481 1694
1482 \@logins 1695 \@logins
1483} 1696}
1484 1697
1485=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1486 1701
1487Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1488player. May block. 1703player. May block.
1489 1704
1490=cut 1705=cut
1508 } 1723 }
1509 1724
1510 \@paths 1725 \@paths
1511} 1726}
1512 1727
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1729
1515Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1731
1564=item $player->ext_reply ($msgid, @msg) 1732=item $player->ext_reply ($msgid, @msg)
1565 1733
1566Sends an ext reply to the player. 1734Sends an ext reply to the player.
1567 1735
1599 1767
1600=cut 1768=cut
1601 1769
1602sub find_by_path($) { 1770sub find_by_path($) {
1603 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1604 1774
1605 my ($match, $specificity); 1775 my ($match, $specificity);
1606 1776
1607 for my $region (list) { 1777 for my $region (list) {
1608 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1634our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1636 1806
1637sub generate_random_map { 1807sub generate_random_map {
1638 my ($self, $rmp) = @_; 1808 my ($self, $rmp) = @_;
1809
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811
1639 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1813 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1644 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1645 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1646 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1647 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1669 1842
1670 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1671} 1844}
1672 1845
1673# also paths starting with '/' 1846# also paths starting with '/'
1674$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1675 1848
1676sub thawer_merge { 1849sub thawer_merge {
1677 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1678 1851
1679 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1765 1938
1766# the temporary/swap location 1939# the temporary/swap location
1767sub save_path { 1940sub save_path {
1768 my ($self) = @_; 1941 my ($self) = @_;
1769 1942
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1772} 1945}
1773 1946
1774# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1775sub uniq_path { 1948sub uniq_path {
1776 my ($self) = @_; 1949 my ($self) = @_;
1777 1950
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1953}
1790 1954
1791sub decay_objects { 1955sub decay_objects {
1792 my ($self) = @_; 1956 my ($self) = @_;
1793 1957
1877sub find { 2041sub find {
1878 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1879 2043
1880 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1881 2045
1882 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1884 2048
1885 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1890 or return; 2051 or return;
1891 2052
1892 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1893 2054
1895 or return; 2056 or return;
1896 2057
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
1900 undef $guard1; 2062 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 2063 $map->reset;
1903 return find $path; 2064 return find $path;
1904 } 2065 }
1905 2066
1906 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1907 } 2068 }
1908} 2069}
1909 2070
1910sub pre_load { } 2071sub pre_load { }
1911sub post_load { } 2072#sub post_load { } # XS
1912 2073
1913sub load { 2074sub load {
1914 my ($self) = @_; 2075 my ($self) = @_;
1915 2076
1916 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2094 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2095 $f->skip_block;
1935 $self->_load_objects ($f) 2096 $self->_load_objects ($f)
1936 or return; 2097 or return;
1937 2098
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
1939 if delete $self->{load_original}; 2100 if delete $self->{load_original};
1940 2101
1941 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2103 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2104 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2123 $self->decay_objects;
1963 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
1964 $self->update_buttons; 2125 $self->update_buttons;
1965 cf::cede_to_tick; 2126 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2127 $self->activate;
1969 } 2128 }
1970 2129
1971 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
1973 2132
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2134 }
1976 2135
1977 $self->post_load; 2136 $self->post_load;
1978} 2137}
1979 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
1980sub customise_for { 2142sub customise_for {
1981 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
1982 2144
1983 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
1984 if $self->per_player; 2146 if $self->per_player;
2037 my ($path, $origin, $load) = @_; 2199 my ($path, $origin, $load) = @_;
2038 2200
2039 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
2040 2202
2041 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2205 }
2044 2206
2045 $MAP_PREFETCH{$path} |= $load; 2207 $MAP_PREFETCH{$path} |= $load;
2046 2208
2047 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2210 $Coro::current->{desc} = "map prefetcher";
2211
2048 while (%MAP_PREFETCH) { 2212 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2213 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2214 if (my $map = find $k) {
2051 $map->load if $v; 2215 $map->load if $v;
2052 } 2216 }
2059 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2060 2224
2061 () 2225 ()
2062} 2226}
2063 2227
2228# common code, used by both ->save and ->swapout
2064sub save { 2229sub _save {
2065 my ($self) = @_; 2230 my ($self) = @_;
2066
2067 my $lock = cf::lock_acquire "map_data:$self->{path}";
2068 2231
2069 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2070 2233
2071 return unless $self->dirty; 2234 return unless $self->dirty;
2072 2235
2078 return if $self->{deny_save}; 2241 return if $self->{deny_save};
2079 2242
2080 local $self->{last_access} = $self->last_access;#d# 2243 local $self->{last_access} = $self->last_access;#d#
2081 2244
2082 cf::async { 2245 cf::async {
2246 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2084 }; 2248 };
2249
2250 cf::get_slot 0.02;
2085 2251
2086 if ($uniq) { 2252 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2255 } else {
2090 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2091 } 2257 }
2092} 2258}
2093 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2094sub swap_out { 2268sub swap_out {
2095 my ($self) = @_; 2269 my ($self) = @_;
2096 2270
2097 # save first because save cedes
2098 $self->save;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2102 return if $self->players; 2275 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY;
2104 return if $self->{deny_save};
2105 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2106 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2107 2327
2108 $self->deactivate; 2328 $self->deactivate;
2109 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2110 $self->clear; 2330 $self->clear;
2111}
2112
2113sub reset_at {
2114 my ($self) = @_;
2115
2116 # TODO: safety, remove and allow resettable per-player maps
2117 return 1e99 if $self->{deny_reset};
2118
2119 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2120 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2121
2122 $time + $to
2123}
2124
2125sub should_reset {
2126 my ($self) = @_;
2127
2128 $self->reset_at <= $cf::RUNTIME
2129}
2130
2131sub reset {
2132 my ($self) = @_;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135
2136 return if $self->players;
2137
2138 warn "resetting map ", $self->path;
2139
2140 $self->in_memory (cf::MAP_SWAPPED);
2141
2142 # need to save uniques path
2143 unless ($self->{deny_save}) {
2144 my $uniq = $self->uniq_path; utf8::encode $uniq;
2145
2146 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2147 if $uniq;
2148 }
2149
2150 delete $cf::MAP{$self->path};
2151
2152 $self->deactivate;
2153 $_->clear_links_to ($self) for values %cf::MAP;
2154 $self->clear;
2155 2331
2156 $self->unlink_save; 2332 $self->unlink_save;
2157 $self->destroy; 2333 $self->destroy;
2158} 2334}
2159 2335
2167 2343
2168 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2169 2345
2170 $self->unlink_save; 2346 $self->unlink_save;
2171 2347
2172 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2173 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2174 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2175 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2176 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2177 2353
2226 2402
2227sub unique_maps() { 2403sub unique_maps() {
2228 [ 2404 [
2229 map { 2405 map {
2230 utf8::decode $_; 2406 utf8::decode $_;
2231 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2232 ? normalise $_ 2410 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2412 ]
2236} 2413}
2237 2414
2238package cf; 2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2239 2446
2240=back 2447=back
2241 2448
2242=head3 cf::object 2449=head3 cf::object
2243 2450
2247 2454
2248=over 4 2455=over 4
2249 2456
2250=item $ob->inv_recursive 2457=item $ob->inv_recursive
2251 2458
2252Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2253 2461
2254=cut 2462=cut
2255 2463
2256sub inv_recursive_; 2464sub inv_recursive_;
2257sub inv_recursive_ { 2465sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2263} 2471}
2264 2472
2265=item $ref = $ob->ref 2473=item $ref = $ob->ref
2266 2474
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2475Creates and returns a persistent reference to an object that can be stored as a string.
2268 2476
2269=item $ob = cf::object::deref ($refstring) 2477=item $ob = cf::object::deref ($refstring)
2270 2478
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2480even if the object actually exists. May block.
2274=cut 2482=cut
2275 2483
2276sub deref { 2484sub deref {
2277 my ($ref) = @_; 2485 my ($ref) = @_;
2278 2486
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2487 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2488 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2489 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2490 or return;
2286 $pl->ob->uuid eq $uuid 2491 $pl->ob->uuid eq $uuid
2287 or return; 2492 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2513dialogue with the given NPC character.
2309 2514
2310=cut 2515=cut
2311 2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2530
2312# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2532# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2535 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2548
2330 } else { 2549 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2552 }
2334 } 2553 }
2335} 2554}
2336 2555
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2581
2363=item $player_object->enter_link 2582=item $player_object->enter_link
2364 2583
2365Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2366 2585
2367The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2369 2590
2370Will never block. 2591Will never block.
2371 2592
2372=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2373 2594
2398 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2399 2620
2400 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2401 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2402 2623
2403 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2404} 2625}
2405 2626
2406sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2407 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2408 2629
2425 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2426 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2427 2648
2428 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2429 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2430 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2431 2652
2432 $map->load; 2653 $map->load;
2433 $map->load_neighbours; 2654 $map->load_neighbours;
2434 2655
2435 return unless $self->contr->active; 2656 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2657
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive
2663 unless exists $self->{_link_pos}; # maybe we re in-flight again
2440} 2664}
2441 2665
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2667
2444Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2669her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2670that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2671the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2672be called at the end of this process.
2449 2673
2674Note that $check will be called with a potentially non-loaded map, so if
2675it needs a loaded map it has to call C<< ->load >>.
2676
2450=cut 2677=cut
2451 2678
2452our $GOTOGEN; 2679our $GOTOGEN;
2453 2680
2454sub cf::object::player::goto { 2681sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2686
2460 $self->enter_link; 2687 $self->enter_link;
2461 2688
2462 (async { 2689 (async {
2690 $Coro::current->{desc} = "player::goto $path $x $y";
2691
2463 # *tag paths override both path and x|y 2692 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2693 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2694 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2695 my $ob = $obs[rand @obs];
2467 2696
2468 # see if we actually can go there 2697 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2698 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2699 $ob = $obs[rand @obs];
2700 } else {
2701 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2702 }
2703 # else put us there anyways for now #d#
2471 2704
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2705 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2706 } else {
2707 ($path, $x, $y) = (undef, undef, undef);
2473 } 2708 }
2474 } 2709 }
2475 2710
2476 my $map = eval { 2711 my $map = eval {
2477 my $map = cf::map::find $path; 2712 my $map = defined $path ? cf::map::find $path : undef;
2478 2713
2479 if ($map) { 2714 if ($map) {
2480 $map = $map->customise_for ($self); 2715 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2716 $map = $check->($map) if $check && $map;
2482 } else { 2717 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2718 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2719 }
2485 2720
2486 $map 2721 $map
2487 }; 2722 };
2488 2723
2524} 2759}
2525 2760
2526sub prepare_random_map { 2761sub prepare_random_map {
2527 my ($exit) = @_; 2762 my ($exit) = @_;
2528 2763
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2764 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2765 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2766 # that depends on the exit object
2534 2767
2535 my $rmp = parse_random_map_params $exit->msg; 2768 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2770 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2771 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2772 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2773 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2774 $rmp->{origin_y} = $exit->y;
2775
2776 $exit->map->touch;
2542 } 2777 }
2543 2778
2544 $rmp->{random_seed} ||= $exit->random_seed; 2779 $rmp->{random_seed} ||= $exit->random_seed;
2545 2780
2546 my $data = cf::to_json $rmp; 2781 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2782 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2783 my $meta = "$RANDOMDIR/$md5.meta";
2549 2784
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2785 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2786 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2787 undef $fh;
2553 aio_rename "$meta~", $meta; 2788 aio_rename "$meta~", $meta;
2554 2789
2790 my $slaying = "?random/$md5";
2791
2792 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2793 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2794 $exit->msg (undef);
2795 }
2557 } 2796 }
2558} 2797}
2559 2798
2560sub cf::object::player::enter_exit { 2799sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2800 my ($self, $exit) = @_;
2562 2801
2563 return unless $self->type == cf::PLAYER; 2802 return unless $self->type == cf::PLAYER;
2564 2803
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2804 $self->enter_link;
2577 2805
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2806 (async {
2583 $self->deactivate_recursive; # just to be sure 2807 $Coro::current->{desc} = "enter_exit";
2808
2584 unless (eval { 2809 unless (eval {
2810 $self->deactivate_recursive; # just to be sure
2811
2812 # random map handling
2813 {
2814 my $guard = cf::lock_acquire "exit_prepare:$exit";
2815
2816 prepare_random_map $exit
2817 if $exit->slaying eq "/!";
2818 }
2819
2820 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2821 my $x = $exit->stats->hp;
2822 my $y = $exit->stats->sp;
2823
2585 $self->goto ($slaying, $hp, $sp); 2824 $self->goto ($map, $x, $y);
2586 2825
2826 # if exit is damned, update players death & WoR home-position
2827 $self->contr->savebed ($map, $x, $y)
2828 if $exit->flag (cf::FLAG_DAMNED);
2829
2587 1; 2830 1
2588 }) { 2831 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2832 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2833 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2834 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2835 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2836
2594 warn "ERROR in enter_exit: $@"; 2837 warn "ERROR in enter_exit: $@";
2611sub cf::client::send_drawinfo { 2854sub cf::client::send_drawinfo {
2612 my ($self, $text, $flags) = @_; 2855 my ($self, $text, $flags) = @_;
2613 2856
2614 utf8::encode $text; 2857 utf8::encode $text;
2615 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2859}
2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2616} 2884}
2617 2885
2618=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2619 2887
2620Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2890the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2891the message unless the client supports the msg packet.
2624 2892
2625=cut 2893=cut
2626 2894
2895# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2628 "c/identify" => { 2903 "c/identify" => {
2629 id => "identify", 2904 id => "infobox",
2630 title => "Identify", 2905 title => "Identify",
2631 reply => undef, 2906 reply => undef,
2632 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2633 }, 2908 },
2634 "c/examine" => { 2909 "c/examine" => {
2635 id => "examine", 2910 id => "infobox",
2636 title => "Examine", 2911 title => "Examine",
2637 reply => undef, 2912 reply => undef,
2638 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2639 }, 2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2920 },
2921 "c/book" => {
2922 id => "infobox",
2923 title => "Book",
2924 reply => undef,
2925 tooltip => "The contents of a note or book",
2926 },
2927 "c/lookat" => {
2928 id => "infobox",
2929 title => "Look",
2930 reply => undef,
2931 tooltip => "What you saw there",
2932 },
2933 "c/who" => {
2934 id => "infobox",
2935 title => "Players",
2936 reply => undef,
2937 tooltip => "Shows players who are currently online",
2938 },
2939 "c/body" => {
2940 id => "infobox",
2941 title => "Body Parts",
2942 reply => undef,
2943 tooltip => "Shows which body parts you posess and are available",
2944 },
2945 "c/statistics" => {
2946 id => "infobox",
2947 title => "Statistics",
2948 reply => undef,
2949 tooltip => "Shows your primary statistics",
2950 },
2951 "c/skills" => {
2952 id => "infobox",
2953 title => "Skills",
2954 reply => undef,
2955 tooltip => "Shows your experience per skill and item power",
2956 },
2957 "c/shopitems" => {
2958 id => "infobox",
2959 title => "Shop Items",
2960 reply => undef,
2961 tooltip => "Shows the items currently for sale in this shop",
2962 },
2963 "c/resistances" => {
2964 id => "infobox",
2965 title => "Resistances",
2966 reply => undef,
2967 tooltip => "Shows your resistances",
2968 },
2969 "c/pets" => {
2970 id => "infobox",
2971 title => "Pets",
2972 reply => undef,
2973 tooltip => "Shows information abotu your pets/a specific pet",
2974 },
2975 "c/perceiveself" => {
2976 id => "infobox",
2977 title => "Perceive Self",
2978 reply => undef,
2979 tooltip => "You gained detailed knowledge about yourself",
2980 },
2981 "c/uptime" => {
2982 id => "infobox",
2983 title => "Uptime",
2984 reply => undef,
2985 tooltip => "How long the server has been running since last restart",
2986 },
2987 "c/mapinfo" => {
2988 id => "infobox",
2989 title => "Map Info",
2990 reply => undef,
2991 tooltip => "Information related to the maps",
2992 },
2993 "c/party" => {
2994 id => "party",
2995 title => "Party",
2996 reply => "gsay ",
2997 tooltip => "Messages and chat related to your party",
2998 },
2999 "c/death" => {
3000 id => "death",
3001 title => "Death",
3002 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death",
3004 },
3005 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL,
2640); 3007);
2641 3008
2642sub cf::client::send_msg { 3009sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2644 3011
2645 $msg = $self->pl->expand_cfpod ($msg); 3012 $msg = $self->pl->expand_cfpod ($msg)
3013 unless $color & cf::NDI_VERBATIM;
2646 3014
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 3015 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 3016
2649 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3018 if ($CHANNEL{$channel}) {
3019 $channel = $CHANNEL{$channel};
2651 3020
3021 $self->ext_msg (channel_info => $channel);
3022 $channel = $channel->{id};
3023
2652 if (ref $channel) { 3024 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2657 if $self->can_msg;
2658 } 3029 }
2659 3030
2660 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2661 } 3032 }
2662 3033
2663 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2664 3035
2665 if ($self->can_msg) {
2666 # default colour, mask it out 3036 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2669 3039
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3040 my $pkt = "msg "
3041 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2672 } else { 3043 );
2673 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones
2675 for ($msg) {
2676 1 while
2677 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2678 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2679 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2680 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2681 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2682 }
2683 3044
2684 $color &= cf::NDI_COLOR_MASK; 3045 $self->send_big_packet ($pkt);
2685
2686 utf8::encode $msg;
2687
2688 if (0 && $msg =~ /\[/) {
2689 # COMMAND/INFO
2690 $self->send_packet ("drawextinfo $color 10 8 $msg")
2691 } else {
2692 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2693 $self->send_packet ("drawinfo $color $msg")
2694 }
2695 }
2696 }
2697} 3046}
2698 3047
2699=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2700 3049
2701Sends an ext event to the client. 3050Sends an ext event to the client.
2704 3053
2705sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2706 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2707 3056
2708 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2709 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2710 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2711 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2712 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2713 } 3062 }
2714} 3063}
2715 3064
2716=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2717 3066
2721 3070
2722sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2723 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2724 3073
2725 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2726 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2727 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2728 #TODO: version 1, remove 3077 #TODO: version 1, remove
2729 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2731 } 3080 }
2732} 3081}
2733 3082
2734=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2735 3084
2836 3185
2837 $coro 3186 $coro
2838} 3187}
2839 3188
2840cf::client->attach ( 3189cf::client->attach (
2841 on_destroy => sub { 3190 on_client_destroy => sub {
2842 my ($ns) = @_; 3191 my ($ns) = @_;
2843 3192
2844 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2845 }, 3194 },
2846); 3195);
2862our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
2863 3212
2864$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
2865 3214
2866$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
2867 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
2868 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
2869 sort time 3218 sort time
2870)); 3219));
2871 3220
2872# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
2874=pod 3223=pod
2875 3224
2876The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
2877 3226
2878 cf::object 3227 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3228 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3229 insert remove name archname title slaying race decrease split
3230 value
2881 3231
2882 cf::object::player 3232 cf::object::player
2883 player 3233 player
2884 3234
2885 cf::player 3235 cf::player
2890 3240
2891=cut 3241=cut
2892 3242
2893for ( 3243for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3244 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3246 decrease split destroy change_exp value msg lore send_msg)],
2897 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
2899 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
2900) { 3250) {
2901 no strict 'refs'; 3251 no strict 'refs';
2902 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
2903 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2921 3271
2922 my $qcode = $code; 3272 my $qcode = $code;
2923 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2924 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
2925 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
2926 local $_; 3279 local $_;
2927 local @safe::cf::_safe_eval_args = values %vars;
2928 3280
2929 my $eval = 3281 my $eval =
2930 "do {\n" 3282 "do {\n"
2931 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2932 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
2933 . $code 3285 . $code
2934 . "\n}" 3286 . "\n}"
2935 ; 3287 ;
2936 3288
3289 if ($CFG{safe_eval}) {
2937 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
2938 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2939 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
2940 3298
2941 if ($@) { 3299 if ($@) {
2942 warn "$@"; 3300 warn "$@";
2943 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
2944 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
2963=cut 3321=cut
2964 3322
2965sub register_script_function { 3323sub register_script_function {
2966 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
2967 3325
2968 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
2969 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
2970} 3328}
2971 3329
2972=back 3330=back
2973 3331
2974=cut 3332=cut
2995 3353
2996 $facedata->{version} == 2 3354 $facedata->{version} == 2
2997 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
2998 3356
2999 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3000 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3001 type => FT_RSRC, 3360 type => FT_RSRC,
3002 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3003 }; 3363 };
3004 cf::cede_to_tick; 3364 cf::cede_to_tick;
3005 3365
3006 { 3366 {
3007 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3008 3368
3009 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3371
3011 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3015 3376
3016 cf::cede_to_tick; 3377 cf::cede_to_tick;
3017 } 3378 }
3018 3379
3019 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3381 next unless $info->{smooth};
3382
3021 my $idx = cf::face::find $face 3383 my $idx = cf::face::find $face
3022 or next; 3384 or next;
3385
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3386 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3387 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3389 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3390 warn "smooth face '$info->{smooth}' not found for face '$face'";
3041 3404
3042 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3043 } 3406 }
3044 3407
3045 { 3408 {
3046 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3049 3410
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3412 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data;
3055 3414
3056 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3057 # prepend meta info 3416 cf::face::set_type $idx, $info->{type};
3058
3059 my $meta = $enc->encode ({
3060 name => $name,
3061 %{ $info->{meta} || {} },
3062 });
3063
3064 $data = pack "(w/a*)*", $meta, $info->{data};
3065 } else { 3417 } else {
3066 $data = $info->{data}; 3418 $RESOURCE{$name} = $info;
3067 } 3419 }
3068 3420
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3421 cf::cede_to_tick;
3073 } 3422 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3423 }
3424
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3426
3094 1 3427 1
3095} 3428}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3096 3449
3097register_exticmd fx_want => sub { 3450register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3451 my ($ns, $want) = @_;
3099 3452
3100 while (my ($k, $v) = each %$want) { 3453 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3454 $ns->fx_want ($k, $v);
3102 } 3455 }
3103}; 3456};
3457
3458sub load_resource_file($) {
3459 my $guard = lock_acquire "load_resource_file";
3460
3461 my $status = load_resource_file_ $_[0];
3462 get_slot 0.1, 100;
3463 cf::arch::commit_load;
3464
3465 $status
3466}
3104 3467
3105sub reload_regions { 3468sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3469 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3470 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3471 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3485}
3123 3486
3124sub reload_archetypes { 3487sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3488 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3489 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3490}
3133 3491
3134sub reload_treasures { 3492sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3493 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3494 or die "unable to load treasurelists\n";
3137} 3495}
3138 3496
3139sub reload_resources { 3497sub reload_resources {
3140 warn "reloading resource files...\n"; 3498 warn "reloading resource files...\n";
3141 3499
3500 reload_facedata;
3501 reload_archetypes;
3142 reload_regions; 3502 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3503 reload_treasures;
3147 3504
3148 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3149} 3506}
3150 3507
3151sub init {
3152 reload_resources;
3153}
3154
3155sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3512 or return;
3158 3513
3159 local $/; 3514 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3161 3516
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3518
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3169 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3170 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3171 }; 3526 };
3172 warn $@ if $@; 3527 warn $@ if $@;
3173 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3531}
3532
3533sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!";
3536 flock $fh, &Fcntl::LOCK_EX
3537 or die "$PIDFILE: flock: $!";
3538 $fh
3539}
3540
3541# make sure only one server instance is running at any one time
3542sub atomic {
3543 my $fh = pidfile;
3544
3545 my $pid = <$fh>;
3546 kill 9, $pid if $pid > 0;
3547
3548 seek $fh, 0, 0;
3549 print $fh $$;
3550}
3551
3552sub main_loop {
3553 warn "EV::loop starting\n";
3554 if (1) {
3555 EV::loop;
3556 }
3557 warn "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP;
3174} 3559}
3175 3560
3176sub main { 3561sub main {
3562 cf::init_globals; # initialise logging
3563
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570
3177 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3574 (async {
3181 Event::one_event; 3575 $Coro::current->{desc} = "IDLE BUG HANDLER";
3576 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3577 })->prio (Coro::PRIO_MAX);
3183 }; 3578 };
3184 3579
3580 evthread_start IO::AIO::poll_fileno;
3581
3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3591 reload_resources;
3185 reload_config; 3592 reload_config;
3186 db_init; 3593 db_init;
3594
3595 cf::init_uuid;
3596 cf::init_signals;
3597 cf::init_skills;
3598
3599 cf::init_beforeplay;
3600
3601 atomic;
3602
3187 load_extensions; 3603 load_extensions;
3188 3604
3189 $TICK_WATCHER->start; 3605 utime time, time, $RUNTIMEFILE;
3190 Event::loop; 3606
3607 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610
3611 (pop @POST_INIT)->(0) while @POST_INIT;
3612 };
3613
3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3616
3617 main_loop;
3191} 3618}
3192 3619
3193############################################################################# 3620#############################################################################
3194# initialisation and cleanup 3621# initialisation and cleanup
3195 3622
3196# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3197BEGIN { 3624BEGIN {
3625 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3206 },
3207 ); 3629 };
3208 } 3630 }
3209} 3631}
3210 3632
3211sub write_runtime { 3633sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime"; 3634 my $t0 = AE::time;
3213 3635
3214 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3216 3638
3217 IO::AIO::aio_utime $runtime, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3640
3219 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3220 3642
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3222 or return; 3644 or return;
3223 3645
3224 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3658 aio_utime $fh, undef, undef;
3237 3659
3238 close $fh 3660 close $fh
3239 or return; 3661 or return;
3240 3662
3241 aio_rename "$runtime~", $runtime 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3664 and return;
3243 3665
3244 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3245 3667
3246 1 3668 1
3669}
3670
3671our $uuid_lock;
3672our $uuid_skip;
3673
3674sub write_uuid_sync($) {
3675 $uuid_skip ||= $_[0];
3676
3677 return if $uuid_lock;
3678 local $uuid_lock = 1;
3679
3680 my $uuid = "$LOCALDIR/uuid";
3681
3682 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3683 or return;
3684
3685 my $value = uuid_seq uuid_cur;
3686
3687 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n";
3689 return;
3690 }
3691
3692 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0;
3694
3695 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3696 and return;
3697
3698 # always fsync - this file is important
3699 aio_fsync $fh
3700 and return;
3701
3702 close $fh
3703 or return;
3704
3705 aio_rename "$uuid~", $uuid
3706 and return;
3707
3708 warn "uuid file written ($value).\n";
3709
3710 1
3711
3712}
3713
3714sub write_uuid($$) {
3715 my ($skip, $sync) = @_;
3716
3717 $sync ? write_uuid_sync $skip
3718 : async { write_uuid_sync $skip };
3247} 3719}
3248 3720
3249sub emergency_save() { 3721sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3251 3723
3252 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3253 3725
3254 cf::sync_job { 3726 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731
3255 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3256 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3257 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3259 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3738 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3740 $pl->save;
3263 } 3741 }
3264 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3265 3743
3266 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3267 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3268 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3269 $map->valid or next; 3747 $map->valid or next;
3270 $map->save; 3748 $map->save;
3271 } 3749 }
3272 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3273 3751
3274 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3754 warn "emergency_perl_save: end database checkpoint\n";
3755
3756 warn "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n";
3277 }; 3759 };
3278 3760
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3279 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3280} 3767}
3281 3768
3282sub post_cleanup { 3769sub post_cleanup {
3283 my ($make_core) = @_; 3770 my ($make_core) = @_;
3284 3771
3285 warn Carp::longmess "post_cleanup backtrace" 3772 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3773 if $make_core;
3774
3775 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$;
3777}
3778
3779# a safer delete_package, copied from Symbol
3780sub clear_package($) {
3781 my $pkg = shift;
3782
3783 # expand to full symbol table name if needed
3784 unless ($pkg =~ /^main::.*::$/) {
3785 $pkg = "main$pkg" if $pkg =~ /^::/;
3786 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3787 $pkg .= '::' unless $pkg =~ /::$/;
3788 }
3789
3790 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3791 my $stem_symtab = *{$stem}{HASH};
3792
3793 defined $stem_symtab and exists $stem_symtab->{$leaf}
3794 or return;
3795
3796 # clear all symbols
3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3798 for my $name (keys %$leaf_symtab) {
3799 _gv_clear *{"$pkg$name"};
3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3801 }
3287} 3802}
3288 3803
3289sub do_reload_perl() { 3804sub do_reload_perl() {
3290 # can/must only be called in main 3805 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3292 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3293 return; 3808 return;
3294 } 3809 }
3295 3810
3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3814
3815 while ($RELOAD) {
3296 warn "reloading..."; 3816 warn "reloading...";
3297 3817
3298 warn "entering sync_job"; 3818 warn "entering sync_job";
3299 3819
3300 cf::sync_job { 3820 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark 3821 cf::write_runtime_sync; # external watchdog should not bark
3302 cf::emergency_save; 3822 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark 3823 cf::write_runtime_sync; # external watchdog should not bark
3304 3824
3305 warn "syncing database to disk"; 3825 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3827
3308 # if anything goes wrong in here, we should simply crash as we already saved 3828 # if anything goes wrong in here, we should simply crash as we already saved
3309 3829
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests"; 3830 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3831 while (IO::AIO::nreqs || BDB::nreqs) {
3321 warn "iterate..."; 3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = ();
3329
3330 warn "removing commands";
3331 %COMMAND = ();
3332
3333 warn "removing ext/exti commands";
3334 %EXTCMD = ();
3335 %EXTICMD = ();
3336
3337 warn "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg";
3340
3341 if (my $cb = $pkg->can ("unload")) {
3342 eval {
3343 $cb->($pkg);
3344 1
3345 } or warn "$pkg unloaded, but with errors: $@";
3346 } 3833 }
3347 3834
3348 warn "... nuking $pkg"; 3835 warn "cancelling all extension coros";
3349 Symbol::delete_package $pkg; 3836 $_->cancel for values %EXT_CORO;
3350 } 3837 %EXT_CORO = ();
3351 3838
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3839 warn "removing commands";
3353 while (my ($k, $v) = each %INC) { 3840 %COMMAND = ();
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3841
3842 warn "removing ext/exti commands";
3843 %EXTCMD = ();
3844 %EXTICMD = ();
3845
3846 warn "unloading/nuking all extensions";
3847 for my $pkg (@EXTS) {
3356 warn "... unloading $k"; 3848 warn "... unloading $pkg";
3357 delete $INC{$k};
3358 3849
3359 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g;
3361
3362 if (my $cb = $k->can ("unload_module")) { 3850 if (my $cb = $pkg->can ("unload")) {
3851 eval {
3363 $cb->(); 3852 $cb->($pkg);
3853 1
3854 } or warn "$pkg unloaded, but with errors: $@";
3855 }
3856
3857 warn "... clearing $pkg";
3858 clear_package $pkg;
3364 } 3859 }
3365 3860
3366 Symbol::delete_package $k; 3861 warn "unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864
3865 warn "... unloading $k";
3866 delete $INC{$k};
3867
3868 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g;
3870
3871 if (my $cb = $k->can ("unload_module")) {
3872 $cb->();
3873 }
3874
3875 clear_package $k;
3367 } 3876 }
3368 3877
3369 warn "getting rid of safe::, as good as possible"; 3878 warn "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3879 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3881
3373 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3376 3885
3377 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3887 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3380 3889
3381 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3382 3891
3383 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3384 require cf; 3893 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3386 3895
3387 warn "loading config and database again"; 3896 warn "loading config and database again";
3388 cf::reload_config; 3897 cf::reload_config;
3389 3898
3390 warn "loading extensions"; 3899 warn "loading extensions";
3391 cf::load_extensions; 3900 cf::load_extensions;
3392 3901
3902 if ($REATTACH_ON_RELOAD) {
3393 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3399 3910
3911 warn "running post_init jobs";
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913
3400 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3401 3915
3402 1 3916 1
3403 } or do { 3917 } or do {
3404 warn $@; 3918 warn $@;
3405 warn "error while reloading, exiting."; 3919 cf::cleanup "error while reloading, exiting.";
3406 exit 1;
3407 }; 3920 };
3408 3921
3409 warn "reloaded"; 3922 warn "reloaded";
3923 --$RELOAD;
3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3410}; 3928};
3411 3929
3412our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3413 3931
3414sub reload_perl() { 3932sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3417 3935
3418 $RELOAD_WATCHER ||= Event->timer ( 3936 $RELOAD_WATCHER ||= cf::async {
3419 reentrant => 0, 3937 Coro::AIO::aio_wait cache_extensions;
3420 after => 0, 3938
3421 data => WF_AUTOCANCEL, 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3422 cb => sub {
3423 do_reload_perl; 3940 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3425 }, 3942 };
3426 ); 3943 };
3427} 3944}
3428 3945
3429register_command "reload" => sub { 3946register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3431 3948
3432 if ($who->flag (FLAG_WIZ)) { 3949 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3950 $who->message ("reloading server.");
3951 async {
3952 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3953 reload_perl;
3954 };
3435 } 3955 }
3436}; 3956};
3437 3957
3438unshift @INC, $LIBDIR; 3958unshift @INC, $LIBDIR;
3439 3959
3441 3961
3442our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3444 3964
3445sub wait_for_tick { 3965sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3448 3967
3449 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 3970 $signal->wait;
3452} 3971}
3453 3972
3454sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3457 3975
3458 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3978 $signal->wait;
3461} 3979}
3462 3980
3463our $stat_fh; 3981sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 3982 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3983 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3476 return; 3985 return;
3477 } 3986 }
3478 3987
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3484 3989
3485 $RUNTIME += $TICK; 3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3486 $NEXT_TICK += $TICK;
3487 3991
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3994 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3996 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 3997 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3998 };
3999 }
3495 4000
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 4002 $sig->send;
3501 } 4003 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 4004 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 4005 $sig->send;
3504 } 4006 }
3505 4007
3506 $NOW = Event::time; 4008 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4009 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 4010
3517 _post_tick; 4011 if (0) {
3518 4012 if ($NEXT_TICK) {
3519 # gather some statistics#d# 4013 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 4015 warn "jitter $JITTER\n";#d#
4016 }
3522 }, 4017 }
3523); 4018}
3524 4019
3525{ 4020{
4021 # configure BDB
4022
3526 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3527 BDB::max_poll_time $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 4025 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 4026
3552 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4030 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4031 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4032 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4033 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 4034
3555 cf::sync_job { 4035 cf::sync_job {
3556 eval { 4036 eval {
3557 BDB::db_env_open 4037 BDB::db_env_open
3558 $DB_ENV, 4038 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4040 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4041 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 4042 0666;
3563 4043
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4044 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 4045 };
3570 4046
3571 cf::cleanup "db_env_open(db): $@" if $@; 4047 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 4048 };
3573 } 4049 }
3574 4050
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4051 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 4052 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 4053 };
3578 hard => 1, 4054 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4055 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 4056 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 4057 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4058 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 4059 };
3595} 4060}
3596 4061
3597{ 4062{
4063 # configure IO::AIO
4064
3598 IO::AIO::min_parallel 8; 4065 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 4066 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 4067 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 4068}
3611 4069
3612my $_log_backtrace; 4070my $_log_backtrace;
3613 4071
3614sub _log_backtrace { 4072sub _log_backtrace {
3617 $msg =~ s/\n//; 4075 $msg =~ s/\n//;
3618 4076
3619 # limit the # of concurrent backtraces 4077 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 4078 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 4079 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg;
3622 async { 4081 async {
4082 $Coro::current->{desc} = "abt $msg";
4083
3623 my @bt = fork_call { 4084 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 4085 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4086 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4087 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 4088 or die "addr2line: $!";
3635 } 4096 }
3636 4097
3637 @funcs 4098 @funcs
3638 }; 4099 };
3639 4100
3640 LOG llevInfo, "[ABT] $msg\n"; 4101 LOG llevInfo, "[ABT] $perl_bt\n";
4102 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 4103 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 4104 --$_log_backtrace;
3643 }; 4105 };
3644 } else { 4106 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 4107 LOG llevInfo, "[ABT] $msg\n";
3646 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3647 } 4109 }
3648} 4110}
3649 4111
3650# load additional modules 4112# load additional modules
3651use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3652 4115
3653END { cf::emergency_save } 4116END { cf::emergency_save }
3654 4117
36551 41181
3656 4119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines