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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV 1.86; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 4.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
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;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 75
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 78
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
47 82
48our %COMMAND = (); 83our %COMMAND = ();
49our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
50 85
51our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 87our %EXTCMD = ();
53our %EXTICMD = (); 88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
61our $DATADIR = datadir; 99our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
65our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
71our %RESOURCE; 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;
72 120
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 123our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
79 125
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
85 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME;
90our $NOW; 137our $NOW;
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
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 LOG llevError, $msg; 278 LOG llevWarn, $msg;
193 }; 279};
194}
195 280
196$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
197 warn Carp::longmess $_[0]; 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
198 Coro::terminate; 292 Coro::terminate
199}; 293};
200 294
201@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
202@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
203@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
211for my $pkg (qw( 305for my $pkg (qw(
212 cf::global cf::attachable 306 cf::global cf::attachable
213 cf::object cf::object::player 307 cf::object cf::object::player
214 cf::client cf::player 308 cf::client cf::player
215 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
216 cf::map cf::party cf::region 311 cf::party cf::region
217)) { 312)) {
218 no strict 'refs';
219 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
220} 314}
221 315
222$EV::DIED = sub { 316$EV::DIED = sub {
223 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
224}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
225 324
226############################################################################# 325#############################################################################
227 326
228=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
229 328
250 $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;
251 $d 350 $d
252 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
253} 352}
254 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
255=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
256 369
257Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
258 371
259=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
265our $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
266 379
267sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
268sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
269 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}
444
270=item cf::lock_wait $string 445=item cf::lock_wait $string
271 446
272Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
273 448
274=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
275 450
276Wait 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
277a 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,
278for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
279returned. 454returned.
280 455
281Locks are *not* recursive, locking from the same coro twice results in a 456Locks are *not* recursive, locking from the same coro twice results in a
282deadlocked coro. 457deadlocked coro.
288 463
289Return 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.
290 465
291=cut 466=cut
292 467
293our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
294our %LOCKER;#d#
295 469
296sub lock_wait($) { 470sub lock_wait($) {
297 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
298
299 if ($LOCKER{$key} == $Coro::current) {#d#
300 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
301 return;#d#
302 }#d#
303
304 # wait for lock, if any
305 while ($LOCK{$key}) {
306 push @{ $LOCK{$key} }, $Coro::current;
307 Coro::schedule;
308 }
309} 472}
310 473
311sub lock_acquire($) { 474sub lock_acquire($) {
312 my ($key) = @_; 475 $LOCKS->guard ($_[0])
313
314 # wait, to be sure we are not locked
315 lock_wait $key;
316
317 $LOCK{$key} = [];
318 $LOCKER{$key} = $Coro::current;#d#
319
320 Coro::guard {
321 delete $LOCKER{$key};#d#
322 # wake up all waiters, to be on the safe side
323 $_->ready for @{ delete $LOCK{$key} };
324 }
325} 476}
326 477
327sub lock_active($) { 478sub lock_active($) {
328 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
329
330 ! ! $LOCK{$key}
331} 480}
332 481
333sub freeze_mainloop { 482sub freeze_mainloop {
334 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
335 484
336 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
337 $TICK_WATCHER->start;
338 };
339 $TICK_WATCHER->stop;
340 $guard
341} 486}
342 487
343=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
344 489
345Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
346get spread over timer. 491get spread over time.
347 492
348=cut 493=cut
349 494
350sub periodic($$) { 495sub periodic($$) {
351 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
355 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
356} 501}
357 502
358=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
359 504
360Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
361This 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
362of 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.
363 512
364The 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
365used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
366 515
367Useful for short background jobs. 516Useful for short background jobs.
368 517
369=cut 518=cut
370 519
371our @SLOT_QUEUE; 520our @SLOT_QUEUE;
372our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
373 523
374$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
375$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
376 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
377 527
378 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
379 530
380 while () { 531 while () {
381 next_job: 532 next_job:
533
382 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
383 if ($avail > 0.01) { 535
384 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
385 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
386 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
387 $job->[2]->send; 540 $job->[2]->send;
388 Coro::cede; 541 Coro::cede;
389 goto next_job; 542 goto next_job;
390 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
391 } 545 }
392 } 546 }
393 547
394 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
395 # 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
396 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
397 $signal->wait; 551 $signal->wait;
398 } else { 552 } else {
553 $busy = 0;
399 Coro::schedule; 554 Coro::schedule;
400 } 555 }
401 } 556 }
402}; 557};
403 558
404sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
405 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
406 563
407 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
408 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
409 567
410 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
411 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
412 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
438=cut 596=cut
439 597
440sub sync_job(&) { 598sub sync_job(&) {
441 my ($job) = @_; 599 my ($job) = @_;
442 600
443 if ($Coro::current == $Coro::main) { 601 if (in_main) {
444 my $time = EV::time; 602 my $time = AE::time;
445 603
446 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
447 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
448 606
449 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
450 608
451 # TODO: use suspend/resume instead
452 # (but this is cancel-safe)
453 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
454 610
455 my $busy = 1; 611 my $busy = 1;
456 my @res; 612 my @res;
457 613
458 (async { 614 (async {
459 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
460 @res = eval { $job->() }; 616 @res = eval { $job->() };
461 warn $@ if $@; 617 error $@ if $@;
462 undef $busy; 618 undef $busy;
463 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
464 620
465 while ($busy) { 621 while ($busy) {
466 if (Coro::nready) { 622 if (Coro::nready) {
468 } else { 624 } else {
469 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
470 } 626 }
471 } 627 }
472 628
473 $time = EV::time - $time; 629 my $time = AE::time - $time;
474 630
475 LOG llevError | logBacktrace, Carp::longmess "long sync job"
476 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
477
478 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
479 632
480 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
481 } else { 634 } else {
482 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
483 636
503 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
504 657
505 $coro 658 $coro
506} 659}
507 660
508=item fork_call { }, $args 661=item fork_call { }, @args
509 662
510Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
511process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
512Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
513never block itself or use any form of event handling. 666never block itself or use any form of event handling.
514 667
515=cut 668=cut
516 669
670sub post_fork {
671 reset_signals;
672}
673
517sub fork_call(&@) { 674sub fork_call(&@) {
518 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
519 676
520 # 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,
521 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
522 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
523 680
524 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
525 reset_signals; 682 cf::post_fork;
526 &$cb 683 &$cb
527 }, @args; 684 } @args;
528 685
529 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
530} 725}
531 726
532=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
533 728
534Returns a single value from the environment database. 729Returns a single value from the environment database.
544within each server. 739within each server.
545 740
546=cut 741=cut
547 742
548sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
549 my ($name) = @_; 747 my ($name) = @_;
550 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
551 749
552 eval { 750 eval {
553 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
563} 761}
564 762
565our $DB; 763our $DB;
566 764
567sub db_init { 765sub db_init {
568 cf::sync_job {
569 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
570 };
571} 767}
572 768
573sub db_get($$) { 769sub db_get($$) {
574 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
575 771
576 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
577 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
578 776
579 $! ? () 777 $! ? ()
580 : $data 778 : $data
581 }
582} 779}
583 780
584sub db_put($$$) { 781sub db_put($$$) {
585 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
586 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
614 811
615 my @data; 812 my @data;
616 my $md5; 813 my $md5;
617 814
618 for (0 .. $#$src) { 815 for (0 .. $#$src) {
619 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
620 or Carp::croak "$src->[$_]: $!";
621 } 817 }
622 818
623 # if processing is expensive, check 819 # if processing is expensive, check
624 # checksum first 820 # checksum first
625 if (1) { 821 if (1) {
642 838
643 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
644 my $data = $process->(\@data); 840 my $data = $process->(\@data);
645 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
646 842
647 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
648 844
649 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
650 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
651 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
652 848
662 858
663=cut 859=cut
664 860
665sub datalog($@) { 861sub datalog($@) {
666 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
667 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
668} 864}
669 865
670=back 866=back
671 867
672=cut 868=cut
673 869
674############################################################################# 870#############################################################################
675 871
676=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
677 873
678Many 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
679attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
680to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
681 877
682In 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>
683C<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
733=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
734 930
735Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
736given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
737 933
738Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
739that 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.
740 936
741These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
742 938
743=over 4 939=over 4
867 1063
868 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
869 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
870 1066
871 } elsif (ref $type) { 1067 } elsif (ref $type) {
872 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
873 1069
874 } else { 1070 } else {
875 shift @arg; 1071 shift @arg;
876 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
877 } 1073 }
878 } 1074 }
879} 1075}
880 1076
881sub _object_attach { 1077sub _object_attach {
891 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
892 } 1088 }
893 1089
894 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
895 } else { 1091 } else {
896 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
897 } 1093 }
898 1094
899 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
900} 1096}
901 1097
960 1156
961 for (@$callbacks) { 1157 for (@$callbacks) {
962 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
963 1159
964 if ($@) { 1160 if ($@) {
965 warn "$@";
966 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
967 override; 1162 override;
968 } 1163 }
969 1164
970 return 1 if $override; 1165 return 1 if $override;
971 } 1166 }
1034 1229
1035sub reattach { 1230sub reattach {
1036 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1037 my ($obj) = @_; 1232 my ($obj) = @_;
1038 1233
1234 # no longer needed after getting rid of delete_package?
1039 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
1040 1236
1041 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1042 1238
1043 @$registry = (); 1239 @$registry = ();
1044 1240
1049 for (@$attach) { 1245 for (@$attach) {
1050 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1051 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1052 } 1248 }
1053 } else { 1249 } else {
1054 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1055 } 1251 }
1056 } 1252 }
1057} 1253}
1058 1254
1059cf::attachable->attach ( 1255cf::attachable->attach (
1086 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1087 1283
1088 sync_job { 1284 sync_job {
1089 if (length $$rdata) { 1285 if (length $$rdata) {
1090 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1091 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1092 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1093 1290
1094 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1095 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1096 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1097 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 }
1098 close $fh; 1298 aio_close $fh;
1099 1299
1100 if (@$objs) { 1300 if (@$objs) {
1101 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) {
1102 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1103 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1104 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1105 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 }
1106 close $fh; 1309 aio_close $fh;
1107 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1108 } 1311 }
1109 } else { 1312 } else {
1110 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1111 } 1314 }
1112 1315
1113 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1114 } else { 1320 } else {
1115 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1116 } 1322 }
1117 } else { 1323 } else {
1118 aio_unlink $filename; 1324 aio_unlink $filename;
1119 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1120 } 1326 }
1144 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1145 $av = $st->{objs}; 1351 $av = $st->{objs};
1146 } 1352 }
1147 1353
1148 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1149 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1150 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1151 1358
1152 ($data, $av) 1359 ($data, $av)
1153} 1360}
1154 1361
1155=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1211 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1212 1419
1213 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1214} 1421}
1215 1422
1423use File::Glob ();
1424
1216cf::player->attach ( 1425cf::player->attach (
1217 on_command => sub { 1426 on_unknown_command => sub {
1218 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1219 1428
1220 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1221 or return; 1430 or return;
1222 1431
1245 1454
1246 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1247 if $reply; 1456 if $reply;
1248 1457
1249 } else { 1458 } else {
1250 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1251 } 1460 }
1252 1461
1253 cf::override; 1462 cf::override;
1254 }, 1463 },
1255); 1464);
1256 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
1257sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1258 cf::sync_job { 1482 cf::sync_job {
1259 my %todo; 1483 my %todo;
1260 1484
1261 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1262 next unless -r $path; 1486 next unless -r $path;
1280 1504
1281 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1282 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1283 1507
1284 $ext{source} = 1508 $ext{source} =
1285 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1286 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1287 . $source 1511 . $source
1288 . "\n};\n1"; 1512 . "\n};\n1";
1289 1513
1290 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1291 } 1515 }
1292 1516
1517 my $pass = 0;
1293 my %done; 1518 my %done;
1294 while (%todo) { 1519 while (%todo) {
1295 my $progress; 1520 my $progress;
1296 1521
1522 ++$pass;
1523
1524 ext:
1297 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1298 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1299 goto skip 1527 next ext
1300 unless exists $done{$_}; 1528 unless exists $done{$_};
1301 } 1529 }
1302 1530
1303 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1304 1532
1305 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1306 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1307 : "$v->{base}: extension inactive.\n";
1308 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1309 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1310 warn $msg; 1540
1311 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1312 exit 1; 1542 delete $todo{$k};
1313 } 1543 } else {
1314 1544 $done{$k} = delete $todo{$k};
1315 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1316 } 1550 }
1317
1318 $done{$k} = delete $todo{$k};
1319 push @EXTS, $v->{pkg};
1320 $progress = 1;
1321 } 1551 }
1322 1552
1323 skip: 1553 unless ($progress) {
1324 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1325 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 }
1326 } 1561 }
1327 }; 1562 };
1328} 1563}
1329 1564
1330############################################################################# 1565#############################################################################
1331 1566
1332=back 1567=back
1333 1568
1334=head2 CORE EXTENSIONS 1569=head2 CORE EXTENSIONS
1335 1570
1336Functions and methods that extend core crossfire objects. 1571Functions and methods that extend core deliantra objects.
1337 1572
1338=cut 1573=cut
1339 1574
1340package cf::player; 1575package cf::player;
1341 1576
1384 1619
1385sub exists($) { 1620sub exists($) {
1386 my ($login) = @_; 1621 my ($login) = @_;
1387 1622
1388 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1389 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1390} 1625}
1391 1626
1392sub find($) { 1627sub find($) {
1393 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1394 my $login = $_[0]; 1629 my $login = $_[0];
1406 my $f = new_from_file cf::object::thawer path $login 1641 my $f = new_from_file cf::object::thawer path $login
1407 or return; 1642 or return;
1408 1643
1409 my $pl = cf::player::load_pl $f 1644 my $pl = cf::player::load_pl $f
1410 or return; 1645 or return;
1646
1411 local $cf::PLAYER_LOADING{$login} = $pl; 1647 local $cf::PLAYER_LOADING{$login} = $pl;
1412 $f->resolve_delayed_derefs; 1648 $f->resolve_delayed_derefs;
1413 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1414 } 1650 }
1415 } 1651 }
1416} 1652}
1417 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1418sub save($) { 1667sub save($) {
1419 my ($pl) = @_; 1668 my ($pl) = @_;
1420 1669
1421 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1422 1671
1425 1674
1426 return if $pl->{deny_save}; 1675 return if $pl->{deny_save};
1427 1676
1428 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1429 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1679
1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1430 1684
1431 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1432 cf::cede_to_tick; 1686 cf::cede_to_tick;
1433} 1687}
1434 1688
1466 my ($pl) = @_; 1720 my ($pl) = @_;
1467 1721
1468 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1469 1723
1470 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1471 $pl->password ("*"); # this should lock out the player until we nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1472 1726
1473 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1474 $pl->deactivate; 1728 $pl->deactivate;
1729
1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1475 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1476 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1477 1735
1478 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1479 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1480 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1518 1776
1519 for my $login (@$dirs) { 1777 for my $login (@$dirs) {
1520 my $path = path $login; 1778 my $path = path $login;
1521 1779
1522 # a .pst is a dead give-away for a valid player 1780 # a .pst is a dead give-away for a valid player
1523 unless (-e "$path.pst") { 1781 # if no pst file found, open and chekc for blocked users
1782 if (aio_stat "$path.pst") {
1524 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1783 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1525 aio_read $fh, 0, 512, my $buf, 0 or next; 1784 aio_read $fh, 0, 512, my $buf, 0 or next;
1526 $buf !~ /^password -------------$/m or next; # official not-valid tag 1785 $buf !~ /^password -------------$/m or next; # official not-valid tag
1527 } 1786 }
1528 1787
1532 1791
1533 \@logins 1792 \@logins
1534} 1793}
1535 1794
1536=item $player->maps 1795=item $player->maps
1796
1797=item cf::player::maps $login
1537 1798
1538Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1539player. May block. 1800player. May block.
1540 1801
1541=cut 1802=cut
1559 } 1820 }
1560 1821
1561 \@paths 1822 \@paths
1562} 1823}
1563 1824
1564=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1825=item $protocol_xml = $player->expand_cfpod ($cfpod)
1565 1826
1566Expand crossfire pod fragments into protocol xml. 1827Expand deliantra pod fragments into protocol xml.
1567
1568=cut
1569
1570use re 'eval';
1571
1572my $group;
1573my $interior; $interior = qr{
1574 # match a pod interior sequence sans C<< >>
1575 (?:
1576 \ (.*?)\ (?{ $group = $^N })
1577 | < (??{$interior}) >
1578 )
1579}x;
1580
1581sub expand_cfpod {
1582 my ($self, $pod) = @_;
1583
1584 my $xml;
1585
1586 while () {
1587 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1588 $group = $1;
1589
1590 $group =~ s/&/&amp;/g;
1591 $group =~ s/</&lt;/g;
1592
1593 $xml .= $group;
1594 } elsif ($pod =~ m%\G
1595 ([BCGHITU])
1596 <
1597 (?:
1598 ([^<>]*) (?{ $group = $^N })
1599 | < $interior >
1600 )
1601 >
1602 %gcsx
1603 ) {
1604 my ($code, $data) = ($1, $group);
1605
1606 if ($code eq "B") {
1607 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1608 } elsif ($code eq "I") {
1609 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1610 } elsif ($code eq "U") {
1611 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1612 } elsif ($code eq "C") {
1613 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1614 } elsif ($code eq "T") {
1615 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1616 } elsif ($code eq "G") {
1617 my ($male, $female) = split /\|/, $data;
1618 $data = $self->gender ? $female : $male;
1619 $xml .= expand_cfpod ($self, $data);
1620 } elsif ($code eq "H") {
1621 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1622 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1623 "")
1624 [$self->{hintmode}];
1625 } else {
1626 $xml .= "error processing '$code($data)' directive";
1627 }
1628 } else {
1629 if ($pod =~ /\G(.+)/) {
1630 warn "parse error while expanding $pod (at $1)";
1631 }
1632 last;
1633 }
1634 }
1635
1636 for ($xml) {
1637 # create single paragraphs (very hackish)
1638 s/(?<=\S)\n(?=\w)/ /g;
1639
1640 # compress some whitespace
1641 s/\s+\n/\n/g; # ws line-ends
1642 s/\n\n+/\n/g; # double lines
1643 s/^\n+//; # beginning lines
1644 s/\n+$//; # ending lines
1645 }
1646
1647 $xml
1648}
1649
1650no re 'eval';
1651
1652sub hintmode {
1653 $_[0]{hintmode} = $_[1] if @_ > 1;
1654 $_[0]{hintmode}
1655}
1656 1828
1657=item $player->ext_reply ($msgid, @msg) 1829=item $player->ext_reply ($msgid, @msg)
1658 1830
1659Sends an ext reply to the player. 1831Sends an ext reply to the player.
1660 1832
1692 1864
1693=cut 1865=cut
1694 1866
1695sub find_by_path($) { 1867sub find_by_path($) {
1696 my ($path) = @_; 1868 my ($path) = @_;
1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1697 1871
1698 my ($match, $specificity); 1872 my ($match, $specificity);
1699 1873
1700 for my $region (list) { 1874 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1727our $MAX_RESET = 3600; 1901our $MAX_RESET = 3600;
1728our $DEFAULT_RESET = 3000; 1902our $DEFAULT_RESET = 3000;
1729 1903
1730sub generate_random_map { 1904sub generate_random_map {
1731 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1732 # mit "rum" bekleckern, nicht 1906
1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1908
1733 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1741 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1742 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1743 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1744 (cf::region::find $rmp->{region}), $rmp->{custom}
1745 )
1746} 1910}
1747 1911
1748=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1749 1913
1750Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1755 1919
1756sub register { 1920sub register {
1757 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1758 my $pkg = caller; 1922 my $pkg = caller;
1759 1923
1760 no strict;
1761 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1762 1925
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1927}
1765 1928
1766# also paths starting with '/' 1929# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1931
1769sub thawer_merge { 1932sub thawer_merge {
1770 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1771 1934
1772 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1777} 1940}
1778 1941
1779sub normalise { 1942sub normalise {
1780 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1781 1944
1782 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1783 1946
1784 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1785 1948
1786 # map plan: 1949 # map plan:
1787 # 1950 #
1802 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1803 $path = "$base/$path"; 1966 $path = "$base/$path";
1804 } 1967 }
1805 1968
1806 for ($path) { 1969 for ($path) {
1807 redo if s{//}{/};
1808 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1809 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1810 } 1972 }
1811 1973
1812 $path 1974 $path
1826 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1827 return $self; 1989 return $self;
1828 } 1990 }
1829 } 1991 }
1830 1992
1831 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1832 () 1994 ()
1833} 1995}
1834 1996
1835sub init { 1997sub init {
1836 my ($self) = @_; 1998 my ($self) = @_;
1858 2020
1859# the temporary/swap location 2021# the temporary/swap location
1860sub save_path { 2022sub save_path {
1861 my ($self) = @_; 2023 my ($self) = @_;
1862 2024
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2025 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$TMPDIR/$path.map" 2026 "$TMPDIR/$path.map"
1865} 2027}
1866 2028
1867# the unique path, undef == no special unique path 2029# the unique path, undef == no special unique path
1868sub uniq_path { 2030sub uniq_path {
1869 my ($self) = @_; 2031 my ($self) = @_;
1870 2032
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1873}
1874
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882} 2035}
1883 2036
1884sub decay_objects { 2037sub decay_objects {
1885 my ($self) = @_; 2038 my ($self) = @_;
1886 2039
1968 2121
1969sub find; 2122sub find;
1970sub find { 2123sub find {
1971 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
1972 2125
2126 cf::cede_to_tick;
2127
1973 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1974 2129
1975 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2132
1978 $cf::MAP{$path} || do { 2133 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_find:$path";
1980 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1981
1982 my $map = new_from_path cf::map $path 2134 my $map = new_from_path cf::map $path
1983 or return; 2135 or return;
1984 2136
1985 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
1986 2138
1988 or return; 2140 or return;
1989 2141
1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2142 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1991 # doing this can freeze the server in a sync job, obviously 2143 # doing this can freeze the server in a sync job, obviously
1992 #$cf::WAIT_FOR_TICK->wait; 2144 #$cf::WAIT_FOR_TICK->wait;
2145 undef $guard2;
1993 undef $guard1; 2146 undef $guard1;
1994 undef $guard2;
1995 $map->reset; 2147 $map->reset;
1996 return find $path; 2148 return find $path;
1997 } 2149 }
1998 2150
1999 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
2000 } 2152 }
2001} 2153}
2002 2154
2003sub pre_load { } 2155sub pre_load { }
2004sub post_load { } 2156#sub post_load { } # XS
2005 2157
2006sub load { 2158sub load {
2007 my ($self) = @_; 2159 my ($self) = @_;
2008 2160
2009 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2026 my $f = new_from_file cf::object::thawer $self->{load_path}; 2178 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block; 2179 $f->skip_block;
2028 $self->_load_objects ($f) 2180 $self->_load_objects ($f)
2029 or return; 2181 or return;
2030 2182
2031 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2183 $self->post_load_original
2032 if delete $self->{load_original}; 2184 if delete $self->{load_original};
2033 2185
2034 if (my $uniq = $self->uniq_path) { 2186 if (my $uniq = $self->uniq_path) {
2035 utf8::encode $uniq; 2187 utf8::encode $uniq;
2036 unless (aio_stat $uniq) { 2188 unless (aio_stat $uniq) {
2054 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2207 $self->decay_objects;
2056 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2057 $self->update_buttons; 2209 $self->update_buttons;
2058 cf::cede_to_tick; 2210 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2211 $self->activate;
2062 } 2212 }
2063 2213
2064 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2066 2216
2067 $self->in_memory (cf::MAP_IN_MEMORY); 2217 $self->in_memory (cf::MAP_ACTIVE);
2068 } 2218 }
2069 2219
2070 $self->post_load; 2220 $self->post_load;
2071}
2072 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
2073sub customise_for { 2228sub customise_for {
2074 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2075 2230
2076 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2232 if $self->per_player;
2093 or next; 2248 or next;
2094 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2095 or next; 2250 or next;
2096 $neigh->load; 2251 $neigh->load;
2097 2252
2253 # now find the diagonal neighbours
2098 push @neigh, 2254 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2257 }
2102 2258
2109} 2265}
2110 2266
2111sub find_sync { 2267sub find_sync {
2112 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2113 2269
2114 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2115} 2274}
2116 2275
2117sub do_load_sync { 2276sub do_load_sync {
2118 my ($map) = @_; 2277 my ($map) = @_;
2119 2278
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2122 2281
2123 cf::sync_job { $map->load }; 2282 $map->load;
2124} 2283}
2125 2284
2126our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2127our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2128 2287
2130 my ($path, $origin, $load) = @_; 2289 my ($path, $origin, $load) = @_;
2131 2290
2132 $path = normalise $path, $origin && $origin->{path}; 2291 $path = normalise $path, $origin && $origin->{path};
2133 2292
2134 if (my $map = $cf::MAP{$path}) { 2293 if (my $map = $cf::MAP{$path}) {
2135 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2136 } 2295 }
2137 2296
2138 $MAP_PREFETCH{$path} |= $load; 2297 $MAP_PREFETCH{$path} |= $load;
2139 2298
2140 $MAP_PREFETCHER ||= cf::async { 2299 $MAP_PREFETCHER ||= cf::async {
2154 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2155 2314
2156 () 2315 ()
2157} 2316}
2158 2317
2318# common code, used by both ->save and ->swapout
2159sub save { 2319sub _save {
2160 my ($self) = @_; 2320 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2321
2164 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2165 2323
2166 return unless $self->dirty; 2324 return unless $self->dirty;
2167 2325
2176 2334
2177 cf::async { 2335 cf::async {
2178 $Coro::current->{desc} = "map player save"; 2336 $Coro::current->{desc} = "map player save";
2179 $_->contr->save for $self->players; 2337 $_->contr->save for $self->players;
2180 }; 2338 };
2339
2340 cf::get_slot 0.02;
2181 2341
2182 if ($uniq) { 2342 if ($uniq) {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2343 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2184 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2344 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2185 } else { 2345 } else {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2187 } 2347 }
2188} 2348}
2189 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2190sub swap_out { 2358sub swap_out {
2191 my ($self) = @_; 2359 my ($self) = @_;
2192 2360
2193 # save first because save cedes
2194 $self->save;
2195
2196 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2197 2362
2363 return if $self->in_memory != cf::MAP_ACTIVE;
2364 return if $self->{deny_save};
2198 return if $self->players; 2365 return if $self->players;
2199 return if $self->in_memory != cf::MAP_IN_MEMORY;
2200 return if $self->{deny_save};
2201 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2203 2417
2204 $self->deactivate; 2418 $self->deactivate;
2205 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2206 $self->clear; 2420 $self->clear;
2207}
2208
2209sub reset_at {
2210 my ($self) = @_;
2211
2212 # TODO: safety, remove and allow resettable per-player maps
2213 return 1e99 if $self->{deny_reset};
2214
2215 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2216 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2217
2218 $time + $to
2219}
2220
2221sub should_reset {
2222 my ($self) = @_;
2223
2224 $self->reset_at <= $cf::RUNTIME
2225}
2226
2227sub reset {
2228 my ($self) = @_;
2229
2230 my $lock = cf::lock_acquire "map_data:$self->{path}";
2231
2232 return if $self->players;
2233
2234 warn "resetting map ", $self->path;
2235
2236 $self->in_memory (cf::MAP_SWAPPED);
2237
2238 # need to save uniques path
2239 unless ($self->{deny_save}) {
2240 my $uniq = $self->uniq_path; utf8::encode $uniq;
2241
2242 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2243 if $uniq;
2244 }
2245
2246 delete $cf::MAP{$self->path};
2247
2248 $self->deactivate;
2249 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->clear;
2251 2421
2252 $self->unlink_save; 2422 $self->unlink_save;
2253 $self->destroy; 2423 $self->destroy;
2254} 2424}
2255 2425
2263 2433
2264 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2265 2435
2266 $self->unlink_save; 2436 $self->unlink_save;
2267 2437
2268 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2269 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2270 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2271 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2272 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2273 2443
2322 2492
2323sub unique_maps() { 2493sub unique_maps() {
2324 [ 2494 [
2325 map { 2495 map {
2326 utf8::decode $_; 2496 utf8::decode $_;
2327 /\.map$/ 2497 s/\.map$//; # TODO future compatibility hack
2498 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2499 ? ()
2328 ? normalise $_ 2500 : normalise $_
2329 : ()
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2502 ]
2332} 2503}
2333 2504
2334package cf; 2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2335 2536
2336=back 2537=back
2337 2538
2338=head3 cf::object 2539=head3 cf::object
2339 2540
2343 2544
2344=over 4 2545=over 4
2345 2546
2346=item $ob->inv_recursive 2547=item $ob->inv_recursive
2347 2548
2348Returns the inventory of the object _and_ their inventories, recursively. 2549Returns the inventory of the object I<and> their inventories, recursively,
2550but I<not> the object itself.
2349 2551
2350=cut 2552=cut
2351 2553
2352sub inv_recursive_; 2554sub inv_recursive_;
2353sub inv_recursive_ { 2555sub inv_recursive_ {
2358 inv_recursive_ inv $_[0] 2560 inv_recursive_ inv $_[0]
2359} 2561}
2360 2562
2361=item $ref = $ob->ref 2563=item $ref = $ob->ref
2362 2564
2363creates and returns a persistent reference to an objetc that can be stored as a string. 2565Creates and returns a persistent reference to an object that can be stored as a string.
2364 2566
2365=item $ob = cf::object::deref ($refstring) 2567=item $ob = cf::object::deref ($refstring)
2366 2568
2367returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2569returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2368even if the object actually exists. May block. 2570even if the object actually exists. May block.
2400can be C<undef>. Does the right thing when the player is currently in a 2602can be C<undef>. Does the right thing when the player is currently in a
2401dialogue with the given NPC character. 2603dialogue with the given NPC character.
2402 2604
2403=cut 2605=cut
2404 2606
2607our $SAY_CHANNEL = {
2608 id => "say",
2609 title => "Map",
2610 reply => "say ",
2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2612};
2613
2614our $CHAT_CHANNEL = {
2615 id => "chat",
2616 title => "Chat",
2617 reply => "chat ",
2618 tooltip => "Player chat and shouts, global to the server.",
2619};
2620
2405# rough implementation of a future "reply" method that works 2621# rough implementation of a future "reply" method that works
2406# with dialog boxes. 2622# with dialog boxes.
2407#TODO: the first argument must go, split into a $npc->reply_to ( method 2623#TODO: the first argument must go, split into a $npc->reply_to ( method
2408sub cf::object::player::reply($$$;$) { 2624sub cf::object::player::reply($$$;$) {
2409 my ($self, $npc, $msg, $flags) = @_; 2625 my ($self, $npc, $msg, $flags) = @_;
2420 my $dialog = $pl->{npc_dialog}; 2636 my $dialog = $pl->{npc_dialog};
2421 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2637 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2422 2638
2423 } else { 2639 } else {
2424 $msg = $npc->name . " says: $msg" if $npc; 2640 $msg = $npc->name . " says: $msg" if $npc;
2425 $self->message ($msg, $flags); 2641 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2426 } 2642 }
2427 } 2643 }
2428} 2644}
2429 2645
2430=item $object->send_msg ($channel, $msg, $color, [extra...]) 2646=item $object->send_msg ($channel, $msg, $color, [extra...])
2455 2671
2456=item $player_object->enter_link 2672=item $player_object->enter_link
2457 2673
2458Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2459 2675
2460The player should be reasonably safe there for short amounts of time. You 2676The player should be reasonably safe there for short amounts of time (e.g.
2461I<MUST> call C<leave_link> as soon as possible, though. 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2678though, as the player cannot control the character while it is on the link
2679map.
2462 2680
2463Will never block. 2681Will never block.
2464 2682
2465=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2466 2684
2486sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2487 my ($self) = @_; 2705 my ($self) = @_;
2488 2706
2489 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2490 2708
2709 ++$self->{_link_recursion};
2710
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2712
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2495 2715
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2717}
2498 2718
2499sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2501 2721
2518 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2520 2740
2521 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2524 2744
2525 $map->load; 2745 $map->load;
2526 $map->load_neighbours; 2746 $map->load_neighbours;
2527 2747
2528 return unless $self->contr->active; 2748 return unless $self->contr->active;
2529 $self->activate_recursive;
2530 2749
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2533} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2534 2757
2758}
2759
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2761
2537Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
2541be called at the end of this process. 2766be called at the end of this process.
2542 2767
2768Note that $check will be called with a potentially non-loaded map, so if
2769it needs a loaded map it has to call C<< ->load >>.
2770
2543=cut 2771=cut
2544 2772
2545our $GOTOGEN; 2773our $GOTOGEN;
2546 2774
2547sub cf::object::player::goto { 2775sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2549 2783
2550 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2786
2553 $self->enter_link; 2787 $self->enter_link;
2577 my $map = eval { 2811 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2579 2813
2580 if ($map) { 2814 if ($map) {
2581 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2817 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2819 }
2586 2820
2587 $map 2821 $map
2595 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2598 } 2832 }
2599 2833
2600 $done->() if $done; 2834 $done->($self) if $done;
2601 })->prio (1); 2835 })->prio (1);
2602} 2836}
2603 2837
2604=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2605 2839
2625} 2859}
2626 2860
2627sub prepare_random_map { 2861sub prepare_random_map {
2628 my ($exit) = @_; 2862 my ($exit) = @_;
2629 2863
2630 my $guard = cf::lock_acquire "exit_prepare:$exit";
2631
2632 # all this does is basically replace the /! path by 2864 # all this does is basically replace the /! path by
2633 # a new random map path (?random/...) with a seed 2865 # a new random map path (?random/...) with a seed
2634 # that depends on the exit object 2866 # that depends on the exit object
2635 2867
2636 my $rmp = parse_random_map_params $exit->msg; 2868 my $rmp = parse_random_map_params $exit->msg;
2638 if ($exit->map) { 2870 if ($exit->map) {
2639 $rmp->{region} = $exit->region->name; 2871 $rmp->{region} = $exit->region->name;
2640 $rmp->{origin_map} = $exit->map->path; 2872 $rmp->{origin_map} = $exit->map->path;
2641 $rmp->{origin_x} = $exit->x; 2873 $rmp->{origin_x} = $exit->x;
2642 $rmp->{origin_y} = $exit->y; 2874 $rmp->{origin_y} = $exit->y;
2875
2876 $exit->map->touch;
2643 } 2877 }
2644 2878
2645 $rmp->{random_seed} ||= $exit->random_seed; 2879 $rmp->{random_seed} ||= $exit->random_seed;
2646 2880
2647 my $data = cf::encode_json $rmp; 2881 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2648 my $md5 = Digest::MD5::md5_hex $data; 2882 my $md5 = Digest::MD5::md5_hex $data;
2649 my $meta = "$RANDOMDIR/$md5.meta"; 2883 my $meta = "$RANDOMDIR/$md5.meta";
2650 2884
2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2885 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2652 aio_write $fh, 0, (length $data), $data, 0; 2886 aio_write $fh, 0, (length $data), $data, 0;
2653 undef $fh; 2887 undef $fh;
2654 aio_rename "$meta~", $meta; 2888 aio_rename "$meta~", $meta;
2655 2889
2890 my $slaying = "?random/$md5";
2891
2892 if ($exit->valid) {
2656 $exit->slaying ("?random/$md5"); 2893 $exit->slaying ("?random/$md5");
2657 $exit->msg (undef); 2894 $exit->msg (undef);
2895 }
2658 } 2896 }
2659} 2897}
2660 2898
2661sub cf::object::player::enter_exit { 2899sub cf::object::player::enter_exit {
2662 my ($self, $exit) = @_; 2900 my ($self, $exit) = @_;
2663 2901
2664 return unless $self->type == cf::PLAYER; 2902 return unless $self->type == cf::PLAYER;
2665 2903
2666 if ($exit->slaying eq "/!") {
2667 #TODO: this should de-fi-ni-te-ly not be a sync-job
2668 # the problem is that $exit might not survive long enough
2669 # so it needs to be done right now, right here
2670 cf::sync_job { prepare_random_map $exit };
2671 }
2672
2673 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2674 my $hp = $exit->stats->hp;
2675 my $sp = $exit->stats->sp;
2676
2677 $self->enter_link; 2904 $self->enter_link;
2678 2905
2679 # if exit is damned, update players death & WoR home-position
2680 $self->contr->savebed ($slaying, $hp, $sp)
2681 if $exit->flag (FLAG_DAMNED);
2682
2683 (async { 2906 (async {
2684 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2907 $Coro::current->{desc} = "enter_exit";
2685 2908
2686 $self->deactivate_recursive; # just to be sure
2687 unless (eval { 2909 unless (eval {
2910 $self->deactivate_recursive; # just to be sure
2911
2912 # random map handling
2913 {
2914 my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916 prepare_random_map $exit
2917 if $exit->slaying eq "/!";
2918 }
2919
2920 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2921 my $x = $exit->stats->hp;
2922 my $y = $exit->stats->sp;
2923
2688 $self->goto ($slaying, $hp, $sp); 2924 $self->goto ($map, $x, $y);
2689 2925
2926 # if exit is damned, update players death & WoR home-position
2927 $self->contr->savebed ($map, $x, $y)
2928 if $exit->flag (cf::FLAG_DAMNED);
2929
2690 1; 2930 1
2691 }) { 2931 }) {
2692 $self->message ("Something went wrong deep within the crossfire server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2693 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2694 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2695 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2696 2936
2697 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2698 $self->leave_link; 2938 $self->leave_link;
2699 } 2939 }
2700 })->prio (1); 2940 })->prio (1);
2701} 2941}
2702 2942
2714sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2715 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2716 2956
2717 utf8::encode $text; 2957 utf8::encode $text;
2718 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2719} 2984}
2720 2985
2721=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2722 2987
2723Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
2727 2992
2728=cut 2993=cut
2729 2994
2730# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2731our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2732 "c/identify" => { 3003 "c/identify" => {
2733 id => "infobox", 3004 id => "infobox",
2734 title => "Identify", 3005 title => "Identify",
2735 reply => undef, 3006 reply => undef,
2736 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2738 "c/examine" => { 3009 "c/examine" => {
2739 id => "infobox", 3010 id => "infobox",
2740 title => "Examine", 3011 title => "Examine",
2741 reply => undef, 3012 reply => undef,
2742 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
2743 }, 3020 },
2744 "c/book" => { 3021 "c/book" => {
2745 id => "infobox", 3022 id => "infobox",
2746 title => "Book", 3023 title => "Book",
2747 reply => undef, 3024 reply => undef,
2763 id => "infobox", 3040 id => "infobox",
2764 title => "Body Parts", 3041 title => "Body Parts",
2765 reply => undef, 3042 reply => undef,
2766 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2767 }, 3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
3051 "c/skills" => {
3052 id => "infobox",
3053 title => "Skills",
3054 reply => undef,
3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
3080 },
2768 "c/uptime" => { 3081 "c/uptime" => {
2769 id => "infobox", 3082 id => "infobox",
2770 title => "Uptime", 3083 title => "Uptime",
2771 reply => undef, 3084 reply => undef,
2772 tooltip => "How long the server has been running since last restart", 3085 tooltip => "How long the server has been running since last restart",
2775 id => "infobox", 3088 id => "infobox",
2776 title => "Map Info", 3089 title => "Map Info",
2777 reply => undef, 3090 reply => undef,
2778 tooltip => "Information related to the maps", 3091 tooltip => "Information related to the maps",
2779 }, 3092 },
3093 "c/party" => {
3094 id => "party",
3095 title => "Party",
3096 reply => "gsay ",
3097 tooltip => "Messages and chat related to your party",
3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2780); 3107);
2781 3108
2782sub cf::client::send_msg { 3109sub cf::client::send_msg {
2783 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2784 3111
2785 $msg = $self->pl->expand_cfpod ($msg); 3112 $msg = $self->pl->expand_cfpod ($msg)
3113 unless $color & cf::NDI_VERBATIM;
2786 3114
2787 $color &= cf::NDI_CLIENT_MASK; # just in case... 3115 $color &= cf::NDI_CLIENT_MASK; # just in case...
2788 3116
2789 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2790 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2791 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2792 3120
2793 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2794 if $self->can_msg;
2795
2796 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2797 3123
2798 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2799 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2800 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2801 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2802 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2803 if $self->can_msg;
2804 } 3129 }
2805 3130
2806 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2807 } 3132 }
2808 3133
2809 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2810 3135
2811 if ($self->can_msg) {
2812 # default colour, mask it out 3136 # default colour, mask it out
2813 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2814 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2815 3139
2816 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3140 my $pkt = "msg "
3141 . $self->{json_coder}->encode (
2817 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2818 } else { 3143 );
2819 if ($color >= 0) {
2820 # replace some tags by gcfclient-compatible ones
2821 for ($msg) {
2822 1 while
2823 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2824 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2825 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2826 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2827 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2828 }
2829 3144
2830 $color &= cf::NDI_COLOR_MASK; 3145 $self->send_big_packet ($pkt);
2831
2832 utf8::encode $msg;
2833
2834 if (0 && $msg =~ /\[/) {
2835 # COMMAND/INFO
2836 $self->send_packet ("drawextinfo $color 10 8 $msg")
2837 } else {
2838 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2839 $self->send_packet ("drawinfo $color $msg")
2840 }
2841 }
2842 }
2843} 3146}
2844 3147
2845=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2846 3149
2847Sends an ext event to the client. 3150Sends an ext event to the client.
2850 3153
2851sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2852 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2853 3156
2854 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2856 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2857 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2859 } 3162 }
2860} 3163}
2861 3164
2862=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2863 3166
2867 3170
2868sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2869 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2870 3173
2871 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2872 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2873 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2874 #TODO: version 1, remove 3177 #TODO: version 1, remove
2875 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2877 } 3180 }
2878} 3181}
2879 3182
2880=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2881 3184
2952 3255
2953 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2954 if $reply; 3257 if $reply;
2955 3258
2956 } else { 3259 } else {
2957 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2958 } 3261 }
2959 3262
2960 cf::override; 3263 cf::override;
2961 }, 3264 },
2962); 3265);
2982 3285
2983 $coro 3286 $coro
2984} 3287}
2985 3288
2986cf::client->attach ( 3289cf::client->attach (
2987 on_destroy => sub { 3290 on_client_destroy => sub {
2988 my ($ns) = @_; 3291 my ($ns) = @_;
2989 3292
2990 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2991 }, 3294 },
2992); 3295);
3008our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3009 3312
3010$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3011 3314
3012$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3013 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3014 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3015 sort time 3318 sort time
3016)); 3319));
3017 3320
3018# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3021 3324
3022The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3023 3326
3024 cf::object 3327 cf::object
3025 contr pay_amount pay_player map x y force_find force_add destroy 3328 contr pay_amount pay_player map x y force_find force_add destroy
3026 insert remove name archname title slaying race decrease_ob_nr 3329 insert remove name archname title slaying race decrease split
3330 value
3027 3331
3028 cf::object::player 3332 cf::object::player
3029 player 3333 player
3030 3334
3031 cf::player 3335 cf::player
3036 3340
3037=cut 3341=cut
3038 3342
3039for ( 3343for (
3040 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3041 insert remove inv name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3042 decrease_ob_nr destroy)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3043 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3044 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3045 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3046) { 3350) {
3047 no strict 'refs';
3048 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3049 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3050 for @funs; 3353 for @funs;
3051} 3354}
3052 3355
3067 3370
3068 my $qcode = $code; 3371 my $qcode = $code;
3069 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3070 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3071 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3072 local $_; 3378 local $_;
3073 local @safe::cf::_safe_eval_args = values %vars;
3074 3379
3075 my $eval = 3380 my $eval =
3076 "do {\n" 3381 "do {\n"
3077 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3078 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3079 . $code 3384 . $code
3080 . "\n}" 3385 . "\n}"
3081 ; 3386 ;
3082 3387
3388 if ($CFG{safe_eval}) {
3083 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3084 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3085 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
3086 3397
3087 if ($@) { 3398 if ($@) {
3088 warn "$@"; 3399 warn "$@",
3089 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3090 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3091 } 3402 }
3092 3403
3093 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3094} 3405}
3095 3406
3109=cut 3420=cut
3110 3421
3111sub register_script_function { 3422sub register_script_function {
3112 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3113 3424
3114 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3115 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3116} 3427}
3117 3428
3118=back 3429=back
3119 3430
3120=cut 3431=cut
3129 # for this (global event?) 3440 # for this (global event?)
3130 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3131 3442
3132 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3133 3444
3134 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3135 3446
3136 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3137 0 < aio_load $path, $facedata
3138 or die "$path: $!";
3139
3140 $facedata = Coro::Storable::thaw $facedata;
3141 3448
3142 $facedata->{version} == 2 3449 $facedata->{version} == 2
3143 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3144 3451
3145 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3146 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3147 type => FT_RSRC, 3455 type => FT_RSRC,
3148 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3149 }; 3458 };
3150 cf::cede_to_tick; 3459 cf::cede_to_tick;
3151 3460
3152 { 3461 {
3153 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3155 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3156 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3157 3466
3158 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3159 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3160 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3161 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3162 3472
3163 cf::cede_to_tick; 3473 cf::cede_to_tick;
3164 } 3474 }
3165 3475
3166 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3171 3481
3172 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3173 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3174 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3175 } else { 3485 } else {
3176 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3177 } 3487 }
3178 3488
3179 cf::cede_to_tick; 3489 cf::cede_to_tick;
3180 } 3490 }
3181 } 3491 }
3190 3500
3191 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3192 } 3502 }
3193 3503
3194 { 3504 {
3195 # TODO: for gcfclient pleasure, we should give resources
3196 # that gcfclient doesn't grok a >10000 face index.
3197 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3198 3506
3199 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3200 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3201 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3202 my $data;
3203 3510
3204 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3205 # prepend meta info
3206
3207 my $meta = $enc->encode ({
3208 name => $name,
3209 %{ $info->{meta} || {} },
3210 });
3211
3212 $data = pack "(w/a*)*", $meta, $info->{data};
3213 } else {
3214 $data = $info->{data};
3215 }
3216
3217 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3218 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3219 } else { 3513 } else {
3220 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3221 } 3515 }
3222 3516
3223 cf::cede_to_tick; 3517 cf::cede_to_tick;
3224 } 3518 }
3225 } 3519 }
3226 3520
3227 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3228 3522
3229 1 3523 1
3230} 3524}
3231
3232cf::global->attach (on_resource_update => sub {
3233 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3234 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3235
3236 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3237 my $sound = $soundconf->{compat}[$_]
3238 or next;
3239
3240 my $face = cf::face::find "sound/$sound->[1]";
3241 cf::sound::set $sound->[0] => $face;
3242 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3243 }
3244
3245 while (my ($k, $v) = each %{$soundconf->{event}}) {
3246 my $face = cf::face::find "sound/$v";
3247 cf::sound::set $k => $face;
3248 }
3249 }
3250});
3251 3525
3252register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3253 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3254 3528
3255 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3256 $ns->fx_want ($k, $v); 3530 $ns->fx_want ($k, $v);
3257 } 3531 }
3258}; 3532};
3533
3534sub load_resource_file($) {
3535 my $guard = lock_acquire "load_resource_file";
3536
3537 my $status = load_resource_file_ $_[0];
3538 get_slot 0.1, 100;
3539 cf::arch::commit_load;
3540
3541 $status
3542}
3259 3543
3260sub reload_regions { 3544sub reload_regions {
3261 # HACK to clear player env face cache, we need some signal framework 3545 # HACK to clear player env face cache, we need some signal framework
3262 # for this (global event?) 3546 # for this (global event?)
3263 %ext::player_env::MUSIC_FACE_CACHE = (); 3547 %ext::player_env::MUSIC_FACE_CACHE = ();
3277} 3561}
3278 3562
3279sub reload_archetypes { 3563sub reload_archetypes {
3280 load_resource_file "$DATADIR/archetypes" 3564 load_resource_file "$DATADIR/archetypes"
3281 or die "unable to load archetypes\n"; 3565 or die "unable to load archetypes\n";
3282 #d# NEED to laod twice to resolve forward references
3283 # this really needs to be done in an extra post-pass
3284 # (which needs to be synchronous, so solve it differently)
3285 load_resource_file "$DATADIR/archetypes"
3286 or die "unable to load archetypes\n";
3287} 3566}
3288 3567
3289sub reload_treasures { 3568sub reload_treasures {
3290 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3291 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3292} 3571}
3293 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3294sub reload_resources { 3593sub reload_resources {
3295 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3296 3595
3596 reload_exp_table;
3597 reload_materials;
3598 reload_facedata;
3599 reload_sound;
3600 reload_archetypes;
3297 reload_regions; 3601 reload_regions;
3298 reload_facedata;
3299 #reload_archetypes;#d#
3300 reload_archetypes;
3301 reload_treasures; 3602 reload_treasures;
3302 3603
3303 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3304}
3305
3306sub init {
3307 reload_resources;
3308} 3605}
3309 3606
3310sub reload_config { 3607sub reload_config {
3311 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3312 or return;
3313 3609
3314 local $/; 3610 my $config = load_file "$CONFDIR/config";
3315 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3316 3613
3317 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3318 3615
3319 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3320 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3321 3618
3322 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3326 }; 3623 };
3327 warn $@ if $@; 3624 warn $@ if $@;
3328 } 3625 }
3329} 3626}
3330 3627
3628sub pidfile() {
3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3630 or die "$PIDFILE: $!";
3631 flock $fh, &Fcntl::LOCK_EX
3632 or die "$PIDFILE: flock: $!";
3633 $fh
3634}
3635
3636# make sure only one server instance is running at any one time
3637sub atomic {
3638 my $fh = pidfile;
3639
3640 my $pid = <$fh>;
3641 kill 9, $pid if $pid > 0;
3642
3643 seek $fh, 0, 0;
3644 print $fh $$;
3645}
3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3331sub main { 3656sub main {
3657 cf::init_globals; # initialise logging
3658
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665
3332 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3333 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3334 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3335 (async { 3669 (async {
3336 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3337 EV::loop EV::LOOP_ONESHOT; 3671 EV::loop EV::LOOP_ONESHOT;
3338 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3339 }; 3673 };
3340 3674
3675 evthread_start IO::AIO::poll_fileno;
3676
3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3686 reload_resources;
3341 reload_config; 3687 reload_config;
3342 db_init; 3688 db_init;
3689
3690 cf::init_uuid;
3691 cf::init_signals;
3692 cf::init_skills;
3693
3694 cf::init_beforeplay;
3695
3696 atomic;
3697
3343 load_extensions; 3698 load_extensions;
3344 3699
3345 $TICK_WATCHER->start; 3700 utime time, time, $RUNTIMEFILE;
3346 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3701
3347 EV::loop; 3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3705
3706 cf::_post_init 0;
3707 };
3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3348} 3718}
3349 3719
3350############################################################################# 3720#############################################################################
3351# initialisation and cleanup 3721# initialisation and cleanup
3352 3722
3353# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3354BEGIN { 3724BEGIN {
3355 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3356 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3357 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3358 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3359 }; 3729 };
3360 } 3730 }
3361} 3731}
3362 3732
3363sub write_runtime { 3733sub write_runtime_sync {
3364 my $runtime = "$LOCALDIR/runtime"; 3734 my $t0 = AE::time;
3365 3735
3366 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3367 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3368 3738
3369 IO::AIO::aio_utime $runtime, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3370 3740
3371 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3372 3742
3373 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3374 or return; 3744 or return;
3375 3745
3376 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3377 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3378 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3388 aio_utime $fh, undef, undef; 3758 aio_utime $fh, undef, undef;
3389 3759
3390 close $fh 3760 close $fh
3391 or return; 3761 or return;
3392 3762
3393 aio_rename "$runtime~", $runtime 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3394 and return; 3764 and return;
3395 3765
3396 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3397 3767
3398 1 3768 1
3769}
3770
3771our $uuid_lock;
3772our $uuid_skip;
3773
3774sub write_uuid_sync($) {
3775 $uuid_skip ||= $_[0];
3776
3777 return if $uuid_lock;
3778 local $uuid_lock = 1;
3779
3780 my $uuid = "$LOCALDIR/uuid";
3781
3782 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3783 or return;
3784
3785 my $value = uuid_seq uuid_cur;
3786
3787 unless ($value) {
3788 info "cowardly refusing to write zero uuid value!\n";
3789 return;
3790 }
3791
3792 my $value = uuid_str $value + $uuid_skip;
3793 $uuid_skip = 0;
3794
3795 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3796 and return;
3797
3798 # always fsync - this file is important
3799 aio_fsync $fh
3800 and return;
3801
3802 close $fh
3803 or return;
3804
3805 aio_rename "$uuid~", $uuid
3806 and return;
3807
3808 trace "uuid file written ($value).\n";
3809
3810 1
3811
3812}
3813
3814sub write_uuid($$) {
3815 my ($skip, $sync) = @_;
3816
3817 $sync ? write_uuid_sync $skip
3818 : async { write_uuid_sync $skip };
3399} 3819}
3400 3820
3401sub emergency_save() { 3821sub emergency_save() {
3402 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3403 3823
3404 warn "enter emergency perl save\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3405 3830
3406 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3407 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3408 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3409 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3410 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3411 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3412 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3413 $pl->valid or next; 3840 $pl->valid or next;
3414 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3415 $pl->save; 3842 $pl->save;
3416 } 3843 }
3417 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3418 3845
3419 warn "begin emergency map save\n"; 3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 info "emergency_perl_save: begin map save\n";
3420 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3421 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3422 $map->valid or next; 3851 $map->valid or next;
3423 $map->save; 3852 $map->save;
3424 } 3853 }
3425 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3426 3855
3427 warn "begin emergency database checkpoint\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin database checkpoint\n";
3428 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3429 warn "end emergency database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3861
3862 info "emergency_perl_save: begin write uuid\n";
3863 write_uuid_sync 1;
3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3430 }; 3884 };
3431 3885
3432 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3433} 3887}
3434 3888
3435sub post_cleanup { 3889sub post_cleanup {
3436 my ($make_core) = @_; 3890 my ($make_core) = @_;
3437 3891
3892 IO::AIO::flush;
3893
3438 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3439 if $make_core; 3895 if $make_core;
3896
3897 my $fh = pidfile;
3898 unlink $PIDFILE if <$fh> == $$;
3899}
3900
3901# a safer delete_package, copied from Symbol
3902sub clear_package($) {
3903 my $pkg = shift;
3904
3905 # expand to full symbol table name if needed
3906 unless ($pkg =~ /^main::.*::$/) {
3907 $pkg = "main$pkg" if $pkg =~ /^::/;
3908 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3909 $pkg .= '::' unless $pkg =~ /::$/;
3910 }
3911
3912 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3913 my $stem_symtab = *{$stem}{HASH};
3914
3915 defined $stem_symtab and exists $stem_symtab->{$leaf}
3916 or return;
3917
3918 # clear all symbols
3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3920 for my $name (keys %$leaf_symtab) {
3921 _gv_clear *{"$pkg$name"};
3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3923 }
3440} 3924}
3441 3925
3442sub do_reload_perl() { 3926sub do_reload_perl() {
3443 # can/must only be called in main 3927 # can/must only be called in main
3444 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3445 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3446 return; 3930 return;
3447 } 3931 }
3448 3932
3449 warn "reloading..."; 3933 return if $RELOAD++;
3450 3934
3451 warn "entering sync_job"; 3935 my $t1 = AE::time;
3452 3936
3937 while ($RELOAD) {
3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3940
3941 trace "perl_reload: entering sync_job";
3942
3453 cf::sync_job { 3943 cf::sync_job {
3454 cf::write_runtime; # external watchdog should not bark
3455 cf::emergency_save; 3944 #cf::emergency_save;
3456 cf::write_runtime; # external watchdog should not bark
3457 3945
3458 warn "syncing database to disk";
3459 BDB::db_env_txn_checkpoint $DB_ENV;
3460
3461 # if anything goes wrong in here, we should simply crash as we already saved
3462
3463 warn "flushing outstanding aio requests";
3464 for (;;) {
3465 BDB::flush;
3466 IO::AIO::flush;
3467 Coro::cede_notself;
3468 last unless IO::AIO::nreqs || BDB::nreqs;
3469 warn "iterate...";
3470 }
3471
3472 ++$RELOAD;
3473
3474 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3475 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3476 %EXT_CORO = (); 3948 %EXT_CORO = ();
3477 3949
3478 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3479 %COMMAND = (); 3951 %COMMAND = ();
3480 3952
3481 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3482 %EXTCMD = (); 3954 %EXTCMD = ();
3483 %EXTICMD = (); 3955 %EXTICMD = ();
3484 3956
3485 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3486 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3487 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3488 3960
3489 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3490 eval { 3962 eval {
3491 $cb->($pkg); 3963 $cb->($pkg);
3492 1 3964 1
3493 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3966 }
3967
3968 trace "... clearing $pkg";
3969 clear_package $pkg;
3494 } 3970 }
3495 3971
3496 warn "... nuking $pkg";
3497 Symbol::delete_package $pkg;
3498 }
3499
3500 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3501 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3502 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3503 3975
3504 warn "... unloading $k"; 3976 trace "... unloading $k";
3505 delete $INC{$k}; 3977 delete $INC{$k};
3506 3978
3507 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3508 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3509 3981
3510 if (my $cb = $k->can ("unload_module")) { 3982 if (my $cb = $k->can ("unload_module")) {
3511 $cb->(); 3983 $cb->();
3984 }
3985
3986 clear_package $k;
3512 } 3987 }
3513 3988
3514 Symbol::delete_package $k;
3515 }
3516
3517 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3518 Symbol::delete_package "safe::$_" 3990 clear_package "safe::$_"
3519 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3520 3992
3521 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3522 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3523 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3524 3996
3525 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3526 # and global variables created in xs 3998 # and global variables created in xs
3527 #Symbol::delete_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3528 4000
3529 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3530 4002
3531 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3532 require cf; 4004 require cf;
3533 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3534 4006
3535 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3536 cf::reload_config; 4008 cf::reload_config;
3537 4009
3538 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3539 cf::load_extensions; 4011 cf::load_extensions;
3540 4012
4013 if ($REATTACH_ON_RELOAD) {
3541 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3542 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3543 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3544 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3545 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3546 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3547 4021
3548 warn "leaving sync_job"; 4022 cf::_post_init 1;
3549 4023
4024 trace "perl_reload: leaving sync_job";
4025
3550 1 4026 1
3551 } or do { 4027 } or do {
3552 warn $@; 4028 error $@;
3553 warn "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3554 exit 1; 4030 };
4031
4032 --$RELOAD;
3555 }; 4033 }
3556 4034
3557 warn "reloaded"; 4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3558}; 4037};
3559 4038
3560our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3561 4040
3562sub reload_perl() { 4041sub reload_perl() {
3563 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3564 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3565 4044
4045 $RELOAD_WATCHER ||= cf::async {
4046 Coro::AIO::aio_wait cache_extensions;
4047
3566 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4049 do_reload_perl;
3567 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3568 do_reload_perl; 4051 };
3569 }; 4052 };
3570} 4053}
3571 4054
3572register_command "reload" => sub { 4055register_command "reload" => sub {
3573 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3579 reload_perl; 4062 reload_perl;
3580 }; 4063 };
3581 } 4064 }
3582}; 4065};
3583 4066
3584unshift @INC, $LIBDIR; 4067#############################################################################
3585 4068
3586my $bug_warning = 0; 4069my $bug_warning = 0;
3587 4070
3588our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3589our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3590 4073
3591sub wait_for_tick { 4074sub wait_for_tick() {
3592 return unless $TICK_WATCHER->is_active;
3593 return if $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3594 4076
3595 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3596 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3597 $signal->wait; 4079 $signal->wait;
3598} 4080}
3599 4081
3600sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3601 return unless $TICK_WATCHER->is_active;
3602 return if $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3603 4084
3604 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3605 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3606 $signal->wait; 4087 $signal->wait;
3607} 4088}
3608 4089
3609$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4090sub tick {
3610 if ($Coro::current != $Coro::main) { 4091 if ($Coro::current != $Coro::main) {
3611 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4092 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3612 unless ++$bug_warning > 10; 4093 unless ++$bug_warning > 10;
3613 return; 4094 return;
3614 } 4095 }
3615 4096
3616 $NOW = $tick_start = EV::now;
3617
3618 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3619 4098
3620 $RUNTIME += $TICK; 4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3621 $NEXT_TICK = $_[0]->at;
3622 4100
3623 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3624 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3625 Coro::async_pool { 4103 Coro::async_pool {
3626 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3627 write_runtime 4105 write_runtime_sync
3628 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3629 }; 4107 };
3630 } 4108 }
3631 4109
3632 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3633 $sig->send; 4111 $sig->send;
3634 } 4112 }
3635 while (my $sig = shift @WAIT_FOR_TICK) { 4113 while (my $sig = shift @WAIT_FOR_TICK) {
3636 $sig->send; 4114 $sig->send;
3637 } 4115 }
3638 4116
3639 $LOAD = ($NOW - $tick_start) / $TICK; 4117 $LOAD = ($NOW - $TICK_START) / $TICK;
3640 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3641 4119
3642 _post_tick; 4120 if (0) {
3643}; 4121 if ($NEXT_TICK) {
3644$TICK_WATCHER->priority (EV::MAXPRI); 4122 my $jitter = $TICK_START - $NEXT_TICK;
4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4124 debug "jitter $JITTER\n";#d#
4125 }
4126 }
4127}
3645 4128
3646{ 4129{
3647 # configure BDB 4130 # configure BDB
3648 4131
3649 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3650 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3651 $Coro::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3652 4135
3653 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3654 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3655 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3656 | BDB::LOG_AUTOREMOVE, 1); 4139 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4140 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3657 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4141 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3658 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4142 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3659 4143
3660 cf::sync_job { 4144 cf::sync_job {
3661 eval { 4145 eval {
3687{ 4171{
3688 # configure IO::AIO 4172 # configure IO::AIO
3689 4173
3690 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3691 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3692 $Coro::AIO::WATCHER->priority (1); 4176 undef $AnyEvent::AIO::WATCHER;
3693} 4177}
3694 4178
3695my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3696 4181
3697sub _log_backtrace { 4182sub _log_backtrace {
3698 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3699 4184
3700 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3701 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3702 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3703 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3704 ++$_log_backtrace; 4193 ++$_log_backtrace;
4194 my $perl_bt = Carp::longmess $msg;
3705 async { 4195 async {
3706 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3707 4197
3708 my @bt = fork_call { 4198 my @bt = fork_call {
3709 @addr = map { sprintf "%x", $_ } @addr; 4199 @addr = map { sprintf "%x", $_ } @addr;
3720 } 4210 }
3721 4211
3722 @funcs 4212 @funcs
3723 }; 4213 };
3724 4214
3725 LOG llevInfo, "[ABT] $msg\n"; 4215 LOG llevInfo, "[ABT] $perl_bt\n";
4216 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3726 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3727 --$_log_backtrace; 4218 --$_log_backtrace;
3728 }; 4219 };
3729 } else { 4220 } else {
3730 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3731 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3732 } 4223 }
3733} 4224}
3734 4225
3735# load additional modules 4226# load additional modules
3736use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3737 4229
3738END { cf::emergency_save } 4230END { cf::emergency_save }
3739 4231
37401 42321
3741 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines