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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 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; 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 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
96 115
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 118our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
101 120
102our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 124our $DB_ENV;
106 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
107our %CFG; 128our %CFG;
108 129
109our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 131our $RUNTIME;
111our $NOW; 132our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 143our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
124 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
125binmode STDOUT; 151binmode STDOUT;
126binmode STDERR; 152binmode STDERR;
127 153
128# read virtual server time, if available 154# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
133} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
134 162
135mkdir $_ 163mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 165
138our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
139 167
140sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 180
142############################################################################# 181#############################################################################
143 182
144=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
145 184
192returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 233
195=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
196 235
197This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 238that call.
200 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
201=back 246=back
202 247
203=cut 248=cut
204 249
205BEGIN { 250$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 251 my $msg = join "", @_;
208 252
209 $msg .= "\n" 253 $msg .= "\n"
210 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
211 255
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 257
214 LOG llevError, $msg; 258 LOG llevError, $msg;
215 }; 259};
216}
217 260
218$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
220 265
221 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 268 return;#d#
224 }#d# 269 }#d#
225 270
226 # kill coroutine otherwise 271 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 272 Coro::terminate
229}; 273};
230
231$SIG{__DIE__} = sub { }; #d#?
232 274
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 285for my $pkg (qw(
244 cf::global cf::attachable 286 cf::global cf::attachable
245 cf::object cf::object::player 287 cf::object cf::object::player
246 cf::client cf::player 288 cf::client cf::player
247 cf::arch cf::living 289 cf::arch cf::living
290 cf::map cf::mapspace
248 cf::map cf::party cf::region 291 cf::party cf::region
249)) { 292)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 294}
253 295
254$EV::DIED = sub { 296$EV::DIED = sub {
255 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
256}; 298};
257 299
258############################################################################# 300#############################################################################
259 301
260=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 340
299sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
301 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
302=item cf::lock_wait $string 358=item cf::lock_wait $string
303 359
304Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
305 361
306=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
307 363
308Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
311returned. 367returned.
312 368
313Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 370deadlocked coro.
320 376
321Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
322 378
323=cut 379=cut
324 380
325our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 382
328sub lock_wait($) { 383sub lock_wait($) {
329 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 385}
342 386
343sub lock_acquire($) { 387sub lock_acquire($) {
344 my ($key) = @_; 388 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 389}
358 390
359sub lock_active($) { 391sub lock_active($) {
360 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 393}
364 394
365sub freeze_mainloop { 395sub freeze_mainloop {
366 tick_inhibit_inc; 396 tick_inhibit_inc;
367 397
368 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
369} 399}
370 400
371=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
372 402
373Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
396 426
397=cut 427=cut
398 428
399our @SLOT_QUEUE; 429our @SLOT_QUEUE;
400our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
401 432
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
405 436
406 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
407 439
408 while () { 440 while () {
409 next_job: 441 next_job:
442
410 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 444
412 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 449 $job->[2]->send;
416 Coro::cede; 450 Coro::cede;
417 goto next_job; 451 goto next_job;
418 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 454 }
420 } 455 }
421 456
422 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
424 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 460 $signal->wait;
426 } else { 461 } else {
462 $busy = 0;
427 Coro::schedule; 463 Coro::schedule;
428 } 464 }
429 } 465 }
430}; 466};
431 467
432sub get_slot($;$$) { 468sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
434 470
435 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
436 472
437 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
438 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
439 476
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
469 506
470sub sync_job(&) { 507sub sync_job(&) {
471 my ($job) = @_; 508 my ($job) = @_;
472 509
473 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
474 my $time = EV::time; 511 my $time = AE::time;
475 512
476 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
478 515
479 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
496 } else { 533 } else {
497 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
498 } 535 }
499 } 536 }
500 537
501 my $time = EV::time - $time; 538 my $time = AE::time - $time;
502 539
503 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
504 541
505 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
506 } else { 543 } else {
725 762
726############################################################################# 763#############################################################################
727 764
728=head2 ATTACHABLE OBJECTS 765=head2 ATTACHABLE OBJECTS
729 766
730Many objects in crossfire are so-called attachable objects. That means you can 767Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 768attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 769to it. All such attachable objects support the following methods.
733 770
734In the following description, CLASS can be any of C<global>, C<object> 771In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 772C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 822=item cf::CLASS::attachment $name, ...
786 823
787Register an attachment by C<$name> through which attachable objects of the 824Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 825given CLASS can refer to this attachment.
789 826
790Some classes such as crossfire maps and objects can specify attachments 827Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 828that are attached at load/instantiate time, thus the need for a name.
792 829
793These calls expect any number of the following handler/hook descriptions: 830These calls expect any number of the following handler/hook descriptions:
794 831
795=over 4 832=over 4
1086 1123
1087sub reattach { 1124sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1125 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1126 my ($obj) = @_;
1090 1127
1128 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1129 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1130
1093 my $registry = $obj->registry; 1131 my $registry = $obj->registry;
1094 1132
1095 @$registry = (); 1133 @$registry = ();
1096 1134
1144 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1145 1183
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1150 aio_close $fh; 1191 aio_close $fh;
1151 1192
1152 if (@$objs) { 1193 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1195 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1158 aio_close $fh; 1202 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1204 }
1161 } else { 1205 } else {
1162 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
1163 } 1207 }
1164 1208
1165 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1210
1211 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1213 } else {
1167 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1168 } 1215 }
1169 } else { 1216 } else {
1170 aio_unlink $filename; 1217 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1172 } 1219 }
1263 my ($name, $cb) = @_; 1310 my ($name, $cb) = @_;
1264 1311
1265 $EXTICMD{$name} = $cb; 1312 $EXTICMD{$name} = $cb;
1266} 1313}
1267 1314
1315use File::Glob ();
1316
1268cf::player->attach ( 1317cf::player->attach (
1269 on_command => sub { 1318 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1271 1320
1272 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1273 or return; 1322 or return;
1274 1323
1304 1353
1305 cf::override; 1354 cf::override;
1306 }, 1355 },
1307); 1356);
1308 1357
1358# "readahead" all extensions
1359sub cache_extensions {
1360 my $grp = IO::AIO::aio_group;
1361
1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1363 for (grep /\.ext$/, @{$_[0]}) {
1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1365 }
1366 };
1367
1368 $grp
1369}
1370
1309sub load_extensions { 1371sub load_extensions {
1310 cf::sync_job { 1372 cf::sync_job {
1311 my %todo; 1373 my %todo;
1312 1374
1313 for my $path (<$LIBDIR/*.ext>) { 1375 for my $path (<$LIBDIR/*.ext>) {
1332 1394
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1397
1336 $ext{source} = 1398 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1400 . "#line 1 \"$path\"\n{\n"
1339 . $source 1401 . $source
1340 . "\n};\n1"; 1402 . "\n};\n1";
1341 1403
1342 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1343 } 1405 }
1344 1406
1407 my $pass = 0;
1345 my %done; 1408 my %done;
1346 while (%todo) { 1409 while (%todo) {
1347 my $progress; 1410 my $progress;
1348 1411
1412 ++$pass;
1413
1414 ext:
1349 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1417 next ext
1352 unless exists $done{$_}; 1418 unless exists $done{$_};
1353 } 1419 }
1354 1420
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1422
1357 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1427
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1429 if exists $v->{meta}{mandatory};
1365 1430 } else {
1366 warn $msg; 1431 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg};
1433 $progress = 1;
1434
1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1367 } 1437 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1438 }
1373 1439
1374 skip: 1440 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1377 } 1448 }
1378 }; 1449 };
1379} 1450}
1380 1451
1381############################################################################# 1452#############################################################################
1382 1453
1383=back 1454=back
1384 1455
1385=head2 CORE EXTENSIONS 1456=head2 CORE EXTENSIONS
1386 1457
1387Functions and methods that extend core crossfire objects. 1458Functions and methods that extend core deliantra objects.
1388 1459
1389=cut 1460=cut
1390 1461
1391package cf::player; 1462package cf::player;
1392 1463
1435 1506
1436sub exists($) { 1507sub exists($) {
1437 my ($login) = @_; 1508 my ($login) = @_;
1438 1509
1439 $cf::PLAYER{$login} 1510 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1511 or !aio_stat path $login
1441} 1512}
1442 1513
1443sub find($) { 1514sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1515 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1516 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1466 } 1537 }
1467 } 1538 }
1468} 1539}
1469 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1470sub save($) { 1554sub save($) {
1471 my ($pl) = @_; 1555 my ($pl) = @_;
1472 1556
1473 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1474 1558
1479 1563
1480 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1482 1566
1483 cf::get_slot 0.01; 1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1571
1485 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1573 cf::cede_to_tick;
1487} 1574}
1488 1575
1520 my ($pl) = @_; 1607 my ($pl) = @_;
1521 1608
1522 my $name = $pl->ob->name; 1609 my $name = $pl->ob->name;
1523 1610
1524 $pl->{deny_save} = 1; 1611 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1612 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1613
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1615 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1616 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1617 $pl->ob->check_score;
1616 } 1703 }
1617 1704
1618 \@paths 1705 \@paths
1619} 1706}
1620 1707
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1708=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1709
1623Expand crossfire pod fragments into protocol xml. 1710Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1711
1714=item $player->ext_reply ($msgid, @msg) 1712=item $player->ext_reply ($msgid, @msg)
1715 1713
1716Sends an ext reply to the player. 1714Sends an ext reply to the player.
1717 1715
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1789
1792 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1791 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1930 1928
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1930 "$UNIQUEDIR/$path"
1933} 1931}
1934 1932
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1933sub decay_objects {
1945 my ($self) = @_; 1934 my ($self) = @_;
1946 1935
1947 return if $self->{deny_reset}; 1936 return if $self->{deny_reset};
1948 1937
2030sub find { 2019sub find {
2031 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
2032 2021
2033 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
2034 2023
2035 cf::lock_wait "map_data:$path";#d#remove 2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2026
2038 $cf::MAP{$path} || do { 2027 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2028 my $map = new_from_path cf::map $path
2043 or return; 2029 or return;
2044 2030
2045 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
2046 2032
2058 2044
2059 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
2060 } 2046 }
2061} 2047}
2062 2048
2063sub pre_load { } 2049sub pre_load { }
2064sub post_load { } 2050#sub post_load { } # XS
2065 2051
2066sub load { 2052sub load {
2067 my ($self) = @_; 2053 my ($self) = @_;
2068 2054
2069 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2072 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2073 $f->skip_block;
2088 $self->_load_objects ($f) 2074 $self->_load_objects ($f)
2089 or return; 2075 or return;
2090 2076
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2077 $self->post_load_original
2092 if delete $self->{load_original}; 2078 if delete $self->{load_original};
2093 2079
2094 if (my $uniq = $self->uniq_path) { 2080 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2081 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2082 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2101 $self->decay_objects;
2116 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
2117 $self->update_buttons; 2103 $self->update_buttons;
2118 cf::cede_to_tick; 2104 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2105 $self->activate;
2122 } 2106 }
2123 2107
2124 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
2128 } 2112 }
2129 2113
2130 $self->post_load; 2114 $self->post_load;
2131} 2115}
2132 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
2133sub customise_for { 2120sub customise_for {
2134 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
2135 2122
2136 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2124 if $self->per_player;
2291 2278
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2280
2294 return if $self->players; 2281 return if $self->players;
2295 2282
2296 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2297 2284
2298 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2299 2286
2300 # need to save uniques path 2287 # need to save uniques path
2301 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
2392 : normalise $_ 2379 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2381 ]
2395} 2382}
2396 2383
2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2415
2397=back 2416=back
2398 2417
2399=head3 cf::object 2418=head3 cf::object
2400 2419
2401=cut 2420=cut
2466 2485
2467our $SAY_CHANNEL = { 2486our $SAY_CHANNEL = {
2468 id => "say", 2487 id => "say",
2469 title => "Map", 2488 title => "Map",
2470 reply => "say ", 2489 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2491};
2473 2492
2474our $CHAT_CHANNEL = { 2493our $CHAT_CHANNEL = {
2475 id => "chat", 2494 id => "chat",
2476 title => "Chat", 2495 title => "Chat",
2531 2550
2532=item $player_object->enter_link 2551=item $player_object->enter_link
2533 2552
2534Freezes the player and moves him/her to a special map (C<{link}>). 2553Freezes the player and moves him/her to a special map (C<{link}>).
2535 2554
2536The player should be reasonably safe there for short amounts of time. You 2555The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2556for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557though, as the palyer cannot control the character while it is on the link
2558map.
2538 2559
2539Will never block. 2560Will never block.
2540 2561
2541=item $player_object->leave_link ($map, $x, $y) 2562=item $player_object->leave_link ($map, $x, $y)
2542 2563
2594 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2596 2617
2597 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2600 2621
2601 $map->load; 2622 $map->load;
2602 $map->load_neighbours; 2623 $map->load_neighbours;
2603 2624
2604 return unless $self->contr->active; 2625 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2626
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2609} 2632}
2610 2633
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2635
2613Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2637her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2638that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2639the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2640be called at the end of this process.
2641
2642Note that $check will be called with a potentially non-loaded map, so if
2643it needs a loaded map it has to call C<< ->load >>.
2618 2644
2619=cut 2645=cut
2620 2646
2621our $GOTOGEN; 2647our $GOTOGEN;
2622 2648
2769 $self->contr->savebed ($map, $x, $y) 2795 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2796 if $exit->flag (cf::FLAG_DAMNED);
2771 2797
2772 1 2798 1
2773 }) { 2799 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2800 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2801 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2802 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2803 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2804
2779 warn "ERROR in enter_exit: $@"; 2805 warn "ERROR in enter_exit: $@";
2796sub cf::client::send_drawinfo { 2822sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2823 my ($self, $text, $flags) = @_;
2798 2824
2799 utf8::encode $text; 2825 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827}
2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2801} 2852}
2802 2853
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2855
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2809 2860
2810=cut 2861=cut
2811 2862
2812# non-persistent channels (usually the info channel) 2863# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2814 "c/identify" => { 2871 "c/identify" => {
2815 id => "infobox", 2872 id => "infobox",
2816 title => "Identify", 2873 title => "Identify",
2817 reply => undef, 2874 reply => undef,
2818 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
2820 "c/examine" => { 2877 "c/examine" => {
2821 id => "infobox", 2878 id => "infobox",
2822 title => "Examine", 2879 title => "Examine",
2823 reply => undef, 2880 reply => undef,
2824 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 2888 },
2826 "c/book" => { 2889 "c/book" => {
2827 id => "infobox", 2890 id => "infobox",
2828 title => "Book", 2891 title => "Book",
2829 reply => undef, 2892 reply => undef,
2845 id => "infobox", 2908 id => "infobox",
2846 title => "Body Parts", 2909 title => "Body Parts",
2847 reply => undef, 2910 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2911 tooltip => "Shows which body parts you posess and are available",
2849 }, 2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2919 "c/skills" => {
2920 id => "infobox",
2921 title => "Skills",
2922 reply => undef,
2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2948 },
2850 "c/uptime" => { 2949 "c/uptime" => {
2851 id => "infobox", 2950 id => "infobox",
2852 title => "Uptime", 2951 title => "Uptime",
2853 reply => undef, 2952 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 2953 tooltip => "How long the server has been running since last restart",
2863 id => "party", 2962 id => "party",
2864 title => "Party", 2963 title => "Party",
2865 reply => "gsay ", 2964 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 2965 tooltip => "Messages and chat related to your party",
2867 }, 2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2868); 2975);
2869 2976
2870sub cf::client::send_msg { 2977sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2872 2979
2873 $msg = $self->pl->expand_cfpod ($msg); 2980 $msg = $self->pl->expand_cfpod ($msg)
2981 unless $color & cf::NDI_VERBATIM;
2874 2982
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 2983 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 2984
2877 # check predefined channels, for the benefit of C 2985 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 2986 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 2987 $channel = $CHANNEL{$channel};
2880 2988
2881 $self->ext_msg (channel_info => $channel) 2989 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 2990 $channel = $channel->{id};
2885 2991
2886 } elsif (ref $channel) { 2992 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 2996 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 2997 }
2893 2998
2894 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2895 } 3000 }
2896 3001
2897 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2898 3003
2899 if ($self->can_msg) {
2900 # default colour, mask it out 3004 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2903 3007
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3008 my $pkt = "msg "
3009 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 3011 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 3012
2918 $color &= cf::NDI_COLOR_MASK; 3013 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 3014}
2932 3015
2933=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2934 3017
2935Sends an ext event to the client. 3018Sends an ext event to the client.
2938 3021
2939sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2941 3024
2942 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3030 }
2948} 3031}
2949 3032
2950=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2951 3034
2955 3038
2956sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2958 3041
2959 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3045 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3048 }
2966} 3049}
2967 3050
2968=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2969 3052
3070 3153
3071 $coro 3154 $coro
3072} 3155}
3073 3156
3074cf::client->attach ( 3157cf::client->attach (
3075 on_destroy => sub { 3158 on_client_destroy => sub {
3076 my ($ns) = @_; 3159 my ($ns) = @_;
3077 3160
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3162 },
3080); 3163);
3096our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
3097 3180
3098$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
3099 3182
3100$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
3103 sort time 3186 sort time
3104)); 3187));
3105 3188
3106# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
3110The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
3111 3194
3112 cf::object 3195 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3196 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3197 insert remove name archname title slaying race decrease split
3198 value
3115 3199
3116 cf::object::player 3200 cf::object::player
3117 player 3201 player
3118 3202
3119 cf::player 3203 cf::player
3125=cut 3209=cut
3126 3210
3127for ( 3211for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3214 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
3134) { 3218) {
3135 no strict 'refs'; 3219 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3155 3239
3156 my $qcode = $code; 3240 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
3159 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
3160 local $_; 3247 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3248
3163 my $eval = 3249 my $eval =
3164 "do {\n" 3250 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3253 . $code
3168 . "\n}" 3254 . "\n}"
3169 ; 3255 ;
3170 3256
3257 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
3174 3266
3175 if ($@) { 3267 if ($@) {
3176 warn "$@"; 3268 warn "$@";
3177 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
3197=cut 3289=cut
3198 3290
3199sub register_script_function { 3291sub register_script_function {
3200 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
3201 3293
3202 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
3204} 3296}
3205 3297
3206=back 3298=back
3207 3299
3208=cut 3300=cut
3229 3321
3230 $facedata->{version} == 2 3322 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3324
3233 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3234 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC, 3328 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3237 }; 3331 };
3238 cf::cede_to_tick; 3332 cf::cede_to_tick;
3239 3333
3240 { 3334 {
3241 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
3243 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3339
3246 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3250 3344
3251 cf::cede_to_tick; 3345 cf::cede_to_tick;
3252 } 3346 }
3253 3347
3254 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3278 3372
3279 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3280 } 3374 }
3281 3375
3282 { 3376 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3286 3378
3287 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3380 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3382
3292 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3384 cf::face::set_type $idx, $info->{type};
3307 } else { 3385 } else {
3308 $RESOURCE{$name} = $info; 3386 $RESOURCE{$name} = $info;
3309 } 3387 }
3310 3388
3393 reload_treasures; 3471 reload_treasures;
3394 3472
3395 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3396} 3474}
3397 3475
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3480 or return;
3409 3481
3410 local $/; 3482 local $/;
3411 *CFG = YAML::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3412 3484
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3414 3486
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3494 };
3423 warn $@ if $@; 3495 warn $@ if $@;
3424 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3499}
3500
3501sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!";
3504 flock $fh, &Fcntl::LOCK_EX
3505 or die "$PIDFILE: flock: $!";
3506 $fh
3507}
3508
3509# make sure only one server instance is running at any one time
3510sub atomic {
3511 my $fh = pidfile;
3512
3513 my $pid = <$fh>;
3514 kill 9, $pid if $pid > 0;
3515
3516 seek $fh, 0, 0;
3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3425} 3527}
3426 3528
3427sub main { 3529sub main {
3530 cf::init_globals; # initialise logging
3531
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541
3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543
3428 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3546 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3547 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3548 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3549 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3550 })->prio (Coro::PRIO_MAX);
3435 }; 3551 };
3436 3552
3437 { 3553 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3554
3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3559 reload_resources;
3439 reload_config; 3560 reload_config;
3440 db_init; 3561 db_init;
3562
3563 cf::init_uuid;
3564 cf::init_signals;
3565 cf::init_skills;
3566
3567 cf::init_beforeplay;
3568
3569 atomic;
3570
3441 load_extensions; 3571 load_extensions;
3442 3572
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3573 utime time, time, $RUNTIMEFILE;
3574
3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578
3579 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3580 };
3445 3581
3446 EV::loop; 3582 main_loop;
3447} 3583}
3448 3584
3449############################################################################# 3585#############################################################################
3450# initialisation and cleanup 3586# initialisation and cleanup
3451 3587
3452# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3453BEGIN { 3589BEGIN {
3454 our %SIGWATCHER = (); 3590 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3458 }; 3594 };
3459 } 3595 }
3460} 3596}
3461 3597
3462sub write_runtime_sync { 3598sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3599 my $t0 = AE::time;
3464 3600
3465 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3467 3603
3468 IO::AIO::aio_utime $runtime, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3605
3470 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3471 3607
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3609 or return;
3474 3610
3475 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3623 aio_utime $fh, undef, undef;
3488 3624
3489 close $fh 3625 close $fh
3490 or return; 3626 or return;
3491 3627
3492 aio_rename "$runtime~", $runtime 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3629 and return;
3494 3630
3495 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3632
3497 1 3633 1
3498} 3634}
3499 3635
3500our $uuid_lock; 3636our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3645 my $uuid = "$LOCALDIR/uuid";
3510 3646
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3647 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3648 or return;
3513 3649
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3650 my $value = uuid_seq uuid_cur;
3651
3652 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n";
3654 return;
3655 }
3656
3657 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3658 $uuid_skip = 0;
3516 3659
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3660 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3661 and return;
3519 3662
3541} 3684}
3542 3685
3543sub emergency_save() { 3686sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3687 my $freeze_guard = cf::freeze_mainloop;
3545 3688
3546 warn "enter emergency perl save\n"; 3689 warn "emergency_perl_save: enter\n";
3547 3690
3548 cf::sync_job { 3691 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696
3549 # use a peculiar iteration method to avoid tripping on perl 3697 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3698 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3699 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3700 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3701 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3702 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3703 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3705 $pl->save;
3558 } 3706 }
3559 warn "end emergency player save\n"; 3707 warn "emergency_perl_save: end player save\n";
3560 3708
3561 warn "begin emergency map save\n"; 3709 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3710 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3711 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3712 $map->valid or next;
3565 $map->save; 3713 $map->save;
3566 } 3714 }
3567 warn "end emergency map save\n"; 3715 warn "emergency_perl_save: end map save\n";
3568 3716
3569 warn "begin emergency database checkpoint\n"; 3717 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3718 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3719 warn "emergency_perl_save: end database checkpoint\n";
3572 3720
3573 warn "begin write uuid\n"; 3721 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3722 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3723 warn "emergency_perl_save: end write uuid\n";
3576 }; 3724 };
3577 3725
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3578 warn "leave emergency perl save\n"; 3731 warn "emergency_perl_save: leave\n";
3579} 3732}
3580 3733
3581sub post_cleanup { 3734sub post_cleanup {
3582 my ($make_core) = @_; 3735 my ($make_core) = @_;
3583 3736
3584 warn Carp::longmess "post_cleanup backtrace" 3737 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3738 if $make_core;
3739
3740 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$;
3742}
3743
3744# a safer delete_package, copied from Symbol
3745sub clear_package($) {
3746 my $pkg = shift;
3747
3748 # expand to full symbol table name if needed
3749 unless ($pkg =~ /^main::.*::$/) {
3750 $pkg = "main$pkg" if $pkg =~ /^::/;
3751 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3752 $pkg .= '::' unless $pkg =~ /::$/;
3753 }
3754
3755 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3756 my $stem_symtab = *{$stem}{HASH};
3757
3758 defined $stem_symtab and exists $stem_symtab->{$leaf}
3759 or return;
3760
3761 # clear all symbols
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 }
3767 warn "cleared package $pkg\n";#d#
3586} 3768}
3587 3769
3588sub do_reload_perl() { 3770sub do_reload_perl() {
3589 # can/must only be called in main 3771 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3773 warn "can only reload from main coroutine";
3592 return; 3774 return;
3593 } 3775 }
3594 3776
3777 return if $RELOAD++;
3778
3779 my $t1 = AE::time;
3780
3781 while ($RELOAD) {
3595 warn "reloading..."; 3782 warn "reloading...";
3596 3783
3597 warn "entering sync_job"; 3784 warn "entering sync_job";
3598 3785
3599 cf::sync_job { 3786 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3787 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3788 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3789 cf::write_runtime_sync; # external watchdog should not bark
3603 3790
3604 warn "syncing database to disk"; 3791 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3792 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3793
3607 # if anything goes wrong in here, we should simply crash as we already saved 3794 # if anything goes wrong in here, we should simply crash as we already saved
3608 3795
3609 warn "flushing outstanding aio requests"; 3796 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3797 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3799 }
3641 3800
3642 warn "... nuking $pkg"; 3801 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3802 $_->cancel for values %EXT_CORO;
3644 } 3803 %EXT_CORO = ();
3645 3804
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3805 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3806 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3807
3808 warn "removing ext/exti commands";
3809 %EXTCMD = ();
3810 %EXTICMD = ();
3811
3812 warn "unloading/nuking all extensions";
3813 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3814 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3815
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3816 if (my $cb = $pkg->can ("unload")) {
3817 eval {
3657 $cb->(); 3818 $cb->($pkg);
3819 1
3820 } or warn "$pkg unloaded, but with errors: $@";
3821 }
3822
3823 warn "... clearing $pkg";
3824 clear_package $pkg;
3658 } 3825 }
3659 3826
3660 Symbol::delete_package $k; 3827 warn "unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830
3831 warn "... unloading $k";
3832 delete $INC{$k};
3833
3834 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g;
3836
3837 if (my $cb = $k->can ("unload_module")) {
3838 $cb->();
3839 }
3840
3841 clear_package $k;
3661 } 3842 }
3662 3843
3663 warn "getting rid of safe::, as good as possible"; 3844 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3845 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3847
3667 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3851
3671 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3853 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3674 3855
3675 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3676 3857
3677 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3678 require cf; 3859 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3680 3861
3681 warn "loading config and database again"; 3862 warn "loading config and database again";
3682 cf::reload_config; 3863 cf::reload_config;
3683 3864
3684 warn "loading extensions"; 3865 warn "loading extensions";
3685 cf::load_extensions; 3866 cf::load_extensions;
3686 3867
3868 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3869 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3870 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3871 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3872 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3873 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3874 reattach $_ for values %PLAYER;
3875 }
3693 3876
3877 warn "running post_init jobs";
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879
3694 warn "leaving sync_job"; 3880 warn "leaving sync_job";
3695 3881
3696 1 3882 1
3697 } or do { 3883 } or do {
3698 warn $@; 3884 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3885 cf::cleanup "error while reloading, exiting.";
3700 }; 3886 };
3701 3887
3702 warn "reloaded"; 3888 warn "reloaded";
3889 --$RELOAD;
3890 }
3891
3892 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n";
3703}; 3894};
3704 3895
3705our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3706 3897
3707sub reload_perl() { 3898sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3899 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3710 3901
3902 $RELOAD_WATCHER ||= cf::async {
3903 Coro::AIO::aio_wait cache_extensions;
3904
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3906 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3908 };
3714 }; 3909 };
3715} 3910}
3716 3911
3717register_command "reload" => sub { 3912register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3913 my ($who, $arg) = @_;
3732 3927
3733our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3735 3930
3736sub wait_for_tick { 3931sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3933
3739 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3936 $signal->wait;
3742} 3937}
3743 3938
3744sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3941
3747 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3944 $signal->wait;
3750} 3945}
3755 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3756 return; 3951 return;
3757 } 3952 }
3758 3953
3759 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3955
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 3957
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 3960 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
3787} 3984}
3788 3985
3789{ 3986{
3790 # configure BDB 3987 # configure BDB
3791 3988
3792 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3991 $AnyEvent::BDB::WATCHER->priority (1);
3795 3992
3796 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3995 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3996 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3997 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3998 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3999 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4000
3803 cf::sync_job { 4001 cf::sync_job {
3804 eval { 4002 eval {
3843 $msg =~ s/\n//; 4041 $msg =~ s/\n//;
3844 4042
3845 # limit the # of concurrent backtraces 4043 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4044 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4045 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg;
3848 async { 4047 async {
3849 $Coro::current->{desc} = "abt $msg"; 4048 $Coro::current->{desc} = "abt $msg";
3850 4049
3851 my @bt = fork_call { 4050 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4051 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4062 }
3864 4063
3865 @funcs 4064 @funcs
3866 }; 4065 };
3867 4066
3868 LOG llevInfo, "[ABT] $msg\n"; 4067 LOG llevInfo, "[ABT] $perl_bt\n";
4068 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4069 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4070 --$_log_backtrace;
3871 }; 4071 };
3872 } else { 4072 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4073 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4075 }
3876} 4076}
3877 4077
3878# load additional modules 4078# load additional modules
3879use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3880 4081
3881END { cf::emergency_save } 4082END { cf::emergency_save }
3882 4083
38831 40841
3884 4085

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines