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.421 by root, Tue Apr 15 18:43:11 2008 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 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
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 77
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 245that call.
199 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 258 my $msg = join "", @_;
207 259
208 $msg .= "\n" 260 $msg .= "\n"
209 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
210 262
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 264
213 LOG llevError, $msg; 265 LOG llevError, $msg;
214 }; 266};
215}
216 267
217$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
219 270
220 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 275 return;#d#
223 }#d# 276 }#d#
224 277
225 # kill coroutine otherwise 278 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 279 Coro::terminate
228}; 280};
229
230$SIG{__DIE__} = sub { }; #d#?
231 281
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 292for my $pkg (qw(
243 cf::global cf::attachable 293 cf::global cf::attachable
244 cf::object cf::object::player 294 cf::object cf::object::player
245 cf::client cf::player 295 cf::client cf::player
246 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
247 cf::map cf::party cf::region 298 cf::party cf::region
248)) { 299)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 301}
252 302
253$EV::DIED = sub { 303$EV::DIED = sub {
254 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
255}; 305};
256 306
257############################################################################# 307#############################################################################
258 308
259=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 347
298sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
300 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
301=item cf::lock_wait $string 365=item cf::lock_wait $string
302 366
303Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
304 368
305=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
306 370
307Wait until the given lock is available and then acquires it and returns 371Wait 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, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
310returned. 374returned.
311 375
312Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 377deadlocked coro.
319 383
320Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
321 385
322=cut 386=cut
323 387
324our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 389
327sub lock_wait($) { 390sub lock_wait($) {
328 my ($key) = @_; 391 $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} 392}
341 393
342sub lock_acquire($) { 394sub lock_acquire($) {
343 my ($key) = @_; 395 $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} 396}
357 397
358sub lock_active($) { 398sub lock_active($) {
359 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 400}
363 401
364sub freeze_mainloop { 402sub freeze_mainloop {
365 tick_inhibit_inc; 403 tick_inhibit_inc;
366 404
367 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
368} 406}
369 407
370=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
371 409
372Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 411get spread over time.
374 412
375=cut 413=cut
376 414
377sub periodic($$) { 415sub periodic($$) {
378 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
395 433
396=cut 434=cut
397 435
398our @SLOT_QUEUE; 436our @SLOT_QUEUE;
399our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
400 439
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
404 443
405 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
406 446
407 while () { 447 while () {
408 next_job: 448 next_job:
449
409 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 451
411 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 456 $job->[2]->send;
415 Coro::cede; 457 Coro::cede;
416 goto next_job; 458 goto next_job;
417 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 461 }
419 } 462 }
420 463
421 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 467 $signal->wait;
425 } else { 468 } else {
469 $busy = 0;
426 Coro::schedule; 470 Coro::schedule;
427 } 471 }
428 } 472 }
429}; 473};
430 474
431sub get_slot($;$$) { 475sub get_slot($;$$) {
432 return if tick_inhibit; 476 return if tick_inhibit || $Coro::current == $Coro::main;
433 477
434 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
435 479
436 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
437 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
438 483
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
468 513
469sub sync_job(&) { 514sub sync_job(&) {
470 my ($job) = @_; 515 my ($job) = @_;
471 516
472 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
473 my $time = EV::time; 518 my $time = AE::time;
474 519
475 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
477 522
478 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
495 } else { 540 } else {
496 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
497 } 542 }
498 } 543 }
499 544
500 my $time = EV::time - $time; 545 my $time = AE::time - $time;
501 546
502 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
503 548
504 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
505 } else { 550 } else {
549 reset_signals; 594 reset_signals;
550 &$cb 595 &$cb
551 }, @args; 596 }, @args;
552 597
553 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
554} 610}
555 611
556=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
557 613
558=cut 614=cut
724 780
725############################################################################# 781#############################################################################
726 782
727=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
728 784
729Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
732 788
733In the following description, CLASS can be any of C<global>, C<object> 789In 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 790C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
785 841
786Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
788 844
789Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
791 847
792These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
793 849
794=over 4 850=over 4
1085 1141
1086sub reattach { 1142sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1144 my ($obj) = @_;
1089 1145
1146 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1148
1092 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1093 1150
1094 @$registry = (); 1151 @$registry = ();
1095 1152
1138 1195
1139 sync_job { 1196 sync_job {
1140 if (length $$rdata) { 1197 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1144 1202
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1149 close $fh; 1210 aio_close $fh;
1150 1211
1151 if (@$objs) { 1212 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1157 close $fh; 1221 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1223 }
1160 } else { 1224 } else {
1161 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1162 } 1226 }
1163 1227
1164 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1232 } else {
1166 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1167 } 1234 }
1168 } else { 1235 } else {
1169 aio_unlink $filename; 1236 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1171 } 1238 }
1196 $av = $st->{objs}; 1263 $av = $st->{objs};
1197 } 1264 }
1198 1265
1199 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1202 1270
1203 ($data, $av) 1271 ($data, $av)
1204} 1272}
1205 1273
1206=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1263 1331
1264 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1265} 1333}
1266 1334
1335use File::Glob ();
1336
1267cf::player->attach ( 1337cf::player->attach (
1268 on_command => sub { 1338 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1270 1340
1271 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1272 or return; 1342 or return;
1273 1343
1303 1373
1304 cf::override; 1374 cf::override;
1305 }, 1375 },
1306); 1376);
1307 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1308sub load_extensions { 1391sub load_extensions {
1309 cf::sync_job { 1392 cf::sync_job {
1310 my %todo; 1393 my %todo;
1311 1394
1312 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1331 1414
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1417
1335 $ext{source} = 1418 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1338 . $source 1421 . $source
1339 . "\n};\n1"; 1422 . "\n};\n1";
1340 1423
1341 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1342 } 1425 }
1343 1426
1427 my $pass = 0;
1344 my %done; 1428 my %done;
1345 while (%todo) { 1429 while (%todo) {
1346 my $progress; 1430 my $progress;
1347 1431
1432 ++$pass;
1433
1434 ext:
1348 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1437 next ext
1351 unless exists $done{$_}; 1438 unless exists $done{$_};
1352 } 1439 }
1353 1440
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1442
1356 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1447
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1449 if exists $v->{meta}{mandatory};
1364 1450
1365 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1366 } 1460 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1461 }
1372 1462
1373 skip: 1463 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1376 } 1471 }
1377 }; 1472 };
1378} 1473}
1379 1474
1380############################################################################# 1475#############################################################################
1381 1476
1382=back 1477=back
1383 1478
1384=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1385 1480
1386Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1387 1482
1388=cut 1483=cut
1389 1484
1390package cf::player; 1485package cf::player;
1391 1486
1434 1529
1435sub exists($) { 1530sub exists($) {
1436 my ($login) = @_; 1531 my ($login) = @_;
1437 1532
1438 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1440} 1535}
1441 1536
1442sub find($) { 1537sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1539 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1552 or return;
1458 1553
1459 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1460 or return; 1555 or return;
1556
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1464 } 1560 }
1465 } 1561 }
1466} 1562}
1467 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1468sub save($) { 1577sub save($) {
1469 my ($pl) = @_; 1578 my ($pl) = @_;
1470 1579
1471 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1472 1581
1477 1586
1478 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1480 1589
1481 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1594
1483 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1596 cf::cede_to_tick;
1485} 1597}
1486 1598
1518 my ($pl) = @_; 1630 my ($pl) = @_;
1519 1631
1520 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1521 1633
1522 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1636
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1641 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1642 $pl->ns->destroy if $pl->ns;
1529 1643
1530 my $path = playerdir $pl; 1644 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1645 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1684
1571 for my $login (@$dirs) { 1685 for my $login (@$dirs) {
1572 my $path = path $login; 1686 my $path = path $login;
1573 1687
1574 # a .pst is a dead give-away for a valid player 1688 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1689 # if no pst file found, open and chekc for blocked users
1690 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1691 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1692 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1693 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1694 }
1580 1695
1584 1699
1585 \@logins 1700 \@logins
1586} 1701}
1587 1702
1588=item $player->maps 1703=item $player->maps
1704
1705=item cf::player::maps $login
1589 1706
1590Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1591player. May block. 1708player. May block.
1592 1709
1593=cut 1710=cut
1611 } 1728 }
1612 1729
1613 \@paths 1730 \@paths
1614} 1731}
1615 1732
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1733=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1734
1618Expand crossfire pod fragments into protocol xml. 1735Expand 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 1736
1709=item $player->ext_reply ($msgid, @msg) 1737=item $player->ext_reply ($msgid, @msg)
1710 1738
1711Sends an ext reply to the player. 1739Sends an ext reply to the player.
1712 1740
1744 1772
1745=cut 1773=cut
1746 1774
1747sub find_by_path($) { 1775sub find_by_path($) {
1748 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1749 1779
1750 my ($match, $specificity); 1780 my ($match, $specificity);
1751 1781
1752 for my $region (list) { 1782 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1816
1787 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1818 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817 1847
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1849}
1820 1850
1821# also paths starting with '/' 1851# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1853
1824sub thawer_merge { 1854sub thawer_merge {
1825 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1826 1856
1827 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
1925 1955
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1928} 1958}
1929 1959
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}
1938
1939sub decay_objects { 1960sub decay_objects {
1940 my ($self) = @_; 1961 my ($self) = @_;
1941 1962
1942 return if $self->{deny_reset}; 1963 return if $self->{deny_reset};
1943 1964
2025sub find { 2046sub find {
2026 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
2027 2048
2028 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
2029 2050
2030 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2053
2033 $cf::MAP{$path} || do { 2054 $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 2055 my $map = new_from_path cf::map $path
2038 or return; 2056 or return;
2039 2057
2040 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
2041 2059
2043 or return; 2061 or return;
2044 2062
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2063 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2064 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2065 #$cf::WAIT_FOR_TICK->wait;
2066 undef $guard2;
2048 undef $guard1; 2067 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2068 $map->reset;
2051 return find $path; 2069 return find $path;
2052 } 2070 }
2053 2071
2054 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
2055 } 2073 }
2056} 2074}
2057 2075
2058sub pre_load { } 2076sub pre_load { }
2059sub post_load { } 2077#sub post_load { } # XS
2060 2078
2061sub load { 2079sub load {
2062 my ($self) = @_; 2080 my ($self) = @_;
2063 2081
2064 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2099 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2100 $f->skip_block;
2083 $self->_load_objects ($f) 2101 $self->_load_objects ($f)
2084 or return; 2102 or return;
2085 2103
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2104 $self->post_load_original
2087 if delete $self->{load_original}; 2105 if delete $self->{load_original};
2088 2106
2089 if (my $uniq = $self->uniq_path) { 2107 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2108 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2109 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2128 $self->decay_objects;
2111 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
2112 $self->update_buttons; 2130 $self->update_buttons;
2113 cf::cede_to_tick; 2131 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2132 $self->activate;
2117 } 2133 }
2118 2134
2119 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2123 } 2139 }
2124 2140
2125 $self->post_load; 2141 $self->post_load;
2126} 2142}
2127 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2128sub customise_for { 2147sub customise_for {
2129 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2130 2149
2131 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2151 if $self->per_player;
2148 or next; 2167 or next;
2149 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2150 or next; 2169 or next;
2151 $neigh->load; 2170 $neigh->load;
2152 2171
2172 # now find the diagonal neighbours
2153 push @neigh, 2173 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 } 2176 }
2157 2177
2209 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2210 2230
2211 () 2231 ()
2212} 2232}
2213 2233
2234# common code, used by both ->save and ->swapout
2214sub save { 2235sub _save {
2215 my ($self) = @_; 2236 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2237
2219 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2220 2239
2221 return unless $self->dirty; 2240 return unless $self->dirty;
2222 2241
2242 } else { 2261 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2263 }
2245} 2264}
2246 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2247sub swap_out { 2274sub swap_out {
2248 my ($self) = @_; 2275 my ($self) = @_;
2249 2276
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2278
2255 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2257 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2258 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2259 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2260 2333
2261 $self->deactivate; 2334 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2336 $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 2337
2309 $self->unlink_save; 2338 $self->unlink_save;
2310 $self->destroy; 2339 $self->destroy;
2311} 2340}
2312 2341
2320 2349
2321 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2322 2351
2323 $self->unlink_save; 2352 $self->unlink_save;
2324 2353
2325 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2359
2387 : normalise $_ 2416 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2418 ]
2390} 2419}
2391 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2392=back 2453=back
2393 2454
2394=head3 cf::object 2455=head3 cf::object
2395 2456
2396=cut 2457=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2518can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2519dialogue with the given NPC character.
2459 2520
2460=cut 2521=cut
2461 2522
2523our $SAY_CHANNEL = {
2524 id => "say",
2525 title => "Map",
2526 reply => "say ",
2527 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2528};
2529
2530our $CHAT_CHANNEL = {
2531 id => "chat",
2532 title => "Chat",
2533 reply => "chat ",
2534 tooltip => "Player chat and shouts, global to the server.",
2535};
2536
2462# rough implementation of a future "reply" method that works 2537# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2538# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2539#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2540sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2541 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2552 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2553 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2554
2480 } else { 2555 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2556 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2557 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2558 }
2484 } 2559 }
2485} 2560}
2486 2561
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2562=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2587
2513=item $player_object->enter_link 2588=item $player_object->enter_link
2514 2589
2515Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2516 2591
2517The player should be reasonably safe there for short amounts of time. You 2592The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2594though, as the player cannot control the character while it is on the link
2595map.
2519 2596
2520Will never block. 2597Will never block.
2521 2598
2522=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2523 2600
2543sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2544 my ($self) = @_; 2621 my ($self) = @_;
2545 2622
2546 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2547 2624
2625 ++$self->{_link_recursion};
2626
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2628
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2552 2631
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2633}
2555 2634
2556sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2558 2637
2575 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2577 2656
2578 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2581 2660
2582 $map->load; 2661 $map->load;
2583 $map->load_neighbours; 2662 $map->load_neighbours;
2584 2663
2585 return unless $self->contr->active; 2664 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2665
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2590} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2591 2673
2674}
2675
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2677
2594Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2680that 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 2681the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2682be called at the end of this process.
2599 2683
2684Note that $check will be called with a potentially non-loaded map, so if
2685it needs a loaded map it has to call C<< ->load >>.
2686
2600=cut 2687=cut
2601 2688
2602our $GOTOGEN; 2689our $GOTOGEN;
2603 2690
2604sub cf::object::player::goto { 2691sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2606 2699
2607 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2702
2610 $self->enter_link; 2703 $self->enter_link;
2634 my $map = eval { 2727 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2636 2729
2637 if ($map) { 2730 if ($map) {
2638 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2733 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2735 }
2643 2736
2644 $map 2737 $map
2652 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2655 } 2748 }
2656 2749
2657 $done->() if $done; 2750 $done->($self) if $done;
2658 })->prio (1); 2751 })->prio (1);
2659} 2752}
2660 2753
2661=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2662 2755
2682} 2775}
2683 2776
2684sub prepare_random_map { 2777sub prepare_random_map {
2685 my ($exit) = @_; 2778 my ($exit) = @_;
2686 2779
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2780 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2781 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2782 # that depends on the exit object
2692 2783
2693 my $rmp = parse_random_map_params $exit->msg; 2784 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2786 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2787 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2788 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2789 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2790 $rmp->{origin_y} = $exit->y;
2791
2792 $exit->map->touch;
2700 } 2793 }
2701 2794
2702 $rmp->{random_seed} ||= $exit->random_seed; 2795 $rmp->{random_seed} ||= $exit->random_seed;
2703 2796
2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp); 2797 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2798 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2799 my $meta = "$RANDOMDIR/$md5.meta";
2707 2800
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2801 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2802 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2803 undef $fh;
2711 aio_rename "$meta~", $meta; 2804 aio_rename "$meta~", $meta;
2712 2805
2806 my $slaying = "?random/$md5";
2807
2808 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2809 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2810 $exit->msg (undef);
2811 }
2715 } 2812 }
2716} 2813}
2717 2814
2718sub cf::object::player::enter_exit { 2815sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2816 my ($self, $exit) = @_;
2720 2817
2721 return unless $self->type == cf::PLAYER; 2818 return unless $self->type == cf::PLAYER;
2722 2819
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; 2820 $self->enter_link;
2735 2821
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 { 2822 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2823 $Coro::current->{desc} = "enter_exit";
2742 2824
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2825 unless (eval {
2826 $self->deactivate_recursive; # just to be sure
2827
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2837 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp;
2839
2745 $self->goto ($slaying, $hp, $sp); 2840 $self->goto ($map, $x, $y);
2746 2841
2842 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y)
2844 if $exit->flag (cf::FLAG_DAMNED);
2845
2747 1; 2846 1
2748 }) { 2847 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2848 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2849 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2850 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2851 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2852
2754 warn "ERROR in enter_exit: $@"; 2853 warn "ERROR in enter_exit: $@";
2771sub cf::client::send_drawinfo { 2870sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 2871 my ($self, $text, $flags) = @_;
2773 2872
2774 utf8::encode $text; 2873 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2875}
2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2776} 2900}
2777 2901
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 2903
2780Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
2784 2908
2785=cut 2909=cut
2786 2910
2787# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2789 "c/identify" => { 2919 "c/identify" => {
2790 id => "infobox", 2920 id => "infobox",
2791 title => "Identify", 2921 title => "Identify",
2792 reply => undef, 2922 reply => undef,
2793 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
2795 "c/examine" => { 2925 "c/examine" => {
2796 id => "infobox", 2926 id => "infobox",
2797 title => "Examine", 2927 title => "Examine",
2798 reply => undef, 2928 reply => undef,
2799 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 2936 },
2801 "c/book" => { 2937 "c/book" => {
2802 id => "infobox", 2938 id => "infobox",
2803 title => "Book", 2939 title => "Book",
2804 reply => undef, 2940 reply => undef,
2820 id => "infobox", 2956 id => "infobox",
2821 title => "Body Parts", 2957 title => "Body Parts",
2822 reply => undef, 2958 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2959 tooltip => "Shows which body parts you posess and are available",
2824 }, 2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2967 "c/skills" => {
2968 id => "infobox",
2969 title => "Skills",
2970 reply => undef,
2971 tooltip => "Shows your experience per skill and item power",
2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2979 "c/resistances" => {
2980 id => "infobox",
2981 title => "Resistances",
2982 reply => undef,
2983 tooltip => "Shows your resistances",
2984 },
2985 "c/pets" => {
2986 id => "infobox",
2987 title => "Pets",
2988 reply => undef,
2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2996 },
2825 "c/uptime" => { 2997 "c/uptime" => {
2826 id => "infobox", 2998 id => "infobox",
2827 title => "Uptime", 2999 title => "Uptime",
2828 reply => undef, 3000 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3001 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 3004 id => "infobox",
2833 title => "Map Info", 3005 title => "Map Info",
2834 reply => undef, 3006 reply => undef,
2835 tooltip => "Information related to the maps", 3007 tooltip => "Information related to the maps",
2836 }, 3008 },
3009 "c/party" => {
3010 id => "party",
3011 title => "Party",
3012 reply => "gsay ",
3013 tooltip => "Messages and chat related to your party",
3014 },
3015 "c/death" => {
3016 id => "death",
3017 title => "Death",
3018 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death",
3020 },
3021 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL,
2837); 3023);
2838 3024
2839sub cf::client::send_msg { 3025sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3027
2842 $msg = $self->pl->expand_cfpod ($msg); 3028 $msg = $self->pl->expand_cfpod ($msg)
3029 unless $color & cf::NDI_VERBATIM;
2843 3030
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 3031 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 3032
2846 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2849 3036
2850 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2854 3039
2855 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 3045 }
2862 3046
2863 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2864 } 3048 }
2865 3049
2866 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2867 3051
2868 if ($self->can_msg) {
2869 # default colour, mask it out 3052 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2872 3055
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3056 my $pkt = "msg "
3057 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 3059 );
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 3060
2887 $color &= cf::NDI_COLOR_MASK; 3061 $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} 3062}
2901 3063
2902=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2903 3065
2904Sends an ext event to the client. 3066Sends an ext event to the client.
2907 3069
2908sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2909 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2910 3072
2911 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2913 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2914 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2915 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2916 } 3078 }
2917} 3079}
2918 3080
2919=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2920 3082
2924 3086
2925sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2926 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2927 3089
2928 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2930 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2931 #TODO: version 1, remove 3093 #TODO: version 1, remove
2932 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2933 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2934 } 3096 }
2935} 3097}
2936 3098
2937=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2938 3100
3039 3201
3040 $coro 3202 $coro
3041} 3203}
3042 3204
3043cf::client->attach ( 3205cf::client->attach (
3044 on_destroy => sub { 3206 on_client_destroy => sub {
3045 my ($ns) = @_; 3207 my ($ns) = @_;
3046 3208
3047 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3048 }, 3210 },
3049); 3211);
3065our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3066 3228
3067$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3068 3230
3069$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3070 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3071 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3072 sort time 3234 sort time
3073)); 3235));
3074 3236
3075# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
3078 3240
3079The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
3080 3242
3081 cf::object 3243 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3244 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3245 insert remove name archname title slaying race decrease split
3246 value
3084 3247
3085 cf::object::player 3248 cf::object::player
3086 player 3249 player
3087 3250
3088 cf::player 3251 cf::player
3093 3256
3094=cut 3257=cut
3095 3258
3096for ( 3259for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3260 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3262 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
3103) { 3266) {
3104 no strict 'refs'; 3267 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 3287
3125 my $qcode = $code; 3288 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3128 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
3129 local $_; 3295 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3296
3132 my $eval = 3297 my $eval =
3133 "do {\n" 3298 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3301 . $code
3137 . "\n}" 3302 . "\n}"
3138 ; 3303 ;
3139 3304
3305 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3143 3314
3144 if ($@) { 3315 if ($@) {
3145 warn "$@"; 3316 warn "$@";
3146 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
3166=cut 3337=cut
3167 3338
3168sub register_script_function { 3339sub register_script_function {
3169 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3170 3341
3171 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3173} 3344}
3174 3345
3175=back 3346=back
3176 3347
3177=cut 3348=cut
3198 3369
3199 $facedata->{version} == 2 3370 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3372
3202 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3203 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3376 type => FT_RSRC,
3205 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3206 }; 3379 };
3207 cf::cede_to_tick; 3380 cf::cede_to_tick;
3208 3381
3209 { 3382 {
3210 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3387
3215 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3392
3220 cf::cede_to_tick; 3393 cf::cede_to_tick;
3221 } 3394 }
3222 3395
3223 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3247 3420
3248 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3249 } 3422 }
3250 3423
3251 { 3424 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3255 3426
3256 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3430
3261 if ($info->{type} & 1) { 3431 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}; 3432 cf::face::set_type $idx, $info->{type};
3276 } else { 3433 } else {
3277 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3278 } 3435 }
3279 3436
3312 while (my ($k, $v) = each %$want) { 3469 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3470 $ns->fx_want ($k, $v);
3314 } 3471 }
3315}; 3472};
3316 3473
3474sub load_resource_file($) {
3475 my $guard = lock_acquire "load_resource_file";
3476
3477 my $status = load_resource_file_ $_[0];
3478 get_slot 0.1, 100;
3479 cf::arch::commit_load;
3480
3481 $status
3482}
3483
3317sub reload_regions { 3484sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3485 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3486 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3487 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3488
3334} 3501}
3335 3502
3336sub reload_archetypes { 3503sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3504 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3505 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} 3506}
3345 3507
3346sub reload_treasures { 3508sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3509 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3510 or die "unable to load treasurelists\n";
3349} 3511}
3350 3512
3351sub reload_resources { 3513sub reload_resources {
3352 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3353 3515
3516 reload_facedata;
3517 reload_archetypes;
3354 reload_regions; 3518 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3519 reload_treasures;
3359 3520
3360 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3361} 3522}
3362 3523
3363sub init {
3364 reload_resources;
3365}
3366
3367sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3528 or return;
3370 3529
3371 local $/; 3530 local $/;
3372 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3373 3532
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3534
3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $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}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3378 3537
3379 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3542 };
3384 warn $@ if $@; 3543 warn $@ if $@;
3385 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3547}
3548
3549sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!";
3552 flock $fh, &Fcntl::LOCK_EX
3553 or die "$PIDFILE: flock: $!";
3554 $fh
3555}
3556
3557# make sure only one server instance is running at any one time
3558sub atomic {
3559 my $fh = pidfile;
3560
3561 my $pid = <$fh>;
3562 kill 9, $pid if $pid > 0;
3563
3564 seek $fh, 0, 0;
3565 print $fh $$;
3566}
3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3386} 3575}
3387 3576
3388sub main { 3577sub main {
3578 cf::init_globals; # initialise logging
3579
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586
3389 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3590 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3592 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3396 }; 3594 };
3397 3595
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; 3596 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3597
3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3607 reload_resources;
3608 reload_config;
3609 db_init;
3610
3611 cf::init_uuid;
3612 cf::init_signals;
3613 cf::init_skills;
3614
3615 cf::init_beforeplay;
3616
3617 atomic;
3618
3619 load_extensions;
3620
3621 utime time, time, $RUNTIMEFILE;
3622
3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626
3627 (pop @POST_INIT)->(0) while @POST_INIT;
3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3405} 3634}
3406 3635
3407############################################################################# 3636#############################################################################
3408# initialisation and cleanup 3637# initialisation and cleanup
3409 3638
3410# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3411BEGIN { 3640BEGIN {
3412 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3413 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3414 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3415 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3416 }; 3645 };
3417 } 3646 }
3418} 3647}
3419 3648
3420sub write_runtime_sync { 3649sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime"; 3650 my $t0 = AE::time;
3422 3651
3423 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3425 3654
3426 IO::AIO::aio_utime $runtime, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3656
3428 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3429 3658
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3431 or return; 3660 or return;
3432 3661
3433 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3674 aio_utime $fh, undef, undef;
3446 3675
3447 close $fh 3676 close $fh
3448 or return; 3677 or return;
3449 3678
3450 aio_rename "$runtime~", $runtime 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3680 and return;
3452 3681
3453 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3454 3683
3455 1 3684 1
3456} 3685}
3457 3686
3458our $uuid_lock; 3687our $uuid_lock;
3467 my $uuid = "$LOCALDIR/uuid"; 3696 my $uuid = "$LOCALDIR/uuid";
3468 3697
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3699 or return;
3471 3700
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3701 my $value = uuid_seq uuid_cur;
3702
3703 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n";
3705 return;
3706 }
3707
3708 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3709 $uuid_skip = 0;
3474 3710
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3712 and return;
3477 3713
3499} 3735}
3500 3736
3501sub emergency_save() { 3737sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3503 3739
3504 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3505 3741
3506 cf::sync_job { 3742 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747
3507 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3754 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3756 $pl->save;
3516 } 3757 }
3517 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3518 3759
3519 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3763 $map->valid or next;
3523 $map->save; 3764 $map->save;
3524 } 3765 }
3525 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3526 3767
3527 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3530 3771
3531 warn "begin write uuid\n"; 3772 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3773 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3774 warn "emergency_perl_save: end write uuid\n";
3534 }; 3775 };
3535 3776
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3536 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3537} 3783}
3538 3784
3539sub post_cleanup { 3785sub post_cleanup {
3540 my ($make_core) = @_; 3786 my ($make_core) = @_;
3541 3787
3542 warn Carp::longmess "post_cleanup backtrace" 3788 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3789 if $make_core;
3790
3791 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$;
3793}
3794
3795# a safer delete_package, copied from Symbol
3796sub clear_package($) {
3797 my $pkg = shift;
3798
3799 # expand to full symbol table name if needed
3800 unless ($pkg =~ /^main::.*::$/) {
3801 $pkg = "main$pkg" if $pkg =~ /^::/;
3802 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3803 $pkg .= '::' unless $pkg =~ /::$/;
3804 }
3805
3806 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3807 my $stem_symtab = *{$stem}{HASH};
3808
3809 defined $stem_symtab and exists $stem_symtab->{$leaf}
3810 or return;
3811
3812 # clear all symbols
3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3814 for my $name (keys %$leaf_symtab) {
3815 _gv_clear *{"$pkg$name"};
3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3817 }
3544} 3818}
3545 3819
3546sub do_reload_perl() { 3820sub do_reload_perl() {
3547 # can/must only be called in main 3821 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3549 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3550 return; 3824 return;
3551 } 3825 }
3552 3826
3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3830
3831 while ($RELOAD) {
3553 warn "reloading..."; 3832 warn "reloading...";
3554 3833
3555 warn "entering sync_job"; 3834 warn "entering sync_job";
3556 3835
3557 cf::sync_job { 3836 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3837 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3838 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3839 cf::write_runtime_sync; # external watchdog should not bark
3561 3840
3562 warn "syncing database to disk"; 3841 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3842 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3843
3565 # if anything goes wrong in here, we should simply crash as we already saved 3844 # if anything goes wrong in here, we should simply crash as we already saved
3566 3845
3567 warn "flushing outstanding aio requests"; 3846 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; 3847 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3849 }
3599 3850
3600 warn "... nuking $pkg"; 3851 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3852 $_->cancel for values %EXT_CORO;
3602 } 3853 %EXT_CORO = ();
3603 3854
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3855 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3856 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3857
3858 warn "removing ext/exti commands";
3859 %EXTCMD = ();
3860 %EXTICMD = ();
3861
3862 warn "unloading/nuking all extensions";
3863 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3864 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3865
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3866 if (my $cb = $pkg->can ("unload")) {
3867 eval {
3615 $cb->(); 3868 $cb->($pkg);
3869 1
3870 } or warn "$pkg unloaded, but with errors: $@";
3871 }
3872
3873 warn "... clearing $pkg";
3874 clear_package $pkg;
3616 } 3875 }
3617 3876
3618 Symbol::delete_package $k; 3877 warn "unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880
3881 warn "... unloading $k";
3882 delete $INC{$k};
3883
3884 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g;
3886
3887 if (my $cb = $k->can ("unload_module")) {
3888 $cb->();
3889 }
3890
3891 clear_package $k;
3619 } 3892 }
3620 3893
3621 warn "getting rid of safe::, as good as possible"; 3894 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3895 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3897
3625 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3901
3629 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3903 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3632 3905
3633 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3634 3907
3635 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3636 require cf; 3909 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3638 3911
3639 warn "loading config and database again"; 3912 warn "loading config and database again";
3640 cf::reload_config; 3913 cf::reload_config;
3641 3914
3642 warn "loading extensions"; 3915 warn "loading extensions";
3643 cf::load_extensions; 3916 cf::load_extensions;
3644 3917
3918 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3924 reattach $_ for values %PLAYER;
3925 }
3651 3926
3927 warn "running post_init jobs";
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929
3652 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3653 3931
3654 1 3932 1
3655 } or do { 3933 } or do {
3656 warn $@; 3934 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3935 cf::cleanup "error while reloading, exiting.";
3658 }; 3936 };
3659 3937
3660 warn "reloaded"; 3938 warn "reloaded";
3939 --$RELOAD;
3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3661}; 3944};
3662 3945
3663our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3664 3947
3665sub reload_perl() { 3948sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3668 3951
3952 $RELOAD_WATCHER ||= cf::async {
3953 Coro::AIO::aio_wait cache_extensions;
3954
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3956 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3958 };
3672 }; 3959 };
3673} 3960}
3674 3961
3675register_command "reload" => sub { 3962register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3690 3977
3691our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3693 3980
3694sub wait_for_tick { 3981sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3697 3983
3698 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3986 $signal->wait;
3701} 3987}
3702 3988
3703sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3706 3991
3707 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3994 $signal->wait;
3710} 3995}
3715 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3716 return; 4001 return;
3717 } 4002 }
3718 4003
3719 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3720 4007
3721 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3722 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3723 Coro::async_pool { 4010 Coro::async_pool {
3724 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3747} 4034}
3748 4035
3749{ 4036{
3750 # configure BDB 4037 # configure BDB
3751 4038
3752 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3753 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3755 4042
3756 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4047 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4049 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 4050
3763 cf::sync_job { 4051 cf::sync_job {
3764 eval { 4052 eval {
3790{ 4078{
3791 # configure IO::AIO 4079 # configure IO::AIO
3792 4080
3793 IO::AIO::min_parallel 8; 4081 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 4082 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 4083 undef $AnyEvent::AIO::WATCHER;
3796} 4084}
3797 4085
3798my $_log_backtrace; 4086my $_log_backtrace;
3799 4087
3800sub _log_backtrace { 4088sub _log_backtrace {
3803 $msg =~ s/\n//; 4091 $msg =~ s/\n//;
3804 4092
3805 # limit the # of concurrent backtraces 4093 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 4094 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 4095 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg;
3808 async { 4097 async {
3809 $Coro::current->{desc} = "abt $msg"; 4098 $Coro::current->{desc} = "abt $msg";
3810 4099
3811 my @bt = fork_call { 4100 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 4101 @addr = map { sprintf "%x", $_ } @addr;
3823 } 4112 }
3824 4113
3825 @funcs 4114 @funcs
3826 }; 4115 };
3827 4116
3828 LOG llevInfo, "[ABT] $msg\n"; 4117 LOG llevInfo, "[ABT] $perl_bt\n";
4118 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 4119 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 4120 --$_log_backtrace;
3831 }; 4121 };
3832 } else { 4122 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 4123 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 4125 }
3836} 4126}
3837 4127
3838# load additional modules 4128# load additional modules
3839use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3840 4131
3841END { cf::emergency_save } 4132END { cf::emergency_save }
3842 4133
38431 41341
3844 4135

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines