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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 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
1561 last;
1562 }
1374 } 1563 }
1375 }; 1564 };
1376} 1565}
1377 1566
1378############################################################################# 1567#############################################################################
1379 1568
1380=back 1569=back
1381 1570
1382=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1383 1572
1384Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1385 1574
1386=cut 1575=cut
1387 1576
1388package cf::player; 1577package cf::player;
1389 1578
1432 1621
1433sub exists($) { 1622sub exists($) {
1434 my ($login) = @_; 1623 my ($login) = @_;
1435 1624
1436 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1438} 1627}
1439 1628
1440sub find($) { 1629sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1631 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1644 or return;
1456 1645
1457 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1458 or return; 1647 or return;
1648
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1462 } 1652 }
1463 } 1653 }
1464} 1654}
1465 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1466sub save($) { 1669sub save($) {
1467 my ($pl) = @_; 1670 my ($pl) = @_;
1468 1671
1469 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1470 1673
1473 1676
1474 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1475 1678
1476 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1478 1686
1479 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1688 cf::cede_to_tick;
1481} 1689}
1482 1690
1514 my ($pl) = @_; 1722 my ($pl) = @_;
1515 1723
1516 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1517 1725
1518 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1728
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1522 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1524 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1525 1737
1526 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1528 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1566 1778
1567 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1568 my $path = path $login; 1780 my $path = path $login;
1569 1781
1570 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1788 }
1576 1789
1580 1793
1581 \@logins 1794 \@logins
1582} 1795}
1583 1796
1584=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1585 1800
1586Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1587player. May block. 1802player. May block.
1588 1803
1589=cut 1804=cut
1607 } 1822 }
1608 1823
1609 \@paths 1824 \@paths
1610} 1825}
1611 1826
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1828
1614Expand crossfire pod fragments into protocol xml. 1829Expand 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 1830
1705=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1706 1832
1707Sends an ext reply to the player. 1833Sends an ext reply to the player.
1708 1834
1740 1866
1741=cut 1867=cut
1742 1868
1743sub find_by_path($) { 1869sub find_by_path($) {
1744 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1745 1873
1746 my ($match, $specificity); 1874 my ($match, $specificity);
1747 1875
1748 for my $region (list) { 1876 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1778sub generate_random_map { 1906sub generate_random_map {
1779 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1780 1908
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782 1910
1783 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1792 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1793 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1794 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1795 (cf::region::find $rmp->{region}), $rmp->{custom}
1796 )
1797} 1912}
1798 1913
1799=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1800 1915
1801Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1806 1921
1807sub register { 1922sub register {
1808 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1809 my $pkg = caller; 1924 my $pkg = caller;
1810 1925
1811 no strict;
1812 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1813 1927
1814 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1815} 1929}
1816 1930
1817# also paths starting with '/' 1931# also paths starting with '/'
1818$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1819 1933
1820sub thawer_merge { 1934sub thawer_merge {
1821 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1822 1936
1823 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1828} 1942}
1829 1943
1830sub normalise { 1944sub normalise {
1831 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1832 1946
1833 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1834 1948
1835 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1836 1950
1837 # map plan: 1951 # map plan:
1838 # 1952 #
1853 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1854 $path = "$base/$path"; 1968 $path = "$base/$path";
1855 } 1969 }
1856 1970
1857 for ($path) { 1971 for ($path) {
1858 redo if s{//}{/};
1859 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1860 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1861 } 1974 }
1862 1975
1863 $path 1976 $path
1877 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1878 return $self; 1991 return $self;
1879 } 1992 }
1880 } 1993 }
1881 1994
1882 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1883 () 1996 ()
1884} 1997}
1885 1998
1999# may re-bless or do other evil things
1886sub init { 2000sub init {
1887 my ($self) = @_; 2001 my ($self) = @_;
1888 2002
1889 $self 2003 $self
1890} 2004}
1919sub uniq_path { 2033sub uniq_path {
1920 my ($self) = @_; 2034 my ($self) = @_;
1921 2035
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 2038}
1934 2039
1935sub decay_objects { 2040sub decay_objects {
1936 my ($self) = @_; 2041 my ($self) = @_;
1937 2042
2019 2124
2020sub find; 2125sub find;
2021sub find { 2126sub find {
2022 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2023 2128
2129 cf::cede_to_tick;
2130
2024 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
2025 2132
2026 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2135
2029 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
2034 or return; 2138 or return;
2035 2139
2036 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
2037 2141
2039 or return; 2143 or return;
2040 2144
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2145 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2146 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2147 #$cf::WAIT_FOR_TICK->wait;
2148 undef $guard2;
2044 undef $guard1; 2149 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2150 $map->reset;
2047 return find $path; 2151 return find $path;
2048 } 2152 }
2049 2153
2050 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
2051 } 2155 }
2052} 2156}
2053 2157
2054sub pre_load { } 2158sub pre_load { }
2055sub post_load { } 2159#sub post_load { } # XS
2056 2160
2057sub load { 2161sub load {
2058 my ($self) = @_; 2162 my ($self) = @_;
2059 2163
2060 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2072 $self->alloc; 2176 $self->alloc;
2073 2177
2074 $self->pre_load; 2178 $self->pre_load;
2075 cf::cede_to_tick; 2179 cf::cede_to_tick;
2076 2180
2181 if (exists $self->{load_path}) {
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2183 $f->skip_block;
2079 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2080 or return; 2185 or return;
2081 2186
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2187 $self->post_load_original
2083 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2084 2189
2085 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2191 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2088 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2089 $self->clear_unique_items; 2194 $self->clear_unique_items;
2090 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2091 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2092 } 2198 }
2093 } 2199 }
2094 }
2095 2200
2096 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2097 2203
2098 cf::cede_to_tick; 2204 cf::cede_to_tick;
2099 # now do the right thing for maps 2205 # now do the right thing for maps
2100 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2101 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
2105 unless ($self->{deny_activate}) { 2211 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2212 $self->decay_objects;
2107 $self->fix_auto_apply; 2213 $self->fix_auto_apply;
2108 $self->update_buttons; 2214 $self->update_buttons;
2109 cf::cede_to_tick; 2215 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2216 $self->activate;
2113 } 2217 }
2114 2218
2115 $self->{last_save} = $cf::RUNTIME; 2219 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2220 $self->last_access ($cf::RUNTIME);
2117 2221
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2222 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2223 }
2120 2224
2121 $self->post_load; 2225 $self->post_load;
2122}
2123 2226
2227 1
2228}
2229
2230# customize the map for a given player, i.e.
2231# return the _real_ map. used by e.g. per-player
2232# maps to change the path to ~playername/mappath
2124sub customise_for { 2233sub customise_for {
2125 my ($self, $ob) = @_; 2234 my ($self, $ob) = @_;
2126 2235
2127 return find "~" . $ob->name . "/" . $self->{path} 2236 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2237 if $self->per_player;
2144 or next; 2253 or next;
2145 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
2146 or next; 2255 or next;
2147 $neigh->load; 2256 $neigh->load;
2148 2257
2258 # now find the diagonal neighbours
2149 push @neigh, 2259 push @neigh,
2150 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2151 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2152 } 2262 }
2153 2263
2160} 2270}
2161 2271
2162sub find_sync { 2272sub find_sync {
2163 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2164 2274
2165 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
2166} 2279}
2167 2280
2168sub do_load_sync { 2281sub do_load_sync {
2169 my ($map) = @_; 2282 my ($map) = @_;
2170 2283
2171 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2172 if $Coro::current == $Coro::main; 2285 if $Coro::current == $Coro::main;
2173 2286
2174 cf::sync_job { $map->load }; 2287 $map->load;
2175} 2288}
2176 2289
2177our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
2178our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
2179 2292
2181 my ($path, $origin, $load) = @_; 2294 my ($path, $origin, $load) = @_;
2182 2295
2183 $path = normalise $path, $origin && $origin->{path}; 2296 $path = normalise $path, $origin && $origin->{path};
2184 2297
2185 if (my $map = $cf::MAP{$path}) { 2298 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2299 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2300 }
2188 2301
2189 $MAP_PREFETCH{$path} |= $load; 2302 $MAP_PREFETCH{$path} |= $load;
2190 2303
2191 $MAP_PREFETCHER ||= cf::async { 2304 $MAP_PREFETCHER ||= cf::async {
2205 $MAP_PREFETCHER->prio (6); 2318 $MAP_PREFETCHER->prio (6);
2206 2319
2207 () 2320 ()
2208} 2321}
2209 2322
2323# common code, used by both ->save and ->swapout
2210sub save { 2324sub _save {
2211 my ($self) = @_; 2325 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2326
2215 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2216 2328
2217 return unless $self->dirty; 2329 return unless $self->dirty;
2218 2330
2227 2339
2228 cf::async { 2340 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2341 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2342 $_->contr->save for $self->players;
2231 }; 2343 };
2344
2345 cf::get_slot 0.02;
2232 2346
2233 if ($uniq) { 2347 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2348 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2349 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2350 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2351 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2238 } 2352 }
2239} 2353}
2240 2354
2355sub save {
2356 my ($self) = @_;
2357
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
2360 $self->_save;
2361}
2362
2241sub swap_out { 2363sub swap_out {
2242 my ($self) = @_; 2364 my ($self) = @_;
2243 2365
2244 # save first because save cedes
2245 $self->save;
2246
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2366 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2367
2368 return if $self->in_memory != cf::MAP_ACTIVE;
2369 return if $self->{deny_save};
2249 return if $self->players; 2370 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2251 return if $self->{deny_save};
2252 2371
2372 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # then atomically save
2378 $self->_save;
2379
2380 # then free the map
2381 $self->clear;
2382}
2383
2384sub reset_at {
2385 my ($self) = @_;
2386
2387 # TODO: safety, remove and allow resettable per-player maps
2388 return 1e99 if $self->{deny_reset};
2389
2390 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2391 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2392
2393 $time + $to
2394}
2395
2396sub should_reset {
2397 my ($self) = @_;
2398
2399 $self->reset_at <= $cf::RUNTIME
2400}
2401
2402sub reset {
2403 my ($self) = @_;
2404
2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2406
2407 return if $self->players;
2408
2409 cf::trace "resetting map ", $self->path, "\n";
2410
2411 $self->in_memory (cf::MAP_SWAPPED);
2412
2413 # need to save uniques path
2414 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416
2417 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2418 if $uniq;
2419 }
2420
2421 delete $cf::MAP{$self->path};
2254 2422
2255 $self->deactivate; 2423 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP; 2424 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear; 2425 $self->clear;
2258}
2259
2260sub reset_at {
2261 my ($self) = @_;
2262
2263 # TODO: safety, remove and allow resettable per-player maps
2264 return 1e99 if $self->{deny_reset};
2265
2266 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2267 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2268
2269 $time + $to
2270}
2271
2272sub should_reset {
2273 my ($self) = @_;
2274
2275 $self->reset_at <= $cf::RUNTIME
2276}
2277
2278sub reset {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 return if $self->players;
2284
2285 warn "resetting map ", $self->path;
2286
2287 $self->in_memory (cf::MAP_SWAPPED);
2288
2289 # need to save uniques path
2290 unless ($self->{deny_save}) {
2291 my $uniq = $self->uniq_path; utf8::encode $uniq;
2292
2293 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2294 if $uniq;
2295 }
2296
2297 delete $cf::MAP{$self->path};
2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2301 $self->clear;
2302 2426
2303 $self->unlink_save; 2427 $self->unlink_save;
2304 $self->destroy; 2428 $self->destroy;
2305} 2429}
2306 2430
2314 2438
2315 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2316 2440
2317 $self->unlink_save; 2441 $self->unlink_save;
2318 2442
2319 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2320 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2321 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2322 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2324 2448
2381 : normalise $_ 2505 : normalise $_
2382 } @{ aio_readdir $UNIQUEDIR or [] } 2506 } @{ aio_readdir $UNIQUEDIR or [] }
2383 ] 2507 ]
2384} 2508}
2385 2509
2510=item cf::map::static_maps
2511
2512Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2513file in the shared directory excluding F</styles> and F</editor>). May
2514block.
2515
2516=cut
2517
2518sub static_maps() {
2519 my @dirs = "";
2520 my @maps;
2521
2522 while (@dirs) {
2523 my $dir = shift @dirs;
2524
2525 next if $dir eq "/styles" || $dir eq "/editor";
2526
2527 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2528 or return;
2529
2530 for (@$files) {
2531 s/\.map$// or next;
2532 utf8::decode $_;
2533 push @maps, "$dir/$_";
2534 }
2535
2536 push @dirs, map "$dir/$_", @$dirs;
2537 }
2538
2539 \@maps
2540}
2541
2386=back 2542=back
2387 2543
2388=head3 cf::object 2544=head3 cf::object
2389 2545
2390=cut 2546=cut
2451can be C<undef>. Does the right thing when the player is currently in a 2607can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2608dialogue with the given NPC character.
2453 2609
2454=cut 2610=cut
2455 2611
2612our $SAY_CHANNEL = {
2613 id => "say",
2614 title => "Map",
2615 reply => "say ",
2616 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2617};
2618
2619our $CHAT_CHANNEL = {
2620 id => "chat",
2621 title => "Chat",
2622 reply => "chat ",
2623 tooltip => "Player chat and shouts, global to the server.",
2624};
2625
2456# rough implementation of a future "reply" method that works 2626# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2627# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2628#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2629sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2630 my ($self, $npc, $msg, $flags) = @_;
2471 my $dialog = $pl->{npc_dialog}; 2641 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2642 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2643
2474 } else { 2644 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2645 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2646 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2647 }
2478 } 2648 }
2479} 2649}
2480 2650
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2651=item $object->send_msg ($channel, $msg, $color, [extra...])
2506 2676
2507=item $player_object->enter_link 2677=item $player_object->enter_link
2508 2678
2509Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2510 2680
2511The player should be reasonably safe there for short amounts of time. You 2681The player should be reasonably safe there for short amounts of time (e.g.
2512I<MUST> call C<leave_link> as soon as possible, though. 2682for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2683though, as the player cannot control the character while it is on the link
2684map.
2513 2685
2514Will never block. 2686Will never block.
2515 2687
2516=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
2517 2689
2537sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2538 my ($self) = @_; 2710 my ($self) = @_;
2539 2711
2540 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2541 2713
2714 ++$self->{_link_recursion};
2715
2542 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2543 2717
2544 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2545 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2546 2720
2547 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2721 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2548} 2722}
2549 2723
2550sub cf::object::player::leave_link { 2724sub cf::object::player::leave_link {
2551 my ($self, $map, $x, $y) = @_; 2725 my ($self, $map, $x, $y) = @_;
2552 2726
2569 ($x, $y) = (-1, -1) 2743 ($x, $y) = (-1, -1)
2570 unless (defined $x) && (defined $y); 2744 unless (defined $x) && (defined $y);
2571 2745
2572 # use -1 or undef as default coordinates, not 0, 0 2746 # use -1 or undef as default coordinates, not 0, 0
2573 ($x, $y) = ($map->enter_x, $map->enter_y) 2747 ($x, $y) = ($map->enter_x, $map->enter_y)
2574 if $x <=0 && $y <= 0; 2748 if $x <= 0 && $y <= 0;
2575 2749
2576 $map->load; 2750 $map->load;
2577 $map->load_neighbours; 2751 $map->load_neighbours;
2578 2752
2579 return unless $self->contr->active; 2753 return unless $self->contr->active;
2580 $self->activate_recursive;
2581 2754
2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2583 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2584} 2757 # entering was successful
2758 delete $self->{_link_recursion};
2759 # only activate afterwards, to support waiting in hooks
2760 $self->activate_recursive;
2761 }
2585 2762
2763}
2764
2586=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2587 2766
2588Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2769that has to return the map if sucecssful, and then unfreezes the player on
2591the new (success) or old (failed) map position. In either case, $done will 2770the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2771be called at the end of this process.
2593 2772
2773Note that $check will be called with a potentially non-loaded map, so if
2774it needs a loaded map it has to call C<< ->load >>.
2775
2594=cut 2776=cut
2595 2777
2596our $GOTOGEN; 2778our $GOTOGEN;
2597 2779
2598sub cf::object::player::goto { 2780sub cf::object::player::goto {
2599 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2600 2788
2601 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2602 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2603 2791
2604 $self->enter_link; 2792 $self->enter_link;
2628 my $map = eval { 2816 my $map = eval {
2629 my $map = defined $path ? cf::map::find $path : undef; 2817 my $map = defined $path ? cf::map::find $path : undef;
2630 2818
2631 if ($map) { 2819 if ($map) {
2632 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2633 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2634 } else { 2822 } else {
2635 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2636 } 2824 }
2637 2825
2638 $map 2826 $map
2646 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2647 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2648 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2649 } 2837 }
2650 2838
2651 $done->() if $done; 2839 $done->($self) if $done;
2652 })->prio (1); 2840 })->prio (1);
2653} 2841}
2654 2842
2655=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2656 2844
2676} 2864}
2677 2865
2678sub prepare_random_map { 2866sub prepare_random_map {
2679 my ($exit) = @_; 2867 my ($exit) = @_;
2680 2868
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2869 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2870 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2871 # that depends on the exit object
2686 2872
2687 my $rmp = parse_random_map_params $exit->msg; 2873 my $rmp = parse_random_map_params $exit->msg;
2689 if ($exit->map) { 2875 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2876 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2877 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2878 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2879 $rmp->{origin_y} = $exit->y;
2880
2881 $exit->map->touch;
2694 } 2882 }
2695 2883
2696 $rmp->{random_seed} ||= $exit->random_seed; 2884 $rmp->{random_seed} ||= $exit->random_seed;
2697 2885
2698 my $data = cf::encode_json $rmp; 2886 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2887 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2888 my $meta = "$RANDOMDIR/$md5.meta";
2701 2889
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2890 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2891 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2892 undef $fh;
2705 aio_rename "$meta~", $meta; 2893 aio_rename "$meta~", $meta;
2706 2894
2895 my $slaying = "?random/$md5";
2896
2897 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2898 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2899 $exit->msg (undef);
2900 }
2709 } 2901 }
2710} 2902}
2711 2903
2712sub cf::object::player::enter_exit { 2904sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2905 my ($self, $exit) = @_;
2714 2906
2715 return unless $self->type == cf::PLAYER; 2907 return unless $self->type == cf::PLAYER;
2716 2908
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2909 $self->enter_link;
2729 2910
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2911 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2912 $Coro::current->{desc} = "enter_exit";
2736 2913
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2914 unless (eval {
2915 $self->deactivate_recursive; # just to be sure
2916
2917 # random map handling
2918 {
2919 my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921 prepare_random_map $exit
2922 if $exit->slaying eq "/!";
2923 }
2924
2925 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2926 my $x = $exit->stats->hp;
2927 my $y = $exit->stats->sp;
2928
2739 $self->goto ($slaying, $hp, $sp); 2929 $self->goto ($map, $x, $y);
2740 2930
2931 # if exit is damned, update players death & WoR home-position
2932 $self->contr->savebed ($map, $x, $y)
2933 if $exit->flag (cf::FLAG_DAMNED);
2934
2741 1; 2935 1
2742 }) { 2936 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2744 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2747 2941
2748 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2749 $self->leave_link; 2943 $self->leave_link;
2750 } 2944 }
2751 })->prio (1); 2945 })->prio (1);
2752} 2946}
2753 2947
2765sub cf::client::send_drawinfo { 2959sub cf::client::send_drawinfo {
2766 my ($self, $text, $flags) = @_; 2960 my ($self, $text, $flags) = @_;
2767 2961
2768 utf8::encode $text; 2962 utf8::encode $text;
2769 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2963 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2964}
2965
2966=item $client->send_big_packet ($pkt)
2967
2968Like C<send_packet>, but tries to compress large packets, and fragments
2969them as required.
2970
2971=cut
2972
2973our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2974
2975sub cf::client::send_big_packet {
2976 my ($self, $pkt) = @_;
2977
2978 # try lzf for large packets
2979 $pkt = "lzf " . Compress::LZF::compress $pkt
2980 if 1024 <= length $pkt and $self->{can_lzf};
2981
2982 # split very large packets
2983 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2984 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2985 $pkt = "frag";
2986 }
2987
2988 $self->send_packet ($pkt);
2770} 2989}
2771 2990
2772=item $client->send_msg ($channel, $msg, $color, [extra...]) 2991=item $client->send_msg ($channel, $msg, $color, [extra...])
2773 2992
2774Send a drawinfo or msg packet to the client, formatting the msg for the 2993Send a drawinfo or msg packet to the client, formatting the msg for the
2778 2997
2779=cut 2998=cut
2780 2999
2781# non-persistent channels (usually the info channel) 3000# non-persistent channels (usually the info channel)
2782our %CHANNEL = ( 3001our %CHANNEL = (
3002 "c/motd" => {
3003 id => "infobox",
3004 title => "MOTD",
3005 reply => undef,
3006 tooltip => "The message of the day",
3007 },
2783 "c/identify" => { 3008 "c/identify" => {
2784 id => "infobox", 3009 id => "infobox",
2785 title => "Identify", 3010 title => "Identify",
2786 reply => undef, 3011 reply => undef,
2787 tooltip => "Items recently identified", 3012 tooltip => "Items recently identified",
2789 "c/examine" => { 3014 "c/examine" => {
2790 id => "infobox", 3015 id => "infobox",
2791 title => "Examine", 3016 title => "Examine",
2792 reply => undef, 3017 reply => undef,
2793 tooltip => "Signs and other items you examined", 3018 tooltip => "Signs and other items you examined",
3019 },
3020 "c/shopinfo" => {
3021 id => "infobox",
3022 title => "Shop Info",
3023 reply => undef,
3024 tooltip => "What your bargaining skill tells you about the shop",
2794 }, 3025 },
2795 "c/book" => { 3026 "c/book" => {
2796 id => "infobox", 3027 id => "infobox",
2797 title => "Book", 3028 title => "Book",
2798 reply => undef, 3029 reply => undef,
2814 id => "infobox", 3045 id => "infobox",
2815 title => "Body Parts", 3046 title => "Body Parts",
2816 reply => undef, 3047 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available", 3048 tooltip => "Shows which body parts you posess and are available",
2818 }, 3049 },
3050 "c/statistics" => {
3051 id => "infobox",
3052 title => "Statistics",
3053 reply => undef,
3054 tooltip => "Shows your primary statistics",
3055 },
3056 "c/skills" => {
3057 id => "infobox",
3058 title => "Skills",
3059 reply => undef,
3060 tooltip => "Shows your experience per skill and item power",
3061 },
3062 "c/shopitems" => {
3063 id => "infobox",
3064 title => "Shop Items",
3065 reply => undef,
3066 tooltip => "Shows the items currently for sale in this shop",
3067 },
3068 "c/resistances" => {
3069 id => "infobox",
3070 title => "Resistances",
3071 reply => undef,
3072 tooltip => "Shows your resistances",
3073 },
3074 "c/pets" => {
3075 id => "infobox",
3076 title => "Pets",
3077 reply => undef,
3078 tooltip => "Shows information abotu your pets/a specific pet",
3079 },
3080 "c/perceiveself" => {
3081 id => "infobox",
3082 title => "Perceive Self",
3083 reply => undef,
3084 tooltip => "You gained detailed knowledge about yourself",
3085 },
2819 "c/uptime" => { 3086 "c/uptime" => {
2820 id => "infobox", 3087 id => "infobox",
2821 title => "Uptime", 3088 title => "Uptime",
2822 reply => undef, 3089 reply => undef,
2823 tooltip => "How long the server has been running since last restart", 3090 tooltip => "How long the server has been running since last restart",
2826 id => "infobox", 3093 id => "infobox",
2827 title => "Map Info", 3094 title => "Map Info",
2828 reply => undef, 3095 reply => undef,
2829 tooltip => "Information related to the maps", 3096 tooltip => "Information related to the maps",
2830 }, 3097 },
3098 "c/party" => {
3099 id => "party",
3100 title => "Party",
3101 reply => "gsay ",
3102 tooltip => "Messages and chat related to your party",
3103 },
3104 "c/death" => {
3105 id => "death",
3106 title => "Death",
3107 reply => undef,
3108 tooltip => "Reason for and more info about your most recent death",
3109 },
3110 "c/say" => $SAY_CHANNEL,
3111 "c/chat" => $CHAT_CHANNEL,
2831); 3112);
2832 3113
2833sub cf::client::send_msg { 3114sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 3115 my ($self, $channel, $msg, $color, @extra) = @_;
2835 3116
2836 $msg = $self->pl->expand_cfpod ($msg); 3117 $msg = $self->pl->expand_cfpod ($msg)
3118 unless $color & cf::NDI_VERBATIM;
2837 3119
2838 $color &= cf::NDI_CLIENT_MASK; # just in case... 3120 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839 3121
2840 # check predefined channels, for the benefit of C 3122 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) { 3123 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel}; 3124 $channel = $CHANNEL{$channel};
2843 3125
2844 $self->ext_msg (channel_info => $channel) 3126 $self->ext_msg (channel_info => $channel);
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id}; 3127 $channel = $channel->{id};
2848 3128
2849 } elsif (ref $channel) { 3129 } elsif (ref $channel) {
2850 # send meta info to client, if not yet sent 3130 # send meta info to client, if not yet sent
2851 unless (exists $self->{channel}{$channel->{id}}) { 3131 unless (exists $self->{channel}{$channel->{id}}) {
2852 $self->{channel}{$channel->{id}} = $channel; 3132 $self->{channel}{$channel->{id}} = $channel;
2853 $self->ext_msg (channel_info => $channel) 3133 $self->ext_msg (channel_info => $channel);
2854 if $self->can_msg;
2855 } 3134 }
2856 3135
2857 $channel = $channel->{id}; 3136 $channel = $channel->{id};
2858 } 3137 }
2859 3138
2860 return unless @extra || length $msg; 3139 return unless @extra || length $msg;
2861 3140
2862 if ($self->can_msg) {
2863 # default colour, mask it out 3141 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3142 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 3143 if $color & cf::NDI_DEF;
2866 3144
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3145 my $pkt = "msg "
3146 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3147 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2869 } else { 3148 );
2870 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones
2872 for ($msg) {
2873 1 while
2874 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2875 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2876 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2877 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2878 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2879 }
2880 3149
2881 $color &= cf::NDI_COLOR_MASK; 3150 $self->send_big_packet ($pkt);
2882
2883 utf8::encode $msg;
2884
2885 if (0 && $msg =~ /\[/) {
2886 # COMMAND/INFO
2887 $self->send_packet ("drawextinfo $color 10 8 $msg")
2888 } else {
2889 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2890 $self->send_packet ("drawinfo $color $msg")
2891 }
2892 }
2893 }
2894} 3151}
2895 3152
2896=item $client->ext_msg ($type, @msg) 3153=item $client->ext_msg ($type, @msg)
2897 3154
2898Sends an ext event to the client. 3155Sends an ext event to the client.
2901 3158
2902sub cf::client::ext_msg($$@) { 3159sub cf::client::ext_msg($$@) {
2903 my ($self, $type, @msg) = @_; 3160 my ($self, $type, @msg) = @_;
2904 3161
2905 if ($self->extcmd == 2) { 3162 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2907 } elsif ($self->extcmd == 1) { # TODO: remove 3164 } elsif ($self->extcmd == 1) { # TODO: remove
2908 push @msg, msgtype => "event_$type"; 3165 push @msg, msgtype => "event_$type";
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2910 } 3167 }
2911} 3168}
2912 3169
2913=item $client->ext_reply ($msgid, @msg) 3170=item $client->ext_reply ($msgid, @msg)
2914 3171
2918 3175
2919sub cf::client::ext_reply($$@) { 3176sub cf::client::ext_reply($$@) {
2920 my ($self, $id, @msg) = @_; 3177 my ($self, $id, @msg) = @_;
2921 3178
2922 if ($self->extcmd == 2) { 3179 if ($self->extcmd == 2) {
2923 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2924 } elsif ($self->extcmd == 1) { 3181 } elsif ($self->extcmd == 1) {
2925 #TODO: version 1, remove 3182 #TODO: version 1, remove
2926 unshift @msg, msgtype => "reply", msgid => $id; 3183 unshift @msg, msgtype => "reply", msgid => $id;
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2928 } 3185 }
2929} 3186}
2930 3187
2931=item $success = $client->query ($flags, "text", \&cb) 3188=item $success = $client->query ($flags, "text", \&cb)
2932 3189
3003 3260
3004 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
3005 if $reply; 3262 if $reply;
3006 3263
3007 } else { 3264 } else {
3008 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3009 } 3266 }
3010 3267
3011 cf::override; 3268 cf::override;
3012 }, 3269 },
3013); 3270);
3033 3290
3034 $coro 3291 $coro
3035} 3292}
3036 3293
3037cf::client->attach ( 3294cf::client->attach (
3038 on_destroy => sub { 3295 on_client_destroy => sub {
3039 my ($ns) = @_; 3296 my ($ns) = @_;
3040 3297
3041 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3298 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3042 }, 3299 },
3043); 3300);
3059our $safe_hole = new Safe::Hole; 3316our $safe_hole = new Safe::Hole;
3060 3317
3061$SIG{FPE} = 'IGNORE'; 3318$SIG{FPE} = 'IGNORE';
3062 3319
3063$safe->permit_only (Opcode::opset qw( 3320$safe->permit_only (Opcode::opset qw(
3064 :base_core :base_mem :base_orig :base_math 3321 :base_core :base_mem :base_orig :base_math :base_loop
3065 grepstart grepwhile mapstart mapwhile 3322 grepstart grepwhile mapstart mapwhile
3066 sort time 3323 sort time
3067)); 3324));
3068 3325
3069# here we export the classes and methods available to script code 3326# here we export the classes and methods available to script code
3072 3329
3073The following functions and methods are available within a safe environment: 3330The following functions and methods are available within a safe environment:
3074 3331
3075 cf::object 3332 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3333 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3334 insert remove name archname title slaying race decrease split
3335 value
3078 3336
3079 cf::object::player 3337 cf::object::player
3080 player 3338 player
3081 3339
3082 cf::player 3340 cf::player
3087 3345
3088=cut 3346=cut
3089 3347
3090for ( 3348for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3349 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3350 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3351 decrease split destroy change_exp value msg lore send_msg)],
3094 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3353 ["cf::player" => qw(peaceful send_msg)],
3096 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
3097) { 3355) {
3098 no strict 'refs';
3099 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
3100 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3101 for @funs; 3358 for @funs;
3102} 3359}
3103 3360
3118 3375
3119 my $qcode = $code; 3376 my $qcode = $code;
3120 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3377 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3121 $qcode =~ s/\n/\\n/g; 3378 $qcode =~ s/\n/\\n/g;
3122 3379
3380 %vars = (_dummy => 0) unless %vars;
3381
3382 my @res;
3123 local $_; 3383 local $_;
3124 local @safe::cf::_safe_eval_args = values %vars;
3125 3384
3126 my $eval = 3385 my $eval =
3127 "do {\n" 3386 "do {\n"
3128 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3387 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3129 . "#line 0 \"{$qcode}\"\n" 3388 . "#line 0 \"{$qcode}\"\n"
3130 . $code 3389 . $code
3131 . "\n}" 3390 . "\n}"
3132 ; 3391 ;
3133 3392
3393 if ($CFG{safe_eval}) {
3134 sub_generation_inc; 3394 sub_generation_inc;
3395 local @safe::cf::_safe_eval_args = values %vars;
3135 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3396 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3136 sub_generation_inc; 3397 sub_generation_inc;
3398 } else {
3399 local @cf::_safe_eval_args = values %vars;
3400 @res = wantarray ? eval eval : scalar eval $eval;
3401 }
3137 3402
3138 if ($@) { 3403 if ($@) {
3139 warn "$@"; 3404 warn "$@",
3140 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
3141 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
3142 } 3407 }
3143 3408
3144 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
3145} 3410}
3146 3411
3160=cut 3425=cut
3161 3426
3162sub register_script_function { 3427sub register_script_function {
3163 my ($fun, $cb) = @_; 3428 my ($fun, $cb) = @_;
3164 3429
3165 no strict 'refs'; 3430 $fun = "safe::$fun" if $CFG{safe_eval};
3166 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3431 *$fun = $safe_hole->wrap ($cb);
3167} 3432}
3168 3433
3169=back 3434=back
3170 3435
3171=cut 3436=cut
3180 # for this (global event?) 3445 # for this (global event?)
3181 %ext::player_env::MUSIC_FACE_CACHE = (); 3446 %ext::player_env::MUSIC_FACE_CACHE = ();
3182 3447
3183 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3184 3449
3185 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3186 3451
3187 my $facedata; 3452 my $facedata = decode_storable load_file $path;
3188 0 < aio_load $path, $facedata
3189 or die "$path: $!";
3190
3191 $facedata = Coro::Storable::thaw $facedata;
3192 3453
3193 $facedata->{version} == 2 3454 $facedata->{version} == 2
3194 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3195 3456
3196 # patch in the exptable 3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3197 $facedata->{resource}{"res/exp_table"} = { 3459 $facedata->{resource}{"res/exp_table"} = {
3198 type => FT_RSRC, 3460 type => FT_RSRC,
3199 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
3200 }; 3463 };
3201 cf::cede_to_tick; 3464 cf::cede_to_tick;
3202 3465
3203 { 3466 {
3204 my $faces = $facedata->{faceinfo}; 3467 my $faces = $facedata->{faceinfo};
3206 while (my ($face, $info) = each %$faces) { 3469 while (my ($face, $info) = each %$faces) {
3207 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3470 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208 3471
3209 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3210 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3213 3477
3214 cf::cede_to_tick; 3478 cf::cede_to_tick;
3215 } 3479 }
3216 3480
3217 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
3222 3486
3223 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
3224 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
3225 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3226 } else { 3490 } else {
3227 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
3228 } 3492 }
3229 3493
3230 cf::cede_to_tick; 3494 cf::cede_to_tick;
3231 } 3495 }
3232 } 3496 }
3241 3505
3242 cf::anim::invalidate_all; # d'oh 3506 cf::anim::invalidate_all; # d'oh
3243 } 3507 }
3244 3508
3245 { 3509 {
3246 # TODO: for gcfclient pleasure, we should give resources
3247 # that gcfclient doesn't grok a >10000 face index.
3248 my $res = $facedata->{resource}; 3510 my $res = $facedata->{resource};
3249 3511
3250 while (my ($name, $info) = each %$res) { 3512 while (my ($name, $info) = each %$res) {
3251 if (defined $info->{type}) { 3513 if (defined $info->{type}) {
3252 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3253 my $data;
3254 3515
3255 if ($info->{type} & 1) { 3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3256 # prepend meta info
3257
3258 my $meta = $enc->encode ({
3259 name => $name,
3260 %{ $info->{meta} || {} },
3261 });
3262
3263 $data = pack "(w/a*)*", $meta, $info->{data};
3264 } else {
3265 $data = $info->{data};
3266 }
3267
3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type}; 3517 cf::face::set_type $idx, $info->{type};
3270 } else { 3518 } else {
3271 $RESOURCE{$name} = $info; 3519 $RESOURCE{$name} = $info; # unused
3272 } 3520 }
3273 3521
3274 cf::cede_to_tick; 3522 cf::cede_to_tick;
3275 } 3523 }
3276 } 3524 }
3277 3525
3278 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3279 3527
3280 1 3528 1
3281} 3529}
3282
3283cf::global->attach (on_resource_update => sub {
3284 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3285 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3286
3287 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3288 my $sound = $soundconf->{compat}[$_]
3289 or next;
3290
3291 my $face = cf::face::find "sound/$sound->[1]";
3292 cf::sound::set $sound->[0] => $face;
3293 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3294 }
3295
3296 while (my ($k, $v) = each %{$soundconf->{event}}) {
3297 my $face = cf::face::find "sound/$v";
3298 cf::sound::set $k => $face;
3299 }
3300 }
3301});
3302 3530
3303register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
3304 my ($ns, $want) = @_; 3532 my ($ns, $want) = @_;
3305 3533
3306 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3535 $ns->fx_want ($k, $v);
3308 } 3536 }
3309}; 3537};
3538
3539sub load_resource_file($) {
3540 my $guard = lock_acquire "load_resource_file";
3541
3542 my $status = load_resource_file_ $_[0];
3543 get_slot 0.1, 100;
3544 cf::arch::commit_load;
3545
3546 $status
3547}
3310 3548
3311sub reload_regions { 3549sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3550 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3551 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3552 %ext::player_env::MUSIC_FACE_CACHE = ();
3328} 3566}
3329 3567
3330sub reload_archetypes { 3568sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3569 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3570 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3571}
3339 3572
3340sub reload_treasures { 3573sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3343} 3576}
3344 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
3345sub reload_resources { 3598sub reload_resources {
3346 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3347 3600
3601 reload_exp_table;
3602 reload_materials;
3603 reload_facedata;
3604 reload_sound;
3605 reload_archetypes;
3348 reload_regions; 3606 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3607 reload_treasures;
3353 3608
3354 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
3355}
3356
3357sub init {
3358 reload_resources;
3359} 3610}
3360 3611
3361sub reload_config { 3612sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3613 trace "reloading config file...\n";
3363 or return;
3364 3614
3365 local $/; 3615 my $config = load_file "$CONFDIR/config";
3366 *CFG = YAML::Load <$fh>; 3616 utf8::decode $config;
3617 *CFG = decode_yaml $config;
3367 3618
3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3369 3620
3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3372 3623
3373 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
3377 }; 3628 };
3378 warn $@ if $@; 3629 warn $@ if $@;
3379 } 3630 }
3380} 3631}
3381 3632
3633sub pidfile() {
3634 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3635 or die "$PIDFILE: $!";
3636 flock $fh, &Fcntl::LOCK_EX
3637 or die "$PIDFILE: flock: $!";
3638 $fh
3639}
3640
3641# make sure only one server instance is running at any one time
3642sub atomic {
3643 my $fh = pidfile;
3644
3645 my $pid = <$fh>;
3646 kill 9, $pid if $pid > 0;
3647
3648 seek $fh, 0, 0;
3649 print $fh $$;
3650}
3651
3652sub main_loop {
3653 trace "EV::loop starting\n";
3654 if (1) {
3655 EV::loop;
3656 }
3657 trace "EV::loop returned\n";
3658 goto &main_loop unless $REALLY_UNLOOP;
3659}
3660
3382sub main { 3661sub main {
3662 cf::init_globals; # initialise logging
3663
3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668
3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670
3383 # we must not ever block the main coroutine 3671 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3672 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3673 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3674 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3675 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3676 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3677 })->prio (Coro::PRIO_MAX);
3390 }; 3678 };
3391 3679
3392 reload_config;
3393 db_init;
3394 load_extensions;
3395
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3680 evthread_start IO::AIO::poll_fileno;
3398 EV::loop; 3681
3682 cf::sync_job {
3683 cf::incloader::init ();
3684
3685 cf::init_anim;
3686 cf::init_attackmess;
3687 cf::init_dynamic;
3688
3689 cf::load_settings;
3690
3691 reload_resources;
3692 reload_config;
3693 db_init;
3694
3695 cf::init_uuid;
3696 cf::init_signals;
3697 cf::init_skills;
3698
3699 cf::init_beforeplay;
3700
3701 atomic;
3702
3703 load_extensions;
3704
3705 utime time, time, $RUNTIMEFILE;
3706
3707 # no (long-running) fork's whatsoever before this point(!)
3708 use POSIX ();
3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3710
3711 cf::_post_init 0;
3712 };
3713
3714 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n";
3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3722 goto &main_loop;
3399} 3723}
3400 3724
3401############################################################################# 3725#############################################################################
3402# initialisation and cleanup 3726# initialisation and cleanup
3403 3727
3404# install some emergency cleanup handlers 3728# install some emergency cleanup handlers
3405BEGIN { 3729BEGIN {
3406 our %SIGWATCHER = (); 3730 our %SIGWATCHER = ();
3407 for my $signal (qw(INT HUP TERM)) { 3731 for my $signal (qw(INT HUP TERM)) {
3408 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3732 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3409 cf::cleanup "SIG$signal"; 3733 cf::cleanup "SIG$signal";
3410 }; 3734 };
3411 } 3735 }
3412} 3736}
3413 3737
3414sub write_runtime_sync { 3738sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime"; 3739 my $t0 = AE::time;
3416 3740
3417 # first touch the runtime file to show we are still running: 3741 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3742 # the fsync below can take a very very long time.
3419 3743
3420 IO::AIO::aio_utime $runtime, undef, undef; 3744 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3745
3422 my $guard = cf::lock_acquire "write_runtime"; 3746 my $guard = cf::lock_acquire "write_runtime";
3423 3747
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3748 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3425 or return; 3749 or return;
3426 3750
3427 my $value = $cf::RUNTIME + 90 + 10; 3751 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3752 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3753 # 60 allows for the watchdog to kill the server.
3439 aio_utime $fh, undef, undef; 3763 aio_utime $fh, undef, undef;
3440 3764
3441 close $fh 3765 close $fh
3442 or return; 3766 or return;
3443 3767
3444 aio_rename "$runtime~", $runtime 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3769 and return;
3446 3770
3447 warn "runtime file written.\n"; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3448 3772
3449 1 3773 1
3450} 3774}
3451 3775
3452our $uuid_lock; 3776our $uuid_lock;
3461 my $uuid = "$LOCALDIR/uuid"; 3785 my $uuid = "$LOCALDIR/uuid";
3462 3786
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3787 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return; 3788 or return;
3465 3789
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3790 my $value = uuid_seq uuid_cur;
3791
3792 unless ($value) {
3793 info "cowardly refusing to write zero uuid value!\n";
3794 return;
3795 }
3796
3797 my $value = uuid_str $value + $uuid_skip;
3467 $uuid_skip = 0; 3798 $uuid_skip = 0;
3468 3799
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3800 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return; 3801 and return;
3471 3802
3477 or return; 3808 or return;
3478 3809
3479 aio_rename "$uuid~", $uuid 3810 aio_rename "$uuid~", $uuid
3480 and return; 3811 and return;
3481 3812
3482 warn "uuid file written ($value).\n"; 3813 trace "uuid file written ($value).\n";
3483 3814
3484 1 3815 1
3485 3816
3486} 3817}
3487 3818
3493} 3824}
3494 3825
3495sub emergency_save() { 3826sub emergency_save() {
3496 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3497 3828
3498 warn "enter emergency perl save\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3499 3835
3500 cf::sync_job { 3836 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838
3501 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3502 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3503 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3504 warn "begin emergency player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3505 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3506 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3507 $pl->valid or next; 3845 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3509 $pl->save; 3847 $pl->save;
3510 } 3848 }
3511 warn "end emergency player save\n"; 3849 info "emergency_perl_save: end player save\n";
3512 3850
3513 warn "begin emergency map save\n"; 3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 info "emergency_perl_save: begin map save\n";
3514 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3515 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3516 $map->valid or next; 3856 $map->valid or next;
3517 $map->save; 3857 $map->save;
3518 } 3858 }
3519 warn "end emergency map save\n"; 3859 info "emergency_perl_save: end map save\n";
3520 3860
3521 warn "begin emergency database checkpoint\n"; 3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3863 info "emergency_perl_save: begin database checkpoint\n";
3522 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3523 warn "end emergency database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3524 3866
3525 warn "begin write uuid\n"; 3867 info "emergency_perl_save: begin write uuid\n";
3526 write_uuid_sync 1; 3868 write_uuid_sync 1;
3527 warn "end write uuid\n"; 3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3528 }; 3889 };
3529 3890
3530 warn "leave emergency perl save\n"; 3891 info "emergency_perl_save: leave\n";
3531} 3892}
3532 3893
3533sub post_cleanup { 3894sub post_cleanup {
3534 my ($make_core) = @_; 3895 my ($make_core) = @_;
3535 3896
3897 IO::AIO::flush;
3898
3536 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3900 if $make_core;
3901
3902 my $fh = pidfile;
3903 unlink $PIDFILE if <$fh> == $$;
3904}
3905
3906# a safer delete_package, copied from Symbol
3907sub clear_package($) {
3908 my $pkg = shift;
3909
3910 # expand to full symbol table name if needed
3911 unless ($pkg =~ /^main::.*::$/) {
3912 $pkg = "main$pkg" if $pkg =~ /^::/;
3913 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3914 $pkg .= '::' unless $pkg =~ /::$/;
3915 }
3916
3917 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3918 my $stem_symtab = *{$stem}{HASH};
3919
3920 defined $stem_symtab and exists $stem_symtab->{$leaf}
3921 or return;
3922
3923 # clear all symbols
3924 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3925 for my $name (keys %$leaf_symtab) {
3926 _gv_clear *{"$pkg$name"};
3927# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3928 }
3538} 3929}
3539 3930
3540sub do_reload_perl() { 3931sub do_reload_perl() {
3541 # can/must only be called in main 3932 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3933 unless (in_main) {
3543 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3544 return; 3935 return;
3545 } 3936 }
3546 3937
3547 warn "reloading..."; 3938 return if $RELOAD++;
3548 3939
3549 warn "entering sync_job"; 3940 my $t1 = AE::time;
3550 3941
3942 while ($RELOAD) {
3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3945
3946 trace "perl_reload: entering sync_job";
3947
3551 cf::sync_job { 3948 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3949 #cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark
3555 3950
3556 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV;
3558
3559 # if anything goes wrong in here, we should simply crash as we already saved
3560
3561 warn "flushing outstanding aio requests";
3562 for (;;) {
3563 BDB::flush;
3564 IO::AIO::flush;
3565 Coro::cede_notself;
3566 last unless IO::AIO::nreqs || BDB::nreqs;
3567 warn "iterate...";
3568 }
3569
3570 ++$RELOAD;
3571
3572 warn "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3573 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3574 %EXT_CORO = (); 3953 %EXT_CORO = ();
3575 3954
3576 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3577 %COMMAND = (); 3956 %COMMAND = ();
3578 3957
3579 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3580 %EXTCMD = (); 3959 %EXTCMD = ();
3581 %EXTICMD = (); 3960 %EXTICMD = ();
3582 3961
3583 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3584 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3585 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3586 3965
3587 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3588 eval { 3967 eval {
3589 $cb->($pkg); 3968 $cb->($pkg);
3590 1 3969 1
3591 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3971 }
3972
3973 trace "... clearing $pkg";
3974 clear_package $pkg;
3592 } 3975 }
3593 3976
3594 warn "... nuking $pkg";
3595 Symbol::delete_package $pkg;
3596 }
3597
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3599 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3980
3602 warn "... unloading $k"; 3981 trace "... unloading $k";
3603 delete $INC{$k}; 3982 delete $INC{$k};
3604 3983
3605 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3607 3986
3608 if (my $cb = $k->can ("unload_module")) { 3987 if (my $cb = $k->can ("unload_module")) {
3609 $cb->(); 3988 $cb->();
3989 }
3990
3991 clear_package $k;
3610 } 3992 }
3611 3993
3612 Symbol::delete_package $k;
3613 }
3614
3615 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3995 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3997
3619 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3622 4001
3623 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3624 # and global variables created in xs 4003 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3626 4005
3627 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3628 4007
3629 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3630 require cf; 4009 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4010 cf::_connect_to_perl_1;
3632 4011
3633 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3634 cf::reload_config; 4013 cf::reload_config;
3635 4014
3636 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3637 cf::load_extensions; 4016 cf::load_extensions;
3638 4017
4018 if ($REATTACH_ON_RELOAD) {
3639 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3642 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
4025 }
3645 4026
3646 warn "leaving sync_job"; 4027 cf::_post_init 1;
3647 4028
4029 trace "perl_reload: leaving sync_job";
4030
3648 1 4031 1
3649 } or do { 4032 } or do {
3650 warn $@; 4033 error $@;
3651 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
4035 };
4036
4037 --$RELOAD;
3652 }; 4038 }
3653 4039
3654 warn "reloaded"; 4040 $t1 = AE::time - $t1;
4041 info "perl_reload: completed in ${t1}s\n";
3655}; 4042};
3656 4043
3657our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3658 4045
3659sub reload_perl() { 4046sub reload_perl() {
3660 # doing reload synchronously and two reloads happen back-to-back, 4047 # doing reload synchronously and two reloads happen back-to-back,
3661 # coro crashes during coro_state_free->destroy here. 4048 # coro crashes during coro_state_free->destroy here.
3662 4049
4050 $RELOAD_WATCHER ||= cf::async {
4051 Coro::AIO::aio_wait cache_extensions;
4052
3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4053 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3664 do_reload_perl; 4054 do_reload_perl;
3665 undef $RELOAD_WATCHER; 4055 undef $RELOAD_WATCHER;
4056 };
3666 }; 4057 };
3667} 4058}
3668 4059
3669register_command "reload" => sub { 4060register_command "reload" => sub {
3670 my ($who, $arg) = @_; 4061 my ($who, $arg) = @_;
3676 reload_perl; 4067 reload_perl;
3677 }; 4068 };
3678 } 4069 }
3679}; 4070};
3680 4071
3681unshift @INC, $LIBDIR; 4072#############################################################################
3682 4073
3683my $bug_warning = 0; 4074my $bug_warning = 0;
3684 4075
3685our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3687 4078
3688sub wait_for_tick { 4079sub wait_for_tick() {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3691 4081
3692 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 4084 $signal->wait;
3695} 4085}
3696 4086
3697sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3700 4089
3701 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 4092 $signal->wait;
3704} 4093}
3710 return; 4099 return;
3711 } 4100 }
3712 4101
3713 cf::server_tick; # one server iteration 4102 cf::server_tick; # one server iteration
3714 4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105
3715 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3717 Coro::async_pool { 4108 Coro::async_pool {
3718 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3719 write_runtime_sync 4110 write_runtime_sync
3720 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3721 }; 4112 };
3722 } 4113 }
3723 4114
3724 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3725 $sig->send; 4116 $sig->send;
3733 4124
3734 if (0) { 4125 if (0) {
3735 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3736 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3737 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3738 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3739 } 4130 }
3740 } 4131 }
3741} 4132}
3742 4133
3743{ 4134{
3744 # configure BDB 4135 # configure BDB
3745 4136
3746 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3747 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 4139 $AnyEvent::BDB::WATCHER->priority (1);
3749 4140
3750 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4143 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 4144 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4145 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4146 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4147 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 4148
3757 cf::sync_job { 4149 cf::sync_job {
3758 eval { 4150 eval {
3784{ 4176{
3785 # configure IO::AIO 4177 # configure IO::AIO
3786 4178
3787 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 4181 undef $AnyEvent::AIO::WATCHER;
3790} 4182}
3791 4183
3792my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3793 4186
3794sub _log_backtrace { 4187sub _log_backtrace {
3795 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3796 4189
3797 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3798 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3799 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3800 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3801 ++$_log_backtrace; 4198 ++$_log_backtrace;
4199 my $perl_bt = Carp::longmess $msg;
3802 async { 4200 async {
3803 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3804 4202
3805 my @bt = fork_call { 4203 my @bt = fork_call {
3806 @addr = map { sprintf "%x", $_ } @addr; 4204 @addr = map { sprintf "%x", $_ } @addr;
3817 } 4215 }
3818 4216
3819 @funcs 4217 @funcs
3820 }; 4218 };
3821 4219
3822 LOG llevInfo, "[ABT] $msg\n"; 4220 LOG llevInfo, "[ABT] $perl_bt\n";
4221 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3823 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3824 --$_log_backtrace; 4223 --$_log_backtrace;
3825 }; 4224 };
3826 } else { 4225 } else {
3827 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3828 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3829 } 4228 }
3830} 4229}
3831 4230
3832# load additional modules 4231# load additional modules
3833use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3834 4234
3835END { cf::emergency_save } 4235END { cf::emergency_save }
3836 4236
38371 42371
3838 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines