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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines