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.415 by root, Thu Apr 10 15:35:16 2008 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 75
65$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" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
92our %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;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
107 134
108our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 136our $RUNTIME;
110our $NOW; 137our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 148our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
123 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 :)
155
124binmode STDOUT; 156binmode STDOUT;
125binmode STDERR; 157binmode STDERR;
126 158
127# read virtual server time, if available 159# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
132} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
133 167
134mkdir $_ 168mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 170
137our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
138 172
139sub 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::"} };
140 189
141############################################################################# 190#############################################################################
142 191
143=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
144 193
186from wherever your confdir points to. 235from wherever your confdir points to.
187 236
188=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
189 238
190These 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
191returns 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
192per 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.
193 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
194=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
195 249
196This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 252that call.
199 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
200=back 260=back
201 261
202=cut 262=cut
203 263
204BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
205 *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 {
206 my $msg = join "", @_; 271 my $msg = join "", @_;
207 272
208 $msg .= "\n" 273 $msg .= "\n"
209 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
210 275
211 $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;
212 277
213 LOG llevError, $msg; 278 LOG llevWarn, $msg;
214 }; 279};
215}
216 280
217$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
219 283
220 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 288 return;#d#
223 }#d# 289 }#d#
224 290
225 # kill coroutine otherwise 291 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 292 Coro::terminate
228}; 293};
229
230$SIG{__DIE__} = sub { }; #d#?
231 294
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 305for my $pkg (qw(
243 cf::global cf::attachable 306 cf::global cf::attachable
244 cf::object cf::object::player 307 cf::object cf::object::player
245 cf::client cf::player 308 cf::client cf::player
246 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
247 cf::map cf::party cf::region 311 cf::party cf::region
248)) { 312)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 314}
252 315
253$EV::DIED = sub { 316$EV::DIED = sub {
254 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
255}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
256 324
257############################################################################# 325#############################################################################
258 326
259=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
260 328
281 $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;
282 $d 350 $d
283 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
284} 352}
285 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
286=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
287 369
288Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
289 371
290=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
296our $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
297 379
298sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 445=item cf::lock_wait $string
302 446
303Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
304 448
305=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
306 450
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
310returned. 454returned.
311 455
312Locks 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
313deadlocked coro. 457deadlocked coro.
319 463
320Return 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.
321 465
322=cut 466=cut
323 467
324our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 469
327sub lock_wait($) { 470sub lock_wait($) {
328 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 472}
341 473
342sub lock_acquire($) { 474sub lock_acquire($) {
343 my ($key) = @_; 475 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 476}
357 477
358sub lock_active($) { 478sub lock_active($) {
359 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 480}
363 481
364sub freeze_mainloop { 482sub freeze_mainloop {
365 tick_inhibit_inc; 483 tick_inhibit_inc;
366 484
367 Coro::guard \&tick_inhibit_dec; 485 &Guard::guard (\&tick_inhibit_dec);
368} 486}
369 487
370=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
371 489
372Like 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
373get spread over timer. 491get spread over time.
374 492
375=cut 493=cut
376 494
377sub periodic($$) { 495sub periodic($$) {
378 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
383} 501}
384 502
385=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
386 504
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
388This 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
389of 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.
390 512
391The 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
392used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
393 515
394Useful for short background jobs. 516Useful for short background jobs.
395 517
396=cut 518=cut
397 519
398our @SLOT_QUEUE; 520our @SLOT_QUEUE;
399our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
400 523
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
404 527
405 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
406 530
407 while () { 531 while () {
408 next_job: 532 next_job:
533
409 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 535
411 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 540 $job->[2]->send;
415 Coro::cede; 541 Coro::cede;
416 goto next_job; 542 goto next_job;
417 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 545 }
419 } 546 }
420 547
421 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 551 $signal->wait;
425 } else { 552 } else {
553 $busy = 0;
426 Coro::schedule; 554 Coro::schedule;
427 } 555 }
428 } 556 }
429}; 557};
430 558
431sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
432 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
433 563
434 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
435 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
436 567
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
465=cut 596=cut
466 597
467sub sync_job(&) { 598sub sync_job(&) {
468 my ($job) = @_; 599 my ($job) = @_;
469 600
470 if ($Coro::current == $Coro::main) { 601 if (in_main) {
471 my $time = EV::time; 602 my $time = AE::time;
472 603
473 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
475 606
476 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
477 608
478 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
479 610
480 my $busy = 1; 611 my $busy = 1;
481 my @res; 612 my @res;
482 613
483 (async { 614 (async {
484 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
485 @res = eval { $job->() }; 616 @res = eval { $job->() };
486 warn $@ if $@; 617 error $@ if $@;
487 undef $busy; 618 undef $busy;
488 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
489 620
490 while ($busy) { 621 while ($busy) {
491 if (Coro::nready) { 622 if (Coro::nready) {
493 } else { 624 } else {
494 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
495 } 626 }
496 } 627 }
497 628
498 my $time = EV::time - $time; 629 my $time = AE::time - $time;
499 630
500 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
501 632
502 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
503 } else { 634 } else {
525 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
526 657
527 $coro 658 $coro
528} 659}
529 660
530=item fork_call { }, $args 661=item fork_call { }, @args
531 662
532Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
533process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
534Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
535never block itself or use any form of event handling. 666never block itself or use any form of event handling.
536 667
537=cut 668=cut
538 669
670sub post_fork {
671 reset_signals;
672}
673
539sub fork_call(&@) { 674sub fork_call(&@) {
540 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
541 676
542 # 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,
543 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
544 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
545 680
546 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
547 reset_signals; 682 cf::post_fork;
548 &$cb 683 &$cb
549 }, @args; 684 } @args;
550 685
551 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 )
552} 698}
553 699
554=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
555 701
556=cut 702=cut
593within each server. 739within each server.
594 740
595=cut 741=cut
596 742
597sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
598 my ($name) = @_; 747 my ($name) = @_;
599 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
600 749
601 eval { 750 eval {
602 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
612} 761}
613 762
614our $DB; 763our $DB;
615 764
616sub db_init { 765sub db_init {
617 cf::sync_job {
618 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
619 };
620} 767}
621 768
622sub db_get($$) { 769sub db_get($$) {
623 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
624 771
625 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
626 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
627 776
628 $! ? () 777 $! ? ()
629 : $data 778 : $data
630 }
631} 779}
632 780
633sub db_put($$$) { 781sub db_put($$$) {
634 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
635 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
663 811
664 my @data; 812 my @data;
665 my $md5; 813 my $md5;
666 814
667 for (0 .. $#$src) { 815 for (0 .. $#$src) {
668 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
669 or Carp::croak "$src->[$_]: $!";
670 } 817 }
671 818
672 # if processing is expensive, check 819 # if processing is expensive, check
673 # checksum first 820 # checksum first
674 if (1) { 821 if (1) {
691 838
692 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
693 my $data = $process->(\@data); 840 my $data = $process->(\@data);
694 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
695 842
696 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
697 844
698 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
699 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
700 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
701 848
711 858
712=cut 859=cut
713 860
714sub datalog($@) { 861sub datalog($@) {
715 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
716 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
717} 864}
718 865
719=back 866=back
720 867
721=cut 868=cut
722 869
723############################################################################# 870#############################################################################
724 871
725=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
726 873
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
730 877
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
783 930
784Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
786 933
787Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 936
790These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
791 938
792=over 4 939=over 4
916 1063
917 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
918 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
919 1066
920 } elsif (ref $type) { 1067 } elsif (ref $type) {
921 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
922 1069
923 } else { 1070 } else {
924 shift @arg; 1071 shift @arg;
925 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
926 } 1073 }
927 } 1074 }
928} 1075}
929 1076
930sub _object_attach { 1077sub _object_attach {
940 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
941 } 1088 }
942 1089
943 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
944 } else { 1091 } else {
945 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
946 } 1093 }
947 1094
948 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
949} 1096}
950 1097
1009 1156
1010 for (@$callbacks) { 1157 for (@$callbacks) {
1011 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1012 1159
1013 if ($@) { 1160 if ($@) {
1014 warn "$@";
1015 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1016 override; 1162 override;
1017 } 1163 }
1018 1164
1019 return 1 if $override; 1165 return 1 if $override;
1020 } 1166 }
1083 1229
1084sub reattach { 1230sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1232 my ($obj) = @_;
1087 1233
1234 # no longer needed after getting rid of delete_package?
1088 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
1089 1236
1090 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1091 1238
1092 @$registry = (); 1239 @$registry = ();
1093 1240
1098 for (@$attach) { 1245 for (@$attach) {
1099 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1100 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1101 } 1248 }
1102 } else { 1249 } else {
1103 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1104 } 1251 }
1105 } 1252 }
1106} 1253}
1107 1254
1108cf::attachable->attach ( 1255cf::attachable->attach (
1135 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1136 1283
1137 sync_job { 1284 sync_job {
1138 if (length $$rdata) { 1285 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1142 1290
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1298 aio_close $fh;
1148 1299
1149 if (@$objs) { 1300 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1309 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1311 }
1158 } else { 1312 } else {
1159 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1160 } 1314 }
1161 1315
1162 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1320 } else {
1164 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1165 } 1322 }
1166 } else { 1323 } else {
1167 aio_unlink $filename; 1324 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1169 } 1326 }
1193 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1194 $av = $st->{objs}; 1351 $av = $st->{objs};
1195 } 1352 }
1196 1353
1197 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1200 1358
1201 ($data, $av) 1359 ($data, $av)
1202} 1360}
1203 1361
1204=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1260 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1261 1419
1262 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1263} 1421}
1264 1422
1423use File::Glob ();
1424
1265cf::player->attach ( 1425cf::player->attach (
1266 on_command => sub { 1426 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1268 1428
1269 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1270 or return; 1430 or return;
1271 1431
1294 1454
1295 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1296 if $reply; 1456 if $reply;
1297 1457
1298 } else { 1458 } else {
1299 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1300 } 1460 }
1301 1461
1302 cf::override; 1462 cf::override;
1303 }, 1463 },
1304); 1464);
1305 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
1306sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1307 cf::sync_job { 1482 cf::sync_job {
1308 my %todo; 1483 my %todo;
1309 1484
1310 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1311 next unless -r $path; 1486 next unless -r $path;
1329 1504
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1507
1333 $ext{source} = 1508 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1335 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1336 . $source 1511 . $source
1337 . "\n};\n1"; 1512 . "\n};\n1";
1338 1513
1339 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1340 } 1515 }
1341 1516
1517 my $pass = 0;
1342 my %done; 1518 my %done;
1343 while (%todo) { 1519 while (%todo) {
1344 my $progress; 1520 my $progress;
1345 1521
1522 ++$pass;
1523
1524 ext:
1346 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1527 next ext
1349 unless exists $done{$_}; 1528 unless exists $done{$_};
1350 } 1529 }
1351 1530
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1532
1354 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1537
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1539 if exists $v->{meta}{mandatory};
1362 1540
1363 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1364 } 1550 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1551 }
1370 1552
1371 skip: 1553 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1561 }
1375 }; 1562 };
1376} 1563}
1377 1564
1378############################################################################# 1565#############################################################################
1379 1566
1380=back 1567=back
1381 1568
1382=head2 CORE EXTENSIONS 1569=head2 CORE EXTENSIONS
1383 1570
1384Functions and methods that extend core crossfire objects. 1571Functions and methods that extend core deliantra objects.
1385 1572
1386=cut 1573=cut
1387 1574
1388package cf::player; 1575package cf::player;
1389 1576
1432 1619
1433sub exists($) { 1620sub exists($) {
1434 my ($login) = @_; 1621 my ($login) = @_;
1435 1622
1436 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1438} 1625}
1439 1626
1440sub find($) { 1627sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1629 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1641 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1642 or return;
1456 1643
1457 my $pl = cf::player::load_pl $f 1644 my $pl = cf::player::load_pl $f
1458 or return; 1645 or return;
1646
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1647 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1648 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1462 } 1650 }
1463 } 1651 }
1464} 1652}
1465 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
1466sub save($) { 1667sub save($) {
1467 my ($pl) = @_; 1668 my ($pl) = @_;
1468 1669
1469 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1470 1671
1473 1674
1474 return if $pl->{deny_save}; 1675 return if $pl->{deny_save};
1475 1676
1476 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1477 $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];
1478 1684
1479 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1686 cf::cede_to_tick;
1481} 1687}
1482 1688
1514 my ($pl) = @_; 1720 my ($pl) = @_;
1515 1721
1516 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1517 1723
1518 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1519 $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
1520 1726
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1728 $pl->deactivate;
1729
1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1524 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1525 1735
1526 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1566 1776
1567 for my $login (@$dirs) { 1777 for my $login (@$dirs) {
1568 my $path = path $login; 1778 my $path = path $login;
1569 1779
1570 # a .pst is a dead give-away for a valid player 1780 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1781 # if no pst file found, open and chekc for blocked users
1782 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1783 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1784 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1785 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1786 }
1576 1787
1580 1791
1581 \@logins 1792 \@logins
1582} 1793}
1583 1794
1584=item $player->maps 1795=item $player->maps
1796
1797=item cf::player::maps $login
1585 1798
1586Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1587player. May block. 1800player. May block.
1588 1801
1589=cut 1802=cut
1607 } 1820 }
1608 1821
1609 \@paths 1822 \@paths
1610} 1823}
1611 1824
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1825=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1826
1614Expand crossfire pod fragments into protocol xml. 1827Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1828
1705=item $player->ext_reply ($msgid, @msg) 1829=item $player->ext_reply ($msgid, @msg)
1706 1830
1707Sends an ext reply to the player. 1831Sends an ext reply to the player.
1708 1832
1740 1864
1741=cut 1865=cut
1742 1866
1743sub find_by_path($) { 1867sub find_by_path($) {
1744 my ($path) = @_; 1868 my ($path) = @_;
1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1745 1871
1746 my ($match, $specificity); 1872 my ($match, $specificity);
1747 1873
1748 for my $region (list) { 1874 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1775our $MAX_RESET = 3600; 1901our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1902our $DEFAULT_RESET = 3000;
1777 1903
1778sub generate_random_map { 1904sub generate_random_map {
1779 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1780 # mit "rum" bekleckern, nicht 1906
1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1908
1781 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1789 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1790 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1791 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1792 (cf::region::find $rmp->{region}), $rmp->{custom}
1793 )
1794} 1910}
1795 1911
1796=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1797 1913
1798Register 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
1803 1919
1804sub register { 1920sub register {
1805 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1806 my $pkg = caller; 1922 my $pkg = caller;
1807 1923
1808 no strict;
1809 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1810 1925
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1927}
1813 1928
1814# also paths starting with '/' 1929# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1931
1817sub thawer_merge { 1932sub thawer_merge {
1818 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1819 1934
1820 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1825} 1940}
1826 1941
1827sub normalise { 1942sub normalise {
1828 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1829 1944
1830 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1831 1946
1832 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1833 1948
1834 # map plan: 1949 # map plan:
1835 # 1950 #
1850 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1851 $path = "$base/$path"; 1966 $path = "$base/$path";
1852 } 1967 }
1853 1968
1854 for ($path) { 1969 for ($path) {
1855 redo if s{//}{/};
1856 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1857 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1858 } 1972 }
1859 1973
1860 $path 1974 $path
1874 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1875 return $self; 1989 return $self;
1876 } 1990 }
1877 } 1991 }
1878 1992
1879 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1880 () 1994 ()
1881} 1995}
1882 1996
1883sub init { 1997sub init {
1884 my ($self) = @_; 1998 my ($self) = @_;
1906 2020
1907# the temporary/swap location 2021# the temporary/swap location
1908sub save_path { 2022sub save_path {
1909 my ($self) = @_; 2023 my ($self) = @_;
1910 2024
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2025 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 2026 "$TMPDIR/$path.map"
1913} 2027}
1914 2028
1915# the unique path, undef == no special unique path 2029# the unique path, undef == no special unique path
1916sub uniq_path { 2030sub uniq_path {
1917 my ($self) = @_; 2031 my ($self) = @_;
1918 2032
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 2035}
1931 2036
1932sub decay_objects { 2037sub decay_objects {
1933 my ($self) = @_; 2038 my ($self) = @_;
1934 2039
2016 2121
2017sub find; 2122sub find;
2018sub find { 2123sub find {
2019 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2020 2125
2126 cf::cede_to_tick;
2127
2021 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
2022 2129
2023 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2132
2026 $cf::MAP{$path} || do { 2133 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2134 my $map = new_from_path cf::map $path
2031 or return; 2135 or return;
2032 2136
2033 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
2034 2138
2036 or return; 2140 or return;
2037 2141
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2142 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2143 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2144 #$cf::WAIT_FOR_TICK->wait;
2145 undef $guard2;
2041 undef $guard1; 2146 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2147 $map->reset;
2044 return find $path; 2148 return find $path;
2045 } 2149 }
2046 2150
2047 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
2048 } 2152 }
2049} 2153}
2050 2154
2051sub pre_load { } 2155sub pre_load { }
2052sub post_load { } 2156#sub post_load { } # XS
2053 2157
2054sub load { 2158sub load {
2055 my ($self) = @_; 2159 my ($self) = @_;
2056 2160
2057 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2178 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2179 $f->skip_block;
2076 $self->_load_objects ($f) 2180 $self->_load_objects ($f)
2077 or return; 2181 or return;
2078 2182
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2183 $self->post_load_original
2080 if delete $self->{load_original}; 2184 if delete $self->{load_original};
2081 2185
2082 if (my $uniq = $self->uniq_path) { 2186 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2187 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2188 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2207 $self->decay_objects;
2104 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
2105 $self->update_buttons; 2209 $self->update_buttons;
2106 cf::cede_to_tick; 2210 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2211 $self->activate;
2110 } 2212 }
2111 2213
2112 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
2114 2216
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2217 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2218 }
2117 2219
2118 $self->post_load; 2220 $self->post_load;
2119}
2120 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
2121sub customise_for { 2228sub customise_for {
2122 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
2123 2230
2124 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2232 if $self->per_player;
2141 or next; 2248 or next;
2142 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2143 or next; 2250 or next;
2144 $neigh->load; 2251 $neigh->load;
2145 2252
2253 # now find the diagonal neighbours
2146 push @neigh, 2254 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2257 }
2150 2258
2157} 2265}
2158 2266
2159sub find_sync { 2267sub find_sync {
2160 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2161 2269
2162 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
2163} 2274}
2164 2275
2165sub do_load_sync { 2276sub do_load_sync {
2166 my ($map) = @_; 2277 my ($map) = @_;
2167 2278
2168 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2169 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2170 2281
2171 cf::sync_job { $map->load }; 2282 $map->load;
2172} 2283}
2173 2284
2174our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2175our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2176 2287
2178 my ($path, $origin, $load) = @_; 2289 my ($path, $origin, $load) = @_;
2179 2290
2180 $path = normalise $path, $origin && $origin->{path}; 2291 $path = normalise $path, $origin && $origin->{path};
2181 2292
2182 if (my $map = $cf::MAP{$path}) { 2293 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2295 }
2185 2296
2186 $MAP_PREFETCH{$path} |= $load; 2297 $MAP_PREFETCH{$path} |= $load;
2187 2298
2188 $MAP_PREFETCHER ||= cf::async { 2299 $MAP_PREFETCHER ||= cf::async {
2202 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2203 2314
2204 () 2315 ()
2205} 2316}
2206 2317
2318# common code, used by both ->save and ->swapout
2207sub save { 2319sub _save {
2208 my ($self) = @_; 2320 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2321
2212 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2213 2323
2214 return unless $self->dirty; 2324 return unless $self->dirty;
2215 2325
2224 2334
2225 cf::async { 2335 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2336 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2337 $_->contr->save for $self->players;
2228 }; 2338 };
2339
2340 cf::get_slot 0.02;
2229 2341
2230 if ($uniq) { 2342 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2343 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2344 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2345 } else {
2234 $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);
2235 } 2347 }
2236} 2348}
2237 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2238sub swap_out { 2358sub swap_out {
2239 my ($self) = @_; 2359 my ($self) = @_;
2240 2360
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2362
2363 return if $self->in_memory != cf::MAP_ACTIVE;
2364 return if $self->{deny_save};
2246 return if $self->players; 2365 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2250 $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};
2251 2417
2252 $self->deactivate; 2418 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2420 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2421
2300 $self->unlink_save; 2422 $self->unlink_save;
2301 $self->destroy; 2423 $self->destroy;
2302} 2424}
2303 2425
2311 2433
2312 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2313 2435
2314 $self->unlink_save; 2436 $self->unlink_save;
2315 2437
2316 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2443
2370 2492
2371sub unique_maps() { 2493sub unique_maps() {
2372 [ 2494 [
2373 map { 2495 map {
2374 utf8::decode $_; 2496 utf8::decode $_;
2375 /\.map$/ 2497 s/\.map$//; # TODO future compatibility hack
2498 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2499 ? ()
2376 ? normalise $_ 2500 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2502 ]
2380} 2503}
2381 2504
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}
2536
2382=back 2537=back
2383 2538
2384=head3 cf::object 2539=head3 cf::object
2385 2540
2386=cut 2541=cut
2389 2544
2390=over 4 2545=over 4
2391 2546
2392=item $ob->inv_recursive 2547=item $ob->inv_recursive
2393 2548
2394Returns 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.
2395 2551
2396=cut 2552=cut
2397 2553
2398sub inv_recursive_; 2554sub inv_recursive_;
2399sub inv_recursive_ { 2555sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2560 inv_recursive_ inv $_[0]
2405} 2561}
2406 2562
2407=item $ref = $ob->ref 2563=item $ref = $ob->ref
2408 2564
2409creates 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.
2410 2566
2411=item $ob = cf::object::deref ($refstring) 2567=item $ob = cf::object::deref ($refstring)
2412 2568
2413returns 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,
2414even if the object actually exists. May block. 2570even if the object actually exists. May block.
2446can 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
2447dialogue with the given NPC character. 2603dialogue with the given NPC character.
2448 2604
2449=cut 2605=cut
2450 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
2451# rough implementation of a future "reply" method that works 2621# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2622# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2624sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2625 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2636 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2638
2469 } else { 2639 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2640 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2641 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2642 }
2473 } 2643 }
2474} 2644}
2475 2645
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2646=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2671
2502=item $player_object->enter_link 2672=item $player_object->enter_link
2503 2673
2504Freezes 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}>).
2505 2675
2506The 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.
2507I<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.
2508 2680
2509Will never block. 2681Will never block.
2510 2682
2511=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2512 2684
2532sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2533 my ($self) = @_; 2705 my ($self) = @_;
2534 2706
2535 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2536 2708
2709 ++$self->{_link_recursion};
2710
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2712
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2541 2715
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2717}
2544 2718
2545sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2547 2721
2564 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2566 2740
2567 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2570 2744
2571 $map->load; 2745 $map->load;
2572 $map->load_neighbours; 2746 $map->load_neighbours;
2573 2747
2574 return unless $self->contr->active; 2748 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2749
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2579} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2580 2757
2758}
2759
2581=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)]])
2582 2761
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be called at the end of this process. 2766be called at the end of this process.
2588 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
2589=cut 2771=cut
2590 2772
2591our $GOTOGEN; 2773our $GOTOGEN;
2592 2774
2593sub cf::object::player::goto { 2775sub cf::object::player::goto {
2594 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 }
2595 2783
2596 # 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
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2786
2599 $self->enter_link; 2787 $self->enter_link;
2623 my $map = eval { 2811 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2625 2813
2626 if ($map) { 2814 if ($map) {
2627 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2817 } else {
2630 $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);
2631 } 2819 }
2632 2820
2633 $map 2821 $map
2641 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2644 } 2832 }
2645 2833
2646 $done->() if $done; 2834 $done->($self) if $done;
2647 })->prio (1); 2835 })->prio (1);
2648} 2836}
2649 2837
2650=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2651 2839
2671} 2859}
2672 2860
2673sub prepare_random_map { 2861sub prepare_random_map {
2674 my ($exit) = @_; 2862 my ($exit) = @_;
2675 2863
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2864 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2865 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2866 # that depends on the exit object
2681 2867
2682 my $rmp = parse_random_map_params $exit->msg; 2868 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2870 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2871 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2872 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2873 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2874 $rmp->{origin_y} = $exit->y;
2875
2876 $exit->map->touch;
2689 } 2877 }
2690 2878
2691 $rmp->{random_seed} ||= $exit->random_seed; 2879 $rmp->{random_seed} ||= $exit->random_seed;
2692 2880
2693 my $data = cf::encode_json $rmp; 2881 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2882 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2883 my $meta = "$RANDOMDIR/$md5.meta";
2696 2884
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2885 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2886 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2887 undef $fh;
2700 aio_rename "$meta~", $meta; 2888 aio_rename "$meta~", $meta;
2701 2889
2890 my $slaying = "?random/$md5";
2891
2892 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2893 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2894 $exit->msg (undef);
2895 }
2704 } 2896 }
2705} 2897}
2706 2898
2707sub cf::object::player::enter_exit { 2899sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2900 my ($self, $exit) = @_;
2709 2901
2710 return unless $self->type == cf::PLAYER; 2902 return unless $self->type == cf::PLAYER;
2711 2903
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2904 $self->enter_link;
2724 2905
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2906 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2907 $Coro::current->{desc} = "enter_exit";
2731 2908
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2924 $self->goto ($map, $x, $y);
2735 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
2736 1; 2930 1
2737 }) { 2931 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2936
2743 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2744 $self->leave_link; 2938 $self->leave_link;
2745 } 2939 }
2746 })->prio (1); 2940 })->prio (1);
2747} 2941}
2748 2942
2760sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2762 2956
2763 utf8::encode $text; 2957 utf8::encode $text;
2764 $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);
2765} 2984}
2766 2985
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2987
2769Send 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
2773 2992
2774=cut 2993=cut
2775 2994
2776# non-persistent channels (usually the info channel) 2995# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2778 "c/identify" => { 3003 "c/identify" => {
2779 id => "infobox", 3004 id => "infobox",
2780 title => "Identify", 3005 title => "Identify",
2781 reply => undef, 3006 reply => undef,
2782 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2784 "c/examine" => { 3009 "c/examine" => {
2785 id => "infobox", 3010 id => "infobox",
2786 title => "Examine", 3011 title => "Examine",
2787 reply => undef, 3012 reply => undef,
2788 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",
2789 }, 3020 },
2790 "c/book" => { 3021 "c/book" => {
2791 id => "infobox", 3022 id => "infobox",
2792 title => "Book", 3023 title => "Book",
2793 reply => undef, 3024 reply => undef,
2809 id => "infobox", 3040 id => "infobox",
2810 title => "Body Parts", 3041 title => "Body Parts",
2811 reply => undef, 3042 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 3043 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 3081 "c/uptime" => {
2815 id => "infobox", 3082 id => "infobox",
2816 title => "Uptime", 3083 title => "Uptime",
2817 reply => undef, 3084 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3085 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 3088 id => "infobox",
2822 title => "Map Info", 3089 title => "Map Info",
2823 reply => undef, 3090 reply => undef,
2824 tooltip => "Information related to the maps", 3091 tooltip => "Information related to the maps",
2825 }, 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,
2826); 3107);
2827 3108
2828sub cf::client::send_msg { 3109sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3111
2831 $msg = $self->pl->expand_cfpod ($msg); 3112 $msg = $self->pl->expand_cfpod ($msg)
3113 unless $color & cf::NDI_VERBATIM;
2832 3114
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3115 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3116
2835 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3118 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3119 $channel = $CHANNEL{$channel};
2838 3120
2839 $self->ext_msg (channel_info => $channel) 3121 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3122 $channel = $channel->{id};
2843 3123
2844 } elsif (ref $channel) { 3124 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3129 }
2851 3130
2852 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2853 } 3132 }
2854 3133
2855 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2856 3135
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3136 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2861 3139
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3140 my $pkt = "msg "
3141 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3143 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3144
2876 $color &= cf::NDI_COLOR_MASK; 3145 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3146}
2890 3147
2891=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2892 3149
2893Sends an ext event to the client. 3150Sends an ext event to the client.
2896 3153
2897sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2899 3156
2900 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3162 }
2906} 3163}
2907 3164
2908=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2909 3166
2913 3170
2914sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2916 3173
2917 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3177 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3180 }
2924} 3181}
2925 3182
2926=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2927 3184
2998 3255
2999 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3257 if $reply;
3001 3258
3002 } else { 3259 } else {
3003 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";
3004 } 3261 }
3005 3262
3006 cf::override; 3263 cf::override;
3007 }, 3264 },
3008); 3265);
3028 3285
3029 $coro 3286 $coro
3030} 3287}
3031 3288
3032cf::client->attach ( 3289cf::client->attach (
3033 on_destroy => sub { 3290 on_client_destroy => sub {
3034 my ($ns) = @_; 3291 my ($ns) = @_;
3035 3292
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3294 },
3038); 3295);
3054our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
3055 3312
3056$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
3057 3314
3058$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
3061 sort time 3318 sort time
3062)); 3319));
3063 3320
3064# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
3067 3324
3068The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
3069 3326
3070 cf::object 3327 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3329 insert remove name archname title slaying race decrease split
3330 value
3073 3331
3074 cf::object::player 3332 cf::object::player
3075 player 3333 player
3076 3334
3077 cf::player 3335 cf::player
3082 3340
3083=cut 3341=cut
3084 3342
3085for ( 3343for (
3086 ["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
3087 insert remove inv name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3092) { 3350) {
3093 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3096 for @funs; 3353 for @funs;
3097} 3354}
3098 3355
3113 3370
3114 my $qcode = $code; 3371 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
3117 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
3118 local $_; 3378 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3379
3121 my $eval = 3380 my $eval =
3122 "do {\n" 3381 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3384 . $code
3126 . "\n}" 3385 . "\n}"
3127 ; 3386 ;
3128 3387
3388 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 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 }
3132 3397
3133 if ($@) { 3398 if ($@) {
3134 warn "$@"; 3399 warn "$@",
3135 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3137 } 3402 }
3138 3403
3139 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3140} 3405}
3141 3406
3155=cut 3420=cut
3156 3421
3157sub register_script_function { 3422sub register_script_function {
3158 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
3159 3424
3160 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
3162} 3427}
3163 3428
3164=back 3429=back
3165 3430
3166=cut 3431=cut
3175 # for this (global event?) 3440 # for this (global event?)
3176 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3177 3442
3178 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3179 3444
3180 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3181 3446
3182 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3183 0 < aio_load $path, $facedata
3184 or die "$path: $!";
3185
3186 $facedata = Coro::Storable::thaw $facedata;
3187 3448
3188 $facedata->{version} == 2 3449 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3451
3191 # 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]);
3192 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3455 type => FT_RSRC,
3194 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),
3195 }; 3458 };
3196 cf::cede_to_tick; 3459 cf::cede_to_tick;
3197 3460
3198 { 3461 {
3199 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3201 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3466
3204 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 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} ;
3208 3472
3209 cf::cede_to_tick; 3473 cf::cede_to_tick;
3210 } 3474 }
3211 3475
3212 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3217 3481
3218 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3219 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3220 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3221 } else { 3485 } else {
3222 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3223 } 3487 }
3224 3488
3225 cf::cede_to_tick; 3489 cf::cede_to_tick;
3226 } 3490 }
3227 } 3491 }
3236 3500
3237 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3238 } 3502 }
3239 3503
3240 { 3504 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3244 3506
3245 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3508 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3510
3250 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3265 } else { 3513 } else {
3266 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3267 } 3515 }
3268 3516
3269 cf::cede_to_tick; 3517 cf::cede_to_tick;
3270 } 3518 }
3271 } 3519 }
3272 3520
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3522
3275 1 3523 1
3276} 3524}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3525
3298register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3300 3528
3301 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3530 $ns->fx_want ($k, $v);
3303 } 3531 }
3304}; 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}
3305 3543
3306sub reload_regions { 3544sub reload_regions {
3307 # 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
3308 # for this (global event?) 3546 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3547 %ext::player_env::MUSIC_FACE_CACHE = ();
3323} 3561}
3324 3562
3325sub reload_archetypes { 3563sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3564 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3565 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3566}
3334 3567
3335sub reload_treasures { 3568sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3338} 3571}
3339 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
3340sub reload_resources { 3593sub reload_resources {
3341 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3342 3595
3596 reload_exp_table;
3597 reload_materials;
3598 reload_facedata;
3599 reload_sound;
3600 reload_archetypes;
3343 reload_regions; 3601 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3602 reload_treasures;
3348 3603
3349 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3605}
3355 3606
3356sub reload_config { 3607sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3358 or return;
3359 3609
3360 local $/; 3610 my $config = load_file "$CONFDIR/config";
3361 *CFG = YAML::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3362 3613
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3615
3365 $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};
3366 $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};
3367 3618
3368 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3372 }; 3623 };
3373 warn $@ if $@; 3624 warn $@ if $@;
3374 } 3625 }
3375} 3626}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3380 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#
3381 (async { 3669 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3671 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3385 }; 3673 };
3386 3674
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 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;
3687 reload_config;
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
3698 load_extensions;
3699
3700 utime time, time, $RUNTIMEFILE;
3701
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;
3394} 3718}
3395 3719
3396############################################################################# 3720#############################################################################
3397# initialisation and cleanup 3721# initialisation and cleanup
3398 3722
3399# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3400BEGIN { 3724BEGIN {
3401 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3405 }; 3729 };
3406 } 3730 }
3407} 3731}
3408 3732
3409sub write_runtime { 3733sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3734 my $t0 = AE::time;
3411 3735
3412 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3414 3738
3415 IO::AIO::aio_utime $runtime, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3740
3417 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3418 3742
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3744 or return;
3421 3745
3422 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3758 aio_utime $fh, undef, undef;
3435 3759
3436 close $fh 3760 close $fh
3437 or return; 3761 or return;
3438 3762
3439 aio_rename "$runtime~", $runtime 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3764 and return;
3441 3765
3442 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3767
3444 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 };
3445} 3819}
3446 3820
3447sub emergency_save() { 3821sub emergency_save() {
3448 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3449 3823
3450 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;
3451 3830
3452 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3453 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3454 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3455 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3456 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3457 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3458 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3459 $pl->valid or next; 3840 $pl->valid or next;
3460 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3461 $pl->save; 3842 $pl->save;
3462 } 3843 }
3463 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3464 3845
3465 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";
3466 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3467 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3468 $map->valid or next; 3851 $map->valid or next;
3469 $map->save; 3852 $map->save;
3470 } 3853 }
3471 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3472 3855
3473 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";
3474 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3475 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
3476 }; 3884 };
3477 3885
3478 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3479} 3887}
3480 3888
3481sub post_cleanup { 3889sub post_cleanup {
3482 my ($make_core) = @_; 3890 my ($make_core) = @_;
3483 3891
3892 IO::AIO::flush;
3893
3484 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3485 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 }
3486} 3924}
3487 3925
3488sub do_reload_perl() { 3926sub do_reload_perl() {
3489 # can/must only be called in main 3927 # can/must only be called in main
3490 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3491 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3492 return; 3930 return;
3493 } 3931 }
3494 3932
3495 warn "reloading..."; 3933 return if $RELOAD++;
3496 3934
3497 warn "entering sync_job"; 3935 my $t1 = AE::time;
3498 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
3499 cf::sync_job { 3943 cf::sync_job {
3500 cf::write_runtime; # external watchdog should not bark
3501 cf::emergency_save; 3944 #cf::emergency_save;
3502 cf::write_runtime; # external watchdog should not bark
3503 3945
3504 warn "syncing database to disk";
3505 BDB::db_env_txn_checkpoint $DB_ENV;
3506
3507 # if anything goes wrong in here, we should simply crash as we already saved
3508
3509 warn "flushing outstanding aio requests";
3510 for (;;) {
3511 BDB::flush;
3512 IO::AIO::flush;
3513 Coro::cede_notself;
3514 last unless IO::AIO::nreqs || BDB::nreqs;
3515 warn "iterate...";
3516 }
3517
3518 ++$RELOAD;
3519
3520 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3521 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3522 %EXT_CORO = (); 3948 %EXT_CORO = ();
3523 3949
3524 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3525 %COMMAND = (); 3951 %COMMAND = ();
3526 3952
3527 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3528 %EXTCMD = (); 3954 %EXTCMD = ();
3529 %EXTICMD = (); 3955 %EXTICMD = ();
3530 3956
3531 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3532 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3533 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3534 3960
3535 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3536 eval { 3962 eval {
3537 $cb->($pkg); 3963 $cb->($pkg);
3538 1 3964 1
3539 } 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;
3540 } 3970 }
3541 3971
3542 warn "... nuking $pkg";
3543 Symbol::delete_package $pkg;
3544 }
3545
3546 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3547 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3548 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3549 3975
3550 warn "... unloading $k"; 3976 trace "... unloading $k";
3551 delete $INC{$k}; 3977 delete $INC{$k};
3552 3978
3553 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3554 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3555 3981
3556 if (my $cb = $k->can ("unload_module")) { 3982 if (my $cb = $k->can ("unload_module")) {
3557 $cb->(); 3983 $cb->();
3984 }
3985
3986 clear_package $k;
3558 } 3987 }
3559 3988
3560 Symbol::delete_package $k;
3561 }
3562
3563 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3564 Symbol::delete_package "safe::$_" 3990 clear_package "safe::$_"
3565 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);
3566 3992
3567 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3568 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3569 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3570 3996
3571 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3572 # and global variables created in xs 3998 # and global variables created in xs
3573 #Symbol::delete_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3574 4000
3575 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3576 4002
3577 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3578 require cf; 4004 require cf;
3579 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3580 4006
3581 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3582 cf::reload_config; 4008 cf::reload_config;
3583 4009
3584 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3585 cf::load_extensions; 4011 cf::load_extensions;
3586 4012
4013 if ($REATTACH_ON_RELOAD) {
3587 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3588 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3589 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3590 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3591 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3592 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3593 4021
3594 warn "leaving sync_job"; 4022 cf::_post_init 1;
3595 4023
4024 trace "perl_reload: leaving sync_job";
4025
3596 1 4026 1
3597 } or do { 4027 } or do {
3598 warn $@; 4028 error $@;
3599 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
4030 };
4031
4032 --$RELOAD;
3600 }; 4033 }
3601 4034
3602 warn "reloaded"; 4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3603}; 4037};
3604 4038
3605our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3606 4040
3607sub reload_perl() { 4041sub reload_perl() {
3608 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3609 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3610 4044
4045 $RELOAD_WATCHER ||= cf::async {
4046 Coro::AIO::aio_wait cache_extensions;
4047
3611 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3612 do_reload_perl; 4049 do_reload_perl;
3613 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
4051 };
3614 }; 4052 };
3615} 4053}
3616 4054
3617register_command "reload" => sub { 4055register_command "reload" => sub {
3618 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3624 reload_perl; 4062 reload_perl;
3625 }; 4063 };
3626 } 4064 }
3627}; 4065};
3628 4066
3629unshift @INC, $LIBDIR; 4067#############################################################################
3630 4068
3631my $bug_warning = 0; 4069my $bug_warning = 0;
3632 4070
3633our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3634our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3635 4073
3636sub wait_for_tick { 4074sub wait_for_tick() {
3637 return if tick_inhibit;
3638 return if $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3639 4076
3640 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3641 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3642 $signal->wait; 4079 $signal->wait;
3643} 4080}
3644 4081
3645sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3646 return if tick_inhibit;
3647 return if $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3648 4084
3649 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3650 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3651 $signal->wait; 4087 $signal->wait;
3652} 4088}
3658 return; 4094 return;
3659 } 4095 }
3660 4096
3661 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3662 4098
4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100
3663 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3664 $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.;
3665 Coro::async_pool { 4103 Coro::async_pool {
3666 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3667 write_runtime 4105 write_runtime_sync
3668 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3669 }; 4107 };
3670 } 4108 }
3671 4109
3672 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3673 $sig->send; 4111 $sig->send;
3681 4119
3682 if (0) { 4120 if (0) {
3683 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3684 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3685 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3686 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3687 } 4125 }
3688 } 4126 }
3689} 4127}
3690 4128
3691{ 4129{
3692 # configure BDB 4130 # configure BDB
3693 4131
3694 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3695 BDB::max_poll_reqs $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3696 $Coro::BDB::WATCHER->priority (1); 4134 $AnyEvent::BDB::WATCHER->priority (1);
3697 4135
3698 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3699 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3700 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3701 | 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;
3702 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4141 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3703 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4142 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3704 4143
3705 cf::sync_job { 4144 cf::sync_job {
3706 eval { 4145 eval {
3732{ 4171{
3733 # configure IO::AIO 4172 # configure IO::AIO
3734 4173
3735 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3736 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3737 $Coro::AIO::WATCHER->priority (1); 4176 undef $AnyEvent::AIO::WATCHER;
3738} 4177}
3739 4178
3740my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3741 4181
3742sub _log_backtrace { 4182sub _log_backtrace {
3743 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3744 4184
3745 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3746 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3747 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3748 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3749 ++$_log_backtrace; 4193 ++$_log_backtrace;
4194 my $perl_bt = Carp::longmess $msg;
3750 async { 4195 async {
3751 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
3752 4197
3753 my @bt = fork_call { 4198 my @bt = fork_call {
3754 @addr = map { sprintf "%x", $_ } @addr; 4199 @addr = map { sprintf "%x", $_ } @addr;
3765 } 4210 }
3766 4211
3767 @funcs 4212 @funcs
3768 }; 4213 };
3769 4214
3770 LOG llevInfo, "[ABT] $msg\n"; 4215 LOG llevInfo, "[ABT] $perl_bt\n";
4216 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3771 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3772 --$_log_backtrace; 4218 --$_log_backtrace;
3773 }; 4219 };
3774 } else { 4220 } else {
3775 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3776 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3777 } 4223 }
3778} 4224}
3779 4225
3780# load additional modules 4226# load additional modules
3781use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3782 4229
3783END { cf::emergency_save } 4230END { cf::emergency_save }
3784 4231
37851 42321
3786 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines