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.334 by root, Mon Aug 20 22:09:04 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines