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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines