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.422 by root, Tue Apr 15 20:46:55 2008 UTC vs.
Revision 1.561 by root, Fri Apr 22 06:10:33 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($;$$) {
432 return if tick_inhibit; 560 return if tick_inhibit || $Coro::current == $Coro::main;
433 561
434 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
435 563
436 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
437 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
438 567
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
… …
467=cut 596=cut
468 597
469sub sync_job(&) { 598sub sync_job(&) {
470 my ($job) = @_; 599 my ($job) = @_;
471 600
472 if ($Coro::current == $Coro::main) { 601 if (in_main) {
473 my $time = EV::time; 602 my $time = AE::time;
474 603
475 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
477 606
478 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
479 608
480 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
481 610
482 my $busy = 1; 611 my $busy = 1;
483 my @res; 612 my @res;
484 613
485 (async { 614 (async {
486 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 616 @res = eval { $job->() };
488 warn $@ if $@; 617 error $@ if $@;
489 undef $busy; 618 undef $busy;
490 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
491 620
492 while ($busy) { 621 while ($busy) {
493 if (Coro::nready) { 622 if (Coro::nready) {
… …
495 } else { 624 } else {
496 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
497 } 626 }
498 } 627 }
499 628
500 my $time = EV::time - $time; 629 my $time = AE::time - $time;
501 630
502 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
503 632
504 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
505 } else { 634 } else {
… …
527 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
528 657
529 $coro 658 $coro
530} 659}
531 660
532=item fork_call { }, $args 661=item fork_call { }, @args
533 662
534Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 666never block itself or use any form of event handling.
538 667
539=cut 668=cut
540 669
670sub post_fork {
671 reset_signals;
672}
673
541sub fork_call(&@) { 674sub fork_call(&@) {
542 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
543 676
544 # 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,
545 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
547 680
548 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
549 reset_signals; 682 cf::post_fork;
550 &$cb 683 &$cb
551 }, @args; 684 } @args;
552 685
553 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 )
554} 698}
555 699
556=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
557 701
558=cut 702=cut
… …
595within each server. 739within each server.
596 740
597=cut 741=cut
598 742
599sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
600 my ($name) = @_; 747 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
602 749
603 eval { 750 eval {
604 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
614} 761}
615 762
616our $DB; 763our $DB;
617 764
618sub db_init { 765sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
621 };
622} 767}
623 768
624sub db_get($$) { 769sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
626 771
627 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
628 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
629 776
630 $! ? () 777 $! ? ()
631 : $data 778 : $data
632 }
633} 779}
634 780
635sub db_put($$$) { 781sub db_put($$$) {
636 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
665 811
666 my @data; 812 my @data;
667 my $md5; 813 my $md5;
668 814
669 for (0 .. $#$src) { 815 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 817 }
673 818
674 # if processing is expensive, check 819 # if processing is expensive, check
675 # checksum first 820 # checksum first
676 if (1) { 821 if (1) {
… …
693 838
694 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 840 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
697 842
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 844
700 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
703 848
… …
713 858
714=cut 859=cut
715 860
716sub datalog($@) { 861sub datalog($@) {
717 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 864}
720 865
721=back 866=back
722 867
723=cut 868=cut
724 869
725############################################################################# 870#############################################################################
726 871
727=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
728 873
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
732 877
733In 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>
734C<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
… …
784=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
785 930
786Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
788 933
789Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 936
792These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
793 938
794=over 4 939=over 4
… …
918 1063
919 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1066
922 } elsif (ref $type) { 1067 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
924 1069
925 } else { 1070 } else {
926 shift @arg; 1071 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
928 } 1073 }
929 } 1074 }
930} 1075}
931 1076
932sub _object_attach { 1077sub _object_attach {
… …
942 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
943 } 1088 }
944 1089
945 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
946 } else { 1091 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1093 }
949 1094
950 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
951} 1096}
952 1097
… …
1011 1156
1012 for (@$callbacks) { 1157 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1014 1159
1015 if ($@) { 1160 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1162 override;
1019 } 1163 }
1020 1164
1021 return 1 if $override; 1165 return 1 if $override;
1022 } 1166 }
… …
1085 1229
1086sub reattach { 1230sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1232 my ($obj) = @_;
1089 1233
1234 # no longer needed after getting rid of delete_package?
1090 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
1091 1236
1092 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
1093 1238
1094 @$registry = (); 1239 @$registry = ();
1095 1240
… …
1100 for (@$attach) { 1245 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1103 } 1248 }
1104 } else { 1249 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1251 }
1107 } 1252 }
1108} 1253}
1109 1254
1110cf::attachable->attach ( 1255cf::attachable->attach (
… …
1137 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1138 1283
1139 sync_job { 1284 sync_job {
1140 if (length $$rdata) { 1285 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1144 1290
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1298 aio_close $fh;
1150 1299
1151 if (@$objs) { 1300 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1309 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1311 }
1160 } else { 1312 } else {
1161 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1162 } 1314 }
1163 1315
1164 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1320 } else {
1166 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1167 } 1322 }
1168 } else { 1323 } else {
1169 aio_unlink $filename; 1324 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1171 } 1326 }
… …
1195 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1351 $av = $st->{objs};
1197 } 1352 }
1198 1353
1199 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1202 1358
1203 ($data, $av) 1359 ($data, $av)
1204} 1360}
1205 1361
1206=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1262 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1263 1419
1264 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1265} 1421}
1266 1422
1423use File::Glob ();
1424
1267cf::player->attach ( 1425cf::player->attach (
1268 on_command => sub { 1426 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1270 1428
1271 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1272 or return; 1430 or return;
1273 1431
… …
1296 1454
1297 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1456 if $reply;
1299 1457
1300 } else { 1458 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1460 }
1303 1461
1304 cf::override; 1462 cf::override;
1305 }, 1463 },
1306); 1464);
1307 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
1308sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1309 cf::sync_job { 1482 cf::sync_job {
1310 my %todo; 1483 my %todo;
1311 1484
1312 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1486 next unless -r $path;
… …
1331 1504
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1507
1335 $ext{source} = 1508 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1338 . $source 1511 . $source
1339 . "\n};\n1"; 1512 . "\n};\n1";
1340 1513
1341 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1342 } 1515 }
1343 1516
1517 my $pass = 0;
1344 my %done; 1518 my %done;
1345 while (%todo) { 1519 while (%todo) {
1346 my $progress; 1520 my $progress;
1347 1521
1522 ++$pass;
1523
1524 ext:
1348 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1527 next ext
1351 unless exists $done{$_}; 1528 unless exists $done{$_};
1352 } 1529 }
1353 1530
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1532
1356 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1537
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1539 if exists $v->{meta}{mandatory};
1364 1540
1365 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;
1366 } 1550 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1551 }
1372 1552
1373 skip: 1553 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1563 }
1377 }; 1564 };
1378} 1565}
1379 1566
1380############################################################################# 1567#############################################################################
1381 1568
1382=back 1569=back
1383 1570
1384=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1385 1572
1386Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1387 1574
1388=cut 1575=cut
1389 1576
1390package cf::player; 1577package cf::player;
1391 1578
… …
1434 1621
1435sub exists($) { 1622sub exists($) {
1436 my ($login) = @_; 1623 my ($login) = @_;
1437 1624
1438 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1440} 1627}
1441 1628
1442sub find($) { 1629sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1631 my $login = $_[0];
… …
1456 my $f = new_from_file cf::object::thawer path $login 1643 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1644 or return;
1458 1645
1459 my $pl = cf::player::load_pl $f 1646 my $pl = cf::player::load_pl $f
1460 or return; 1647 or return;
1648
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1649 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1650 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1464 } 1652 }
1465 } 1653 }
1466} 1654}
1467 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
1468sub save($) { 1669sub save($) {
1469 my ($pl) = @_; 1670 my ($pl) = @_;
1470 1671
1471 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1472 1673
… …
1477 1678
1478 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1480 1681
1481 cf::get_slot 0.01; 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];
1482 1686
1483 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1688 cf::cede_to_tick;
1485} 1689}
1486 1690
… …
1518 my ($pl) = @_; 1722 my ($pl) = @_;
1519 1723
1520 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1521 1725
1522 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1523 $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
1524 1728
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1528 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1529 1737
1530 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1570 1778
1571 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1572 my $path = path $login; 1780 my $path = path $login;
1573 1781
1574 # a .pst is a dead give-away for a valid player 1782 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1788 }
1580 1789
… …
1584 1793
1585 \@logins 1794 \@logins
1586} 1795}
1587 1796
1588=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1589 1800
1590Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1591player. May block. 1802player. May block.
1592 1803
1593=cut 1804=cut
… …
1611 } 1822 }
1612 1823
1613 \@paths 1824 \@paths
1614} 1825}
1615 1826
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1828
1618Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1830
1709=item $player->ext_reply ($msgid, @msg) 1831=item $player->ext_reply ($msgid, @msg)
1710 1832
1711Sends an ext reply to the player. 1833Sends an ext reply to the player.
1712 1834
… …
1744 1866
1745=cut 1867=cut
1746 1868
1747sub find_by_path($) { 1869sub find_by_path($) {
1748 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1749 1873
1750 my ($match, $specificity); 1874 my ($match, $specificity);
1751 1875
1752 for my $region (list) { 1876 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
… …
1782sub generate_random_map { 1906sub generate_random_map {
1783 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1784 1908
1785 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
1786 1910
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1912}
1802 1913
1803=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1804 1915
1805Register 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
… …
1810 1921
1811sub register { 1922sub register {
1812 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1924 my $pkg = caller;
1814 1925
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1927
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1929}
1820 1930
1821# also paths starting with '/' 1931# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1933
1824sub thawer_merge { 1934sub thawer_merge {
1825 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1826 1936
1827 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1832} 1942}
1833 1943
1834sub normalise { 1944sub normalise {
1835 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1836 1946
1837 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1838 1948
1839 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1840 1950
1841 # map plan: 1951 # map plan:
1842 # 1952 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1968 $path = "$base/$path";
1859 } 1969 }
1860 1970
1861 for ($path) { 1971 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1865 } 1974 }
1866 1975
1867 $path 1976 $path
… …
1881 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1882 return $self; 1991 return $self;
1883 } 1992 }
1884 } 1993 }
1885 1994
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1996 ()
1888} 1997}
1889 1998
1999# may re-bless or do other evil things
1890sub init { 2000sub init {
1891 my ($self) = @_; 2001 my ($self) = @_;
1892 2002
1893 $self 2003 $self
1894} 2004}
… …
1923sub uniq_path { 2033sub uniq_path {
1924 my ($self) = @_; 2034 my ($self) = @_;
1925 2035
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1928}
1929
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937} 2038}
1938 2039
1939sub decay_objects { 2040sub decay_objects {
1940 my ($self) = @_; 2041 my ($self) = @_;
1941 2042
… …
2023 2124
2024sub find; 2125sub find;
2025sub find { 2126sub find {
2026 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2027 2128
2129 cf::cede_to_tick;
2130
2028 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
2029 2132
2030 cf::lock_wait "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2135
2033 $cf::MAP{$path} || do { 2136 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2137 my $map = new_from_path cf::map $path
2038 or return; 2138 or return;
2039 2139
2040 $map->{last_save} = $cf::RUNTIME; 2140 $map->{last_save} = $cf::RUNTIME;
2041 2141
… …
2043 or return; 2143 or return;
2044 2144
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2145 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2146 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2147 #$cf::WAIT_FOR_TICK->wait;
2148 undef $guard2;
2048 undef $guard1; 2149 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2150 $map->reset;
2051 return find $path; 2151 return find $path;
2052 } 2152 }
2053 2153
2054 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
2055 } 2155 }
2056} 2156}
2057 2157
2058sub pre_load { } 2158sub pre_load { }
2059sub post_load { } 2159#sub post_load { } # XS
2060 2160
2061sub load { 2161sub load {
2062 my ($self) = @_; 2162 my ($self) = @_;
2063 2163
2064 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2181 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2182 $f->skip_block;
2083 $self->_load_objects ($f) 2183 $self->_load_objects ($f)
2084 or return; 2184 or return;
2085 2185
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2186 $self->post_load_original
2087 if delete $self->{load_original}; 2187 if delete $self->{load_original};
2088 2188
2089 if (my $uniq = $self->uniq_path) { 2189 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2190 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2191 unless (aio_stat $uniq) {
… …
2109 unless ($self->{deny_activate}) { 2209 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2210 $self->decay_objects;
2111 $self->fix_auto_apply; 2211 $self->fix_auto_apply;
2112 $self->update_buttons; 2212 $self->update_buttons;
2113 cf::cede_to_tick; 2213 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2214 $self->activate;
2117 } 2215 }
2118 2216
2119 $self->{last_save} = $cf::RUNTIME; 2217 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2218 $self->last_access ($cf::RUNTIME);
2121 2219
2122 $self->in_memory (cf::MAP_ACTIVE); 2220 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2221 }
2124 2222
2125 $self->post_load; 2223 $self->post_load;
2126}
2127 2224
2225 1
2226}
2227
2228# customize the map for a given player, i.e.
2229# return the _real_ map. used by e.g. per-player
2230# maps to change the path to ~playername/mappath
2128sub customise_for { 2231sub customise_for {
2129 my ($self, $ob) = @_; 2232 my ($self, $ob) = @_;
2130 2233
2131 return find "~" . $ob->name . "/" . $self->{path} 2234 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2235 if $self->per_player;
… …
2148 or next; 2251 or next;
2149 $neigh = find $neigh, $map 2252 $neigh = find $neigh, $map
2150 or next; 2253 or next;
2151 $neigh->load; 2254 $neigh->load;
2152 2255
2256 # now find the diagonal neighbours
2153 push @neigh, 2257 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2258 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2259 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2260 }
2157 2261
… …
2164} 2268}
2165 2269
2166sub find_sync { 2270sub find_sync {
2167 my ($path, $origin) = @_; 2271 my ($path, $origin) = @_;
2168 2272
2169 cf::sync_job { find $path, $origin } 2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2170} 2277}
2171 2278
2172sub do_load_sync { 2279sub do_load_sync {
2173 my ($map) = @_; 2280 my ($map) = @_;
2174 2281
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2283 if $Coro::current == $Coro::main;
2177 2284
2178 cf::sync_job { $map->load }; 2285 $map->load;
2179} 2286}
2180 2287
2181our %MAP_PREFETCH; 2288our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2289our $MAP_PREFETCHER = undef;
2183 2290
… …
2209 $MAP_PREFETCHER->prio (6); 2316 $MAP_PREFETCHER->prio (6);
2210 2317
2211 () 2318 ()
2212} 2319}
2213 2320
2321# common code, used by both ->save and ->swapout
2214sub save { 2322sub _save {
2215 my ($self) = @_; 2323 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2324
2219 $self->{last_save} = $cf::RUNTIME; 2325 $self->{last_save} = $cf::RUNTIME;
2220 2326
2221 return unless $self->dirty; 2327 return unless $self->dirty;
2222 2328
… …
2242 } else { 2348 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2349 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2350 }
2245} 2351}
2246 2352
2353sub save {
2354 my ($self) = @_;
2355
2356 my $lock = cf::lock_acquire "map_data:$self->{path}";
2357
2358 $self->_save;
2359}
2360
2247sub swap_out { 2361sub swap_out {
2248 my ($self) = @_; 2362 my ($self) = @_;
2249 2363
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2364 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2365
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2366 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2367 return if $self->{deny_save};
2368 return if $self->players;
2258 2369
2370 # first deactivate the map and "unlink" it from the core
2371 $self->deactivate;
2372 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->in_memory (cf::MAP_SWAPPED); 2373 $self->in_memory (cf::MAP_SWAPPED);
2374
2375 # then atomically save
2376 $self->_save;
2377
2378 # then free the map
2379 $self->clear;
2380}
2381
2382sub reset_at {
2383 my ($self) = @_;
2384
2385 # TODO: safety, remove and allow resettable per-player maps
2386 return 1e99 if $self->{deny_reset};
2387
2388 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2389 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2390
2391 $time + $to
2392}
2393
2394sub should_reset {
2395 my ($self) = @_;
2396
2397 $self->reset_at <= $cf::RUNTIME
2398}
2399
2400sub reset {
2401 my ($self) = @_;
2402
2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2404
2405 return if $self->players;
2406
2407 cf::trace "resetting map ", $self->path, "\n";
2408
2409 $self->in_memory (cf::MAP_SWAPPED);
2410
2411 # need to save uniques path
2412 unless ($self->{deny_save}) {
2413 my $uniq = $self->uniq_path; utf8::encode $uniq;
2414
2415 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2416 if $uniq;
2417 }
2418
2419 delete $cf::MAP{$self->path};
2260 2420
2261 $self->deactivate; 2421 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2422 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2423 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2424
2309 $self->unlink_save; 2425 $self->unlink_save;
2310 $self->destroy; 2426 $self->destroy;
2311} 2427}
2312 2428
… …
2320 2436
2321 delete $cf::MAP{$self->path}; 2437 delete $cf::MAP{$self->path};
2322 2438
2323 $self->unlink_save; 2439 $self->unlink_save;
2324 2440
2325 bless $self, "cf::map"; 2441 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2442 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2443 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2444 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2445 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2446
… …
2387 : normalise $_ 2503 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2504 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2505 ]
2390} 2506}
2391 2507
2508=item cf::map::static_maps
2509
2510Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2511file in the shared directory excluding F</styles> and F</editor>). May
2512block.
2513
2514=cut
2515
2516sub static_maps() {
2517 my @dirs = "";
2518 my @maps;
2519
2520 while (@dirs) {
2521 my $dir = shift @dirs;
2522
2523 next if $dir eq "/styles" || $dir eq "/editor";
2524
2525 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2526 or return;
2527
2528 for (@$files) {
2529 s/\.map$// or next;
2530 utf8::decode $_;
2531 push @maps, "$dir/$_";
2532 }
2533
2534 push @dirs, map "$dir/$_", @$dirs;
2535 }
2536
2537 \@maps
2538}
2539
2392=back 2540=back
2393 2541
2394=head3 cf::object 2542=head3 cf::object
2395 2543
2396=cut 2544=cut
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2605can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2606dialogue with the given NPC character.
2459 2607
2460=cut 2608=cut
2461 2609
2610our $SAY_CHANNEL = {
2611 id => "say",
2612 title => "Map",
2613 reply => "say ",
2614 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2615};
2616
2617our $CHAT_CHANNEL = {
2618 id => "chat",
2619 title => "Chat",
2620 reply => "chat ",
2621 tooltip => "Player chat and shouts, global to the server.",
2622};
2623
2462# rough implementation of a future "reply" method that works 2624# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2625# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2626#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2627sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2628 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2639 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2640 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2641
2480 } else { 2642 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2643 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2644 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2645 }
2484 } 2646 }
2485} 2647}
2486 2648
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2649=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2674
2513=item $player_object->enter_link 2675=item $player_object->enter_link
2514 2676
2515Freezes the player and moves him/her to a special map (C<{link}>). 2677Freezes the player and moves him/her to a special map (C<{link}>).
2516 2678
2517The player should be reasonably safe there for short amounts of time. You 2679The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2680for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2681though, as the player cannot control the character while it is on the link
2682map.
2519 2683
2520Will never block. 2684Will never block.
2521 2685
2522=item $player_object->leave_link ($map, $x, $y) 2686=item $player_object->leave_link ($map, $x, $y)
2523 2687
… …
2543sub cf::object::player::enter_link { 2707sub cf::object::player::enter_link {
2544 my ($self) = @_; 2708 my ($self) = @_;
2545 2709
2546 $self->deactivate_recursive; 2710 $self->deactivate_recursive;
2547 2711
2712 ++$self->{_link_recursion};
2713
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2714 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2715
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2716 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2717 if $self->map && $self->map->{path} ne "{link}";
2552 2718
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2719 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2720}
2555 2721
2556sub cf::object::player::leave_link { 2722sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2723 my ($self, $map, $x, $y) = @_;
2558 2724
… …
2575 ($x, $y) = (-1, -1) 2741 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2742 unless (defined $x) && (defined $y);
2577 2743
2578 # use -1 or undef as default coordinates, not 0, 0 2744 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2745 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2746 if $x <= 0 && $y <= 0;
2581 2747
2582 $map->load; 2748 $map->load;
2583 $map->load_neighbours; 2749 $map->load_neighbours;
2584 2750
2585 return unless $self->contr->active; 2751 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2752
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2590} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2591 2760
2761}
2762
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2764
2594Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2769be called at the end of this process.
2599 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2600=cut 2774=cut
2601 2775
2602our $GOTOGEN; 2776our $GOTOGEN;
2603 2777
2604sub cf::object::player::goto { 2778sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2606 2786
2607 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2789
2610 $self->enter_link; 2790 $self->enter_link;
… …
2634 my $map = eval { 2814 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path : undef;
2636 2816
2637 if ($map) { 2817 if ($map) {
2638 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2820 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2822 }
2643 2823
2644 $map 2824 $map
… …
2652 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2655 } 2835 }
2656 2836
2657 $done->() if $done; 2837 $done->($self) if $done;
2658 })->prio (1); 2838 })->prio (1);
2659} 2839}
2660 2840
2661=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2662 2842
… …
2682} 2862}
2683 2863
2684sub prepare_random_map { 2864sub prepare_random_map {
2685 my ($exit) = @_; 2865 my ($exit) = @_;
2686 2866
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2869 # that depends on the exit object
2692 2870
2693 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2873 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2700 } 2880 }
2701 2881
2702 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2703 2883
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2890 undef $fh;
2711 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2712 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2715 } 2899 }
2716} 2900}
2717 2901
2718sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2720 2904
2721 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2722 2906
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2907 $self->enter_link;
2735 2908
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2909 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2910 $Coro::current->{desc} = "enter_exit";
2742 2911
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 # random map handling
2916 {
2917 my $guard = cf::lock_acquire "exit_prepare:$exit";
2918
2919 prepare_random_map $exit
2920 if $exit->slaying eq "/!";
2921 }
2922
2923 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2924 my $x = $exit->stats->hp;
2925 my $y = $exit->stats->sp;
2926
2745 $self->goto ($slaying, $hp, $sp); 2927 $self->goto ($map, $x, $y);
2746 2928
2929 # if exit is damned, update players death & WoR home-position
2930 $self->contr->savebed ($map, $x, $y)
2931 if $exit->flag (cf::FLAG_DAMNED);
2932
2747 1; 2933 1
2748 }) { 2934 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2935 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2936 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2937 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2938 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2939
2754 warn "ERROR in enter_exit: $@"; 2940 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 2941 $self->leave_link;
2756 } 2942 }
2757 })->prio (1); 2943 })->prio (1);
2758} 2944}
2759 2945
… …
2771sub cf::client::send_drawinfo { 2957sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2958 my ($self, $text, $flags) = @_;
2773 2959
2774 utf8::encode $text; 2960 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2961 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2962}
2963
2964=item $client->send_big_packet ($pkt)
2965
2966Like C<send_packet>, but tries to compress large packets, and fragments
2967them as required.
2968
2969=cut
2970
2971our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2972
2973sub cf::client::send_big_packet {
2974 my ($self, $pkt) = @_;
2975
2976 # try lzf for large packets
2977 $pkt = "lzf " . Compress::LZF::compress $pkt
2978 if 1024 <= length $pkt and $self->{can_lzf};
2979
2980 # split very large packets
2981 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2982 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2983 $pkt = "frag";
2984 }
2985
2986 $self->send_packet ($pkt);
2776} 2987}
2777 2988
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2989=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2990
2780Send a drawinfo or msg packet to the client, formatting the msg for the 2991Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2784 2995
2785=cut 2996=cut
2786 2997
2787# non-persistent channels (usually the info channel) 2998# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2999our %CHANNEL = (
3000 "c/motd" => {
3001 id => "infobox",
3002 title => "MOTD",
3003 reply => undef,
3004 tooltip => "The message of the day",
3005 },
2789 "c/identify" => { 3006 "c/identify" => {
2790 id => "infobox", 3007 id => "infobox",
2791 title => "Identify", 3008 title => "Identify",
2792 reply => undef, 3009 reply => undef,
2793 tooltip => "Items recently identified", 3010 tooltip => "Items recently identified",
… …
2795 "c/examine" => { 3012 "c/examine" => {
2796 id => "infobox", 3013 id => "infobox",
2797 title => "Examine", 3014 title => "Examine",
2798 reply => undef, 3015 reply => undef,
2799 tooltip => "Signs and other items you examined", 3016 tooltip => "Signs and other items you examined",
3017 },
3018 "c/shopinfo" => {
3019 id => "infobox",
3020 title => "Shop Info",
3021 reply => undef,
3022 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 3023 },
2801 "c/book" => { 3024 "c/book" => {
2802 id => "infobox", 3025 id => "infobox",
2803 title => "Book", 3026 title => "Book",
2804 reply => undef, 3027 reply => undef,
… …
2820 id => "infobox", 3043 id => "infobox",
2821 title => "Body Parts", 3044 title => "Body Parts",
2822 reply => undef, 3045 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3046 tooltip => "Shows which body parts you posess and are available",
2824 }, 3047 },
3048 "c/statistics" => {
3049 id => "infobox",
3050 title => "Statistics",
3051 reply => undef,
3052 tooltip => "Shows your primary statistics",
3053 },
3054 "c/skills" => {
3055 id => "infobox",
3056 title => "Skills",
3057 reply => undef,
3058 tooltip => "Shows your experience per skill and item power",
3059 },
3060 "c/shopitems" => {
3061 id => "infobox",
3062 title => "Shop Items",
3063 reply => undef,
3064 tooltip => "Shows the items currently for sale in this shop",
3065 },
3066 "c/resistances" => {
3067 id => "infobox",
3068 title => "Resistances",
3069 reply => undef,
3070 tooltip => "Shows your resistances",
3071 },
3072 "c/pets" => {
3073 id => "infobox",
3074 title => "Pets",
3075 reply => undef,
3076 tooltip => "Shows information abotu your pets/a specific pet",
3077 },
3078 "c/perceiveself" => {
3079 id => "infobox",
3080 title => "Perceive Self",
3081 reply => undef,
3082 tooltip => "You gained detailed knowledge about yourself",
3083 },
2825 "c/uptime" => { 3084 "c/uptime" => {
2826 id => "infobox", 3085 id => "infobox",
2827 title => "Uptime", 3086 title => "Uptime",
2828 reply => undef, 3087 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3088 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 3091 id => "infobox",
2833 title => "Map Info", 3092 title => "Map Info",
2834 reply => undef, 3093 reply => undef,
2835 tooltip => "Information related to the maps", 3094 tooltip => "Information related to the maps",
2836 }, 3095 },
3096 "c/party" => {
3097 id => "party",
3098 title => "Party",
3099 reply => "gsay ",
3100 tooltip => "Messages and chat related to your party",
3101 },
3102 "c/death" => {
3103 id => "death",
3104 title => "Death",
3105 reply => undef,
3106 tooltip => "Reason for and more info about your most recent death",
3107 },
3108 "c/say" => $SAY_CHANNEL,
3109 "c/chat" => $CHAT_CHANNEL,
2837); 3110);
2838 3111
2839sub cf::client::send_msg { 3112sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3113 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3114
2842 $msg = $self->pl->expand_cfpod ($msg); 3115 $msg = $self->pl->expand_cfpod ($msg)
3116 unless $color & cf::NDI_VERBATIM;
2843 3117
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3118 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3119
2846 # check predefined channels, for the benefit of C 3120 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3121 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3122 $channel = $CHANNEL{$channel};
2849 3123
2850 $self->ext_msg (channel_info => $channel) 3124 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3125 $channel = $channel->{id};
2854 3126
2855 } elsif (ref $channel) { 3127 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3128 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3129 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3130 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3131 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3132 }
2862 3133
2863 $channel = $channel->{id}; 3134 $channel = $channel->{id};
2864 } 3135 }
2865 3136
2866 return unless @extra || length $msg; 3137 return unless @extra || length $msg;
2867 3138
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3139 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3140 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3141 if $color & cf::NDI_DEF;
2872 3142
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3143 my $pkt = "msg "
3144 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3145 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3146 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 3147
2887 $color &= cf::NDI_COLOR_MASK; 3148 $self->send_big_packet ($pkt);
2888
2889 utf8::encode $msg;
2890
2891 if (0 && $msg =~ /\[/) {
2892 # COMMAND/INFO
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 }
2900} 3149}
2901 3150
2902=item $client->ext_msg ($type, @msg) 3151=item $client->ext_msg ($type, @msg)
2903 3152
2904Sends an ext event to the client. 3153Sends an ext event to the client.
… …
2907 3156
2908sub cf::client::ext_msg($$@) { 3157sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3158 my ($self, $type, @msg) = @_;
2910 3159
2911 if ($self->extcmd == 2) { 3160 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3162 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3163 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3164 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3165 }
2917} 3166}
2918 3167
2919=item $client->ext_reply ($msgid, @msg) 3168=item $client->ext_reply ($msgid, @msg)
2920 3169
… …
2924 3173
2925sub cf::client::ext_reply($$@) { 3174sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3175 my ($self, $id, @msg) = @_;
2927 3176
2928 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3179 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3180 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3181 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3183 }
2935} 3184}
2936 3185
2937=item $success = $client->query ($flags, "text", \&cb) 3186=item $success = $client->query ($flags, "text", \&cb)
2938 3187
… …
3009 3258
3010 $ns->ext_reply ($reply, @reply) 3259 $ns->ext_reply ($reply, @reply)
3011 if $reply; 3260 if $reply;
3012 3261
3013 } else { 3262 } else {
3014 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3263 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3015 } 3264 }
3016 3265
3017 cf::override; 3266 cf::override;
3018 }, 3267 },
3019); 3268);
… …
3039 3288
3040 $coro 3289 $coro
3041} 3290}
3042 3291
3043cf::client->attach ( 3292cf::client->attach (
3044 on_destroy => sub { 3293 on_client_destroy => sub {
3045 my ($ns) = @_; 3294 my ($ns) = @_;
3046 3295
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3296 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3297 },
3049); 3298);
… …
3065our $safe_hole = new Safe::Hole; 3314our $safe_hole = new Safe::Hole;
3066 3315
3067$SIG{FPE} = 'IGNORE'; 3316$SIG{FPE} = 'IGNORE';
3068 3317
3069$safe->permit_only (Opcode::opset qw( 3318$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3319 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3320 grepstart grepwhile mapstart mapwhile
3072 sort time 3321 sort time
3073)); 3322));
3074 3323
3075# here we export the classes and methods available to script code 3324# here we export the classes and methods available to script code
… …
3078 3327
3079The following functions and methods are available within a safe environment: 3328The following functions and methods are available within a safe environment:
3080 3329
3081 cf::object 3330 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3331 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3332 insert remove name archname title slaying race decrease split
3333 value
3084 3334
3085 cf::object::player 3335 cf::object::player
3086 player 3336 player
3087 3337
3088 cf::player 3338 cf::player
… …
3093 3343
3094=cut 3344=cut
3095 3345
3096for ( 3346for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3347 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3348 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3349 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3350 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3351 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3352 ["cf::map" => qw(trigger)],
3103) { 3353) {
3104 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3354 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3355 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3107 for @funs; 3356 for @funs;
3108} 3357}
3109 3358
… …
3124 3373
3125 my $qcode = $code; 3374 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3375 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3376 $qcode =~ s/\n/\\n/g;
3128 3377
3378 %vars = (_dummy => 0) unless %vars;
3379
3380 my @res;
3129 local $_; 3381 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3382
3132 my $eval = 3383 my $eval =
3133 "do {\n" 3384 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3385 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3386 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3387 . $code
3137 . "\n}" 3388 . "\n}"
3138 ; 3389 ;
3139 3390
3391 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3392 sub_generation_inc;
3393 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3394 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3395 sub_generation_inc;
3396 } else {
3397 local @cf::_safe_eval_args = values %vars;
3398 @res = wantarray ? eval eval : scalar eval $eval;
3399 }
3143 3400
3144 if ($@) { 3401 if ($@) {
3145 warn "$@"; 3402 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3403 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3404 "with arguments " . (join " ", %vars) . "\n";
3148 } 3405 }
3149 3406
3150 wantarray ? @res : $res[0] 3407 wantarray ? @res : $res[0]
3151} 3408}
3152 3409
… …
3166=cut 3423=cut
3167 3424
3168sub register_script_function { 3425sub register_script_function {
3169 my ($fun, $cb) = @_; 3426 my ($fun, $cb) = @_;
3170 3427
3171 no strict 'refs'; 3428 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3429 *$fun = $safe_hole->wrap ($cb);
3173} 3430}
3174 3431
3175=back 3432=back
3176 3433
3177=cut 3434=cut
… …
3186 # for this (global event?) 3443 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3444 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3445
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3446 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3447
3191 warn "loading facedata from $path\n"; 3448 trace "loading facedata from $path\n";
3192 3449
3193 my $facedata; 3450 my $facedata = decode_storable load_file $path;
3194 0 < aio_load $path, $facedata
3195 or die "$path: $!";
3196
3197 $facedata = Coro::Storable::thaw $facedata;
3198 3451
3199 $facedata->{version} == 2 3452 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3453 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3454
3202 # patch in the exptable 3455 # patch in the exptable
3456 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3457 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3458 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3459 data => $exp_table,
3460 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3461 };
3207 cf::cede_to_tick; 3462 cf::cede_to_tick;
3208 3463
3209 { 3464 {
3210 my $faces = $facedata->{faceinfo}; 3465 my $faces = $facedata->{faceinfo};
… …
3212 while (my ($face, $info) = each %$faces) { 3467 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3468 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3469
3215 cf::face::set_visibility $idx, $info->{visibility}; 3470 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3471 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3472 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3473 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3219 3475
3220 cf::cede_to_tick; 3476 cf::cede_to_tick;
3221 } 3477 }
3222 3478
3223 while (my ($face, $info) = each %$faces) { 3479 while (my ($face, $info) = each %$faces) {
… …
3228 3484
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3485 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3486 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3487 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3488 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3489 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3490 }
3235 3491
3236 cf::cede_to_tick; 3492 cf::cede_to_tick;
3237 } 3493 }
3238 } 3494 }
… …
3247 3503
3248 cf::anim::invalidate_all; # d'oh 3504 cf::anim::invalidate_all; # d'oh
3249 } 3505 }
3250 3506
3251 { 3507 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3508 my $res = $facedata->{resource};
3255 3509
3256 while (my ($name, $info) = each %$res) { 3510 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3511 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3512 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3513
3261 if ($info->{type} & 1) { 3514 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3515 cf::face::set_type $idx, $info->{type};
3276 } else { 3516 } else {
3277 $RESOURCE{$name} = $info; 3517 $RESOURCE{$name} = $info; # unused
3278 } 3518 }
3279 3519
3280 cf::cede_to_tick; 3520 cf::cede_to_tick;
3281 } 3521 }
3282 } 3522 }
3283 3523
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3524 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3525
3286 1 3526 1
3287} 3527}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3528
3309register_exticmd fx_want => sub { 3529register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3530 my ($ns, $want) = @_;
3311 3531
3312 while (my ($k, $v) = each %$want) { 3532 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3533 $ns->fx_want ($k, $v);
3314 } 3534 }
3315}; 3535};
3536
3537sub load_resource_file($) {
3538 my $guard = lock_acquire "load_resource_file";
3539
3540 my $status = load_resource_file_ $_[0];
3541 get_slot 0.1, 100;
3542 cf::arch::commit_load;
3543
3544 $status
3545}
3316 3546
3317sub reload_regions { 3547sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3548 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3549 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3550 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3334} 3564}
3335 3565
3336sub reload_archetypes { 3566sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3567 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3568 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3569}
3345 3570
3346sub reload_treasures { 3571sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3572 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3573 or die "unable to load treasurelists\n";
3349} 3574}
3350 3575
3576sub reload_sound {
3577 trace "loading sound config from $DATADIR/sound\n";
3578
3579 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3580
3581 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3582 my $sound = $soundconf->{compat}[$_]
3583 or next;
3584
3585 my $face = cf::face::find "sound/$sound->[1]";
3586 cf::sound::set $sound->[0] => $face;
3587 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3588 }
3589
3590 while (my ($k, $v) = each %{$soundconf->{event}}) {
3591 my $face = cf::face::find "sound/$v";
3592 cf::sound::set $k => $face;
3593 }
3594}
3595
3351sub reload_resources { 3596sub reload_resources {
3352 warn "reloading resource files...\n"; 3597 trace "reloading resource files...\n";
3353 3598
3599 reload_exp_table;
3600 reload_materials;
3601 reload_facedata;
3602 reload_sound;
3603 reload_archetypes;
3354 reload_regions; 3604 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3605 reload_treasures;
3359 3606
3360 warn "finished reloading resource files\n"; 3607 trace "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3608}
3366 3609
3367sub reload_config { 3610sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3611 trace "reloading config file...\n";
3369 or return;
3370 3612
3371 local $/; 3613 my $config = load_file "$CONFDIR/config";
3372 *CFG = YAML::Load <$fh>; 3614 utf8::decode $config;
3615 *CFG = decode_yaml $config;
3373 3616
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3617 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3618
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3619 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3620 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3621
3379 if (exists $CFG{mlockall}) { 3622 if (exists $CFG{mlockall}) {
… …
3383 }; 3626 };
3384 warn $@ if $@; 3627 warn $@ if $@;
3385 } 3628 }
3386} 3629}
3387 3630
3631sub pidfile() {
3632 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3633 or die "$PIDFILE: $!";
3634 flock $fh, &Fcntl::LOCK_EX
3635 or die "$PIDFILE: flock: $!";
3636 $fh
3637}
3638
3639# make sure only one server instance is running at any one time
3640sub atomic {
3641 my $fh = pidfile;
3642
3643 my $pid = <$fh>;
3644 kill 9, $pid if $pid > 0;
3645
3646 seek $fh, 0, 0;
3647 print $fh $$;
3648}
3649
3650sub main_loop {
3651 trace "EV::loop starting\n";
3652 if (1) {
3653 EV::loop;
3654 }
3655 trace "EV::loop returned\n";
3656 goto &main_loop unless $REALLY_UNLOOP;
3657}
3658
3388sub main { 3659sub main {
3660 cf::init_globals; # initialise logging
3661
3662 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3664 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666
3667 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3668
3389 # we must not ever block the main coroutine 3669 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3670 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3671 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3672 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3673 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3674 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3675 })->prio (Coro::PRIO_MAX);
3396 }; 3676 };
3397 3677
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3678 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3679
3680 cf::sync_job {
3681 cf::incloader::init ();
3682
3683 cf::init_anim;
3684 cf::init_attackmess;
3685 cf::init_dynamic;
3686
3687 cf::load_settings;
3688
3689 reload_resources;
3690 reload_config;
3691 db_init;
3692
3693 cf::init_uuid;
3694 cf::init_signals;
3695 cf::init_skills;
3696
3697 cf::init_beforeplay;
3698
3699 atomic;
3700
3701 load_extensions;
3702
3703 utime time, time, $RUNTIMEFILE;
3704
3705 # no (long-running) fork's whatsoever before this point(!)
3706 use POSIX ();
3707 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3708
3709 cf::_post_init 0;
3710 };
3711
3712 cf::object::thawer::errors_are_fatal 0;
3713 info "parse errors in files are no longer fatal from this point on.\n";
3714
3715 my $free_main; $free_main = EV::idle sub {
3716 undef $free_main;
3717 undef &main; # free gobs of memory :)
3718 };
3719
3720 goto &main_loop;
3405} 3721}
3406 3722
3407############################################################################# 3723#############################################################################
3408# initialisation and cleanup 3724# initialisation and cleanup
3409 3725
3410# install some emergency cleanup handlers 3726# install some emergency cleanup handlers
3411BEGIN { 3727BEGIN {
3412 our %SIGWATCHER = (); 3728 our %SIGWATCHER = ();
3413 for my $signal (qw(INT HUP TERM)) { 3729 for my $signal (qw(INT HUP TERM)) {
3414 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3730 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3415 cf::cleanup "SIG$signal"; 3731 cf::cleanup "SIG$signal";
3416 }; 3732 };
3417 } 3733 }
3418} 3734}
3419 3735
3420sub write_runtime_sync { 3736sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3737 my $t0 = AE::time;
3422 3738
3423 # first touch the runtime file to show we are still running: 3739 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3740 # the fsync below can take a very very long time.
3425 3741
3426 IO::AIO::aio_utime $runtime, undef, undef; 3742 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3743
3428 my $guard = cf::lock_acquire "write_runtime"; 3744 my $guard = cf::lock_acquire "write_runtime";
3429 3745
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3746 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3747 or return;
3432 3748
3433 my $value = $cf::RUNTIME + 90 + 10; 3749 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3750 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3751 # 60 allows for the watchdog to kill the server.
… …
3445 aio_utime $fh, undef, undef; 3761 aio_utime $fh, undef, undef;
3446 3762
3447 close $fh 3763 close $fh
3448 or return; 3764 or return;
3449 3765
3450 aio_rename "$runtime~", $runtime 3766 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3767 and return;
3452 3768
3453 warn "runtime file written.\n"; 3769 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3770
3455 1 3771 1
3456} 3772}
3457 3773
3458our $uuid_lock; 3774our $uuid_lock;
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3783 my $uuid = "$LOCALDIR/uuid";
3468 3784
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3785 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3786 or return;
3471 3787
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3788 my $value = uuid_seq uuid_cur;
3789
3790 unless ($value) {
3791 info "cowardly refusing to write zero uuid value!\n";
3792 return;
3793 }
3794
3795 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3796 $uuid_skip = 0;
3474 3797
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3798 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3799 and return;
3477 3800
… …
3483 or return; 3806 or return;
3484 3807
3485 aio_rename "$uuid~", $uuid 3808 aio_rename "$uuid~", $uuid
3486 and return; 3809 and return;
3487 3810
3488 warn "uuid file written ($value).\n"; 3811 trace "uuid file written ($value).\n";
3489 3812
3490 1 3813 1
3491 3814
3492} 3815}
3493 3816
… …
3499} 3822}
3500 3823
3501sub emergency_save() { 3824sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3825 my $freeze_guard = cf::freeze_mainloop;
3503 3826
3504 warn "enter emergency perl save\n"; 3827 info "emergency_perl_save: enter\n";
3828
3829 # this is a trade-off: we want to be very quick here, so
3830 # save all maps without fsync, and later call a global sync
3831 # (which in turn might be very very slow)
3832 local $USE_FSYNC = 0;
3505 3833
3506 cf::sync_job { 3834 cf::sync_job {
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3507 # use a peculiar iteration method to avoid tripping on perl 3837 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3838 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3839 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3840 info "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3841 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3842 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3843 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3844 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3845 $pl->save;
3516 } 3846 }
3517 warn "end emergency player save\n"; 3847 info "emergency_perl_save: end player save\n";
3518 3848
3519 warn "begin emergency map save\n"; 3849 cf::write_runtime_sync; # external watchdog should not bark
3850
3851 info "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3852 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3853 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3854 $map->valid or next;
3523 $map->save; 3855 $map->save;
3524 } 3856 }
3525 warn "end emergency map save\n"; 3857 info "emergency_perl_save: end map save\n";
3526 3858
3527 warn "begin emergency database checkpoint\n"; 3859 cf::write_runtime_sync; # external watchdog should not bark
3860
3861 info "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3862 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3863 info "emergency_perl_save: end database checkpoint\n";
3530 3864
3531 warn "begin write uuid\n"; 3865 info "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3866 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3867 info "emergency_perl_save: end write uuid\n";
3868
3869 cf::write_runtime_sync; # external watchdog should not bark
3870
3871 trace "emergency_perl_save: syncing database to disk";
3872 BDB::db_env_txn_checkpoint $DB_ENV;
3873
3874 info "emergency_perl_save: starting sync\n";
3875 IO::AIO::aio_sync sub {
3876 info "emergency_perl_save: finished sync\n";
3877 };
3878
3879 cf::write_runtime_sync; # external watchdog should not bark
3880
3881 trace "emergency_perl_save: flushing outstanding aio requests";
3882 while (IO::AIO::nreqs || BDB::nreqs) {
3883 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3884 }
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3534 }; 3887 };
3535 3888
3536 warn "leave emergency perl save\n"; 3889 info "emergency_perl_save: leave\n";
3537} 3890}
3538 3891
3539sub post_cleanup { 3892sub post_cleanup {
3540 my ($make_core) = @_; 3893 my ($make_core) = @_;
3541 3894
3895 IO::AIO::flush;
3896
3542 warn Carp::longmess "post_cleanup backtrace" 3897 error Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3898 if $make_core;
3899
3900 my $fh = pidfile;
3901 unlink $PIDFILE if <$fh> == $$;
3902}
3903
3904# a safer delete_package, copied from Symbol
3905sub clear_package($) {
3906 my $pkg = shift;
3907
3908 # expand to full symbol table name if needed
3909 unless ($pkg =~ /^main::.*::$/) {
3910 $pkg = "main$pkg" if $pkg =~ /^::/;
3911 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3912 $pkg .= '::' unless $pkg =~ /::$/;
3913 }
3914
3915 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3916 my $stem_symtab = *{$stem}{HASH};
3917
3918 defined $stem_symtab and exists $stem_symtab->{$leaf}
3919 or return;
3920
3921 # clear all symbols
3922 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3923 for my $name (keys %$leaf_symtab) {
3924 _gv_clear *{"$pkg$name"};
3925# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3926 }
3544} 3927}
3545 3928
3546sub do_reload_perl() { 3929sub do_reload_perl() {
3547 # can/must only be called in main 3930 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3931 unless (in_main) {
3549 warn "can only reload from main coroutine"; 3932 error "can only reload from main coroutine";
3550 return; 3933 return;
3551 } 3934 }
3552 3935
3553 warn "reloading..."; 3936 return if $RELOAD++;
3554 3937
3555 warn "entering sync_job"; 3938 my $t1 = AE::time;
3556 3939
3940 while ($RELOAD) {
3941 cf::get_slot 0.1, -1, "reload_perl";
3942 info "perl_reload: reloading...";
3943
3944 trace "perl_reload: entering sync_job";
3945
3557 cf::sync_job { 3946 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3947 #cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark
3561 3948
3562 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV;
3564
3565 # if anything goes wrong in here, we should simply crash as we already saved
3566
3567 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs;
3573 warn "iterate...";
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros"; 3949 trace "perl_reload: cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO; 3950 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = (); 3951 %EXT_CORO = ();
3581 3952
3582 warn "removing commands"; 3953 trace "perl_reload: removing commands";
3583 %COMMAND = (); 3954 %COMMAND = ();
3584 3955
3585 warn "removing ext/exti commands"; 3956 trace "perl_reload: removing ext/exti commands";
3586 %EXTCMD = (); 3957 %EXTCMD = ();
3587 %EXTICMD = (); 3958 %EXTICMD = ();
3588 3959
3589 warn "unloading/nuking all extensions"; 3960 trace "perl_reload: unloading/nuking all extensions";
3590 for my $pkg (@EXTS) { 3961 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg"; 3962 trace "... unloading $pkg";
3592 3963
3593 if (my $cb = $pkg->can ("unload")) { 3964 if (my $cb = $pkg->can ("unload")) {
3594 eval { 3965 eval {
3595 $cb->($pkg); 3966 $cb->($pkg);
3596 1 3967 1
3597 } or warn "$pkg unloaded, but with errors: $@"; 3968 } or error "$pkg unloaded, but with errors: $@";
3969 }
3970
3971 trace "... clearing $pkg";
3972 clear_package $pkg;
3598 } 3973 }
3599 3974
3600 warn "... nuking $pkg";
3601 Symbol::delete_package $pkg;
3602 }
3603
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3975 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3605 while (my ($k, $v) = each %INC) { 3976 while (my ($k, $v) = each %INC) {
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3977 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3978
3608 warn "... unloading $k"; 3979 trace "... unloading $k";
3609 delete $INC{$k}; 3980 delete $INC{$k};
3610 3981
3611 $k =~ s/\.pm$//; 3982 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g; 3983 $k =~ s/\//::/g;
3613 3984
3614 if (my $cb = $k->can ("unload_module")) { 3985 if (my $cb = $k->can ("unload_module")) {
3615 $cb->(); 3986 $cb->();
3987 }
3988
3989 clear_package $k;
3616 } 3990 }
3617 3991
3618 Symbol::delete_package $k;
3619 }
3620
3621 warn "getting rid of safe::, as good as possible"; 3992 trace "perl_reload: getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3993 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3994 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3995
3625 warn "unloading cf.pm \"a bit\""; 3996 trace "perl_reload: unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3997 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3998 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3999
3629 # don't, removes xs symbols, too, 4000 # don't, removes xs symbols, too,
3630 # and global variables created in xs 4001 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 4002 #clear_package __PACKAGE__;
3632 4003
3633 warn "unload completed, starting to reload now"; 4004 info "perl_reload: unload completed, starting to reload now";
3634 4005
3635 warn "reloading cf.pm"; 4006 trace "perl_reload: reloading cf.pm";
3636 require cf; 4007 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4008 cf::_connect_to_perl_1;
3638 4009
3639 warn "loading config and database again"; 4010 trace "perl_reload: loading config and database again";
3640 cf::reload_config; 4011 cf::reload_config;
3641 4012
3642 warn "loading extensions"; 4013 trace "perl_reload: loading extensions";
3643 cf::load_extensions; 4014 cf::load_extensions;
3644 4015
4016 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 4017 trace "perl_reload: reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 4018 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 4019 trace "perl_reload: reattaching attachments to maps";
3648 reattach $_ for values %MAP; 4020 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 4021 trace "perl_reload: reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 4022 reattach $_ for values %PLAYER;
4023 }
3651 4024
3652 warn "leaving sync_job"; 4025 cf::_post_init 1;
3653 4026
4027 trace "perl_reload: leaving sync_job";
4028
3654 1 4029 1
3655 } or do { 4030 } or do {
3656 warn $@; 4031 error $@;
3657 cf::cleanup "error while reloading, exiting."; 4032 cf::cleanup "perl_reload: error, exiting.";
4033 };
4034
4035 --$RELOAD;
3658 }; 4036 }
3659 4037
3660 warn "reloaded"; 4038 $t1 = AE::time - $t1;
4039 info "perl_reload: completed in ${t1}s\n";
3661}; 4040};
3662 4041
3663our $RELOAD_WATCHER; # used only during reload 4042our $RELOAD_WATCHER; # used only during reload
3664 4043
3665sub reload_perl() { 4044sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 4045 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 4046 # coro crashes during coro_state_free->destroy here.
3668 4047
4048 $RELOAD_WATCHER ||= cf::async {
4049 Coro::AIO::aio_wait cache_extensions;
4050
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4051 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 4052 do_reload_perl;
3671 undef $RELOAD_WATCHER; 4053 undef $RELOAD_WATCHER;
4054 };
3672 }; 4055 };
3673} 4056}
3674 4057
3675register_command "reload" => sub { 4058register_command "reload" => sub {
3676 my ($who, $arg) = @_; 4059 my ($who, $arg) = @_;
… …
3682 reload_perl; 4065 reload_perl;
3683 }; 4066 };
3684 } 4067 }
3685}; 4068};
3686 4069
3687unshift @INC, $LIBDIR; 4070#############################################################################
3688 4071
3689my $bug_warning = 0; 4072my $bug_warning = 0;
3690 4073
3691our @WAIT_FOR_TICK; 4074our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 4075our @WAIT_FOR_TICK_BEGIN;
3693 4076
3694sub wait_for_tick { 4077sub wait_for_tick() {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 4078 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3697 4079
3698 my $signal = new Coro::Signal; 4080 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 4081 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 4082 $signal->wait;
3701} 4083}
3702 4084
3703sub wait_for_tick_begin { 4085sub wait_for_tick_begin() {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 4086 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 4087
3707 my $signal = new Coro::Signal; 4088 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 4089 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 4090 $signal->wait;
3710} 4091}
… …
3716 return; 4097 return;
3717 } 4098 }
3718 4099
3719 cf::server_tick; # one server iteration 4100 cf::server_tick; # one server iteration
3720 4101
4102 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4104 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4105 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3723 Coro::async_pool { 4106 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 4107 $Coro::current->{desc} = "runtime saver";
3725 write_runtime_sync 4108 write_runtime_sync
3726 or warn "ERROR: unable to write runtime file: $!"; 4109 or error "ERROR: unable to write runtime file: $!";
3727 }; 4110 };
3728 } 4111 }
3729 4112
3730 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4113 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3731 $sig->send; 4114 $sig->send;
… …
3739 4122
3740 if (0) { 4123 if (0) {
3741 if ($NEXT_TICK) { 4124 if ($NEXT_TICK) {
3742 my $jitter = $TICK_START - $NEXT_TICK; 4125 my $jitter = $TICK_START - $NEXT_TICK;
3743 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3744 warn "jitter $JITTER\n";#d# 4127 debug "jitter $JITTER\n";#d#
3745 } 4128 }
3746 } 4129 }
3747} 4130}
3748 4131
3749{ 4132{
3750 # configure BDB 4133 # configure BDB
3751 4134
3752 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 4137 $AnyEvent::BDB::WATCHER->priority (1);
3755 4138
3756 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 4146
3763 cf::sync_job { 4147 cf::sync_job {
3764 eval { 4148 eval {
… …
3790{ 4174{
3791 # configure IO::AIO 4175 # configure IO::AIO
3792 4176
3793 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4179 undef $AnyEvent::AIO::WATCHER;
3796} 4180}
3797 4181
3798my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3799 4184
3800sub _log_backtrace { 4185sub _log_backtrace {
3801 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3802 4187
3803 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3804 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3805 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3807 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3808 async { 4198 async {
3809 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3810 4200
3811 my @bt = fork_call { 4201 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
… …
3823 } 4213 }
3824 4214
3825 @funcs 4215 @funcs
3826 }; 4216 };
3827 4217
3828 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4221 --$_log_backtrace;
3831 }; 4222 };
3832 } else { 4223 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3835 } 4226 }
3836} 4227}
3837 4228
3838# load additional modules 4229# load additional modules
3839use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3840 4232
3841END { cf::emergency_save } 4233END { cf::emergency_save }
3842 4234
38431 42351
3844 4236

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines