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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines