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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines