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.456 by root, Tue Sep 30 04:00:35 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 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
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
132 148
133our @POST_INIT; 149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
134 153
135binmode STDOUT; 154binmode STDOUT;
136binmode STDERR; 155binmode STDERR;
137 156
138# read virtual server time, if available 157# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
143} 162}
144 163
164eval "sub TICK() { $TICK } 1" or die;
165
145mkdir $_ 166mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 168
148our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
149 170
150sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
151 187
152############################################################################# 188#############################################################################
153 189
154=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
155 191
202returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
203per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
204 240
205=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
206 242
207This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
208C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
209that call. 245that call.
210 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
211=back 253=back
212 254
213=cut 255=cut
214 256
215BEGIN { 257$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 258 my $msg = join "", @_;
218 259
219 $msg .= "\n" 260 $msg .= "\n"
220 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
221 262
222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
223 264
224 LOG llevError, $msg; 265 LOG llevError, $msg;
225 }; 266};
226}
227 267
228$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
230 270
231 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 275 return;#d#
234 }#d# 276 }#d#
235 277
236 # kill coroutine otherwise 278 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 279 Coro::terminate
239}; 280};
240
241$SIG{__DIE__} = sub { }; #d#?
242 281
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 299)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 301}
263 302
264$EV::DIED = sub { 303$EV::DIED = sub {
265 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
266}; 305};
267 306
268############################################################################# 307#############################################################################
269 308
270=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
328Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
329 368
330=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
331 370
332Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
333a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
334for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
335returned. 374returned.
336 375
337Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro. 377deadlocked coro.
344 383
345Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
346 385
347=cut 386=cut
348 387
349our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 389
352sub lock_wait($) { 390sub lock_wait($) {
353 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 392}
367 393
368sub lock_acquire($) { 394sub lock_acquire($) {
369 my ($key) = @_; 395 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 396}
383 397
384sub lock_active($) { 398sub lock_active($) {
385 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 400}
389 401
390sub freeze_mainloop { 402sub freeze_mainloop {
391 tick_inhibit_inc; 403 tick_inhibit_inc;
392 404
393 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
394} 406}
395 407
396=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
397 409
398Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer. 411get spread over time.
400 412
401=cut 413=cut
402 414
403sub periodic($$) { 415sub periodic($$) {
404 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
421 433
422=cut 434=cut
423 435
424our @SLOT_QUEUE; 436our @SLOT_QUEUE;
425our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
426 439
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
430 443
431 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
432 446
433 while () { 447 while () {
434 next_job: 448 next_job:
449
435 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 451
437 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 456 $job->[2]->send;
441 Coro::cede; 457 Coro::cede;
442 goto next_job; 458 goto next_job;
443 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 461 }
445 } 462 }
446 463
447 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
448 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
449 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 467 $signal->wait;
451 } else { 468 } else {
469 $busy = 0;
452 Coro::schedule; 470 Coro::schedule;
453 } 471 }
454 } 472 }
455}; 473};
456 474
457sub get_slot($;$$) { 475sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
459 477
460 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
461 479
462 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
463 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
464 483
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
494 513
495sub sync_job(&) { 514sub sync_job(&) {
496 my ($job) = @_; 515 my ($job) = @_;
497 516
498 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
499 my $time = EV::time; 518 my $time = AE::time;
500 519
501 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
503 522
504 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
521 } else { 540 } else {
522 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
523 } 542 }
524 } 543 }
525 544
526 my $time = EV::time - $time; 545 my $time = AE::time - $time;
527 546
528 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
529 548
530 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
531 } else { 550 } else {
575 reset_signals; 594 reset_signals;
576 &$cb 595 &$cb
577 }, @args; 596 }, @args;
578 597
579 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
580} 610}
581 611
582=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
583 613
584=cut 614=cut
1165 1195
1166 sync_job { 1196 sync_job {
1167 if (length $$rdata) { 1197 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1171 1202
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1208 aio_fsync $fh;
1209 }
1176 aio_close $fh; 1210 aio_close $fh;
1177 1211
1178 if (@$objs) { 1212 if (@$objs) {
1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1180 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1183 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1219 aio_fsync $fh;
1220 }
1184 aio_close $fh; 1221 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1223 }
1187 } else { 1224 } else {
1188 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1189 } 1226 }
1190 1227
1191 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1192 1229
1193 $filename =~ s%/[^/]+$%%; 1230 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename; 1231 aio_pathsync $filename if $cf::USE_FSYNC;
1195 } else { 1232 } else {
1196 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1197 } 1234 }
1198 } else { 1235 } else {
1199 aio_unlink $filename; 1236 aio_unlink $filename;
1200 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1201 } 1238 }
1226 $av = $st->{objs}; 1263 $av = $st->{objs};
1227 } 1264 }
1228 1265
1229 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1230 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1231 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1232 1270
1233 ($data, $av) 1271 ($data, $av)
1234} 1272}
1235 1273
1236=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1292 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1293 1331
1294 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1295} 1333}
1296 1334
1335use File::Glob ();
1336
1297cf::player->attach ( 1337cf::player->attach (
1298 on_command => sub { 1338 on_unknown_command => sub {
1299 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1300 1340
1301 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1302 or return; 1342 or return;
1303 1343
1333 1373
1334 cf::override; 1374 cf::override;
1335 }, 1375 },
1336); 1376);
1337 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1338sub load_extensions { 1391sub load_extensions {
1339 cf::sync_job { 1392 cf::sync_job {
1340 my %todo; 1393 my %todo;
1341 1394
1342 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1369 . "\n};\n1"; 1422 . "\n};\n1";
1370 1423
1371 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1372 } 1425 }
1373 1426
1427 my $pass = 0;
1374 my %done; 1428 my %done;
1375 while (%todo) { 1429 while (%todo) {
1376 my $progress; 1430 my $progress;
1377 1431
1432 ++$pass;
1433
1434 ext:
1378 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1379 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1380 goto skip 1437 next ext
1381 unless exists $done{$_}; 1438 unless exists $done{$_};
1382 } 1439 }
1383 1440
1384 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1385 1442
1386 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1387 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1388 : "$v->{base}: extension inactive.\n";
1389 1447
1390 if (exists $v->{meta}{mandatory}) {
1391 warn $msg;
1392 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1393 } 1449 if exists $v->{meta}{mandatory};
1394 1450
1395 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1396 } 1460 }
1397
1398 $done{$k} = delete $todo{$k};
1399 push @EXTS, $v->{pkg};
1400 $progress = 1;
1401 } 1461 }
1402 1462
1403 skip: 1463 unless ($progress) {
1404 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1405 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1406 } 1471 }
1407 }; 1472 };
1408} 1473}
1409 1474
1410############################################################################# 1475#############################################################################
1494 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1495 } 1560 }
1496 } 1561 }
1497} 1562}
1498 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1499sub save($) { 1577sub save($) {
1500 my ($pl) = @_; 1578 my ($pl) = @_;
1501 1579
1502 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1503 1581
1508 1586
1509 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1510 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1511 1589
1512 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1513 1594
1514 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1515 cf::cede_to_tick; 1596 cf::cede_to_tick;
1516} 1597}
1517 1598
1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1555 1636
1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1557 $pl->deactivate; 1638 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1560 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1561 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1562 1642
1563 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1564 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1619 \@logins 1699 \@logins
1620} 1700}
1621 1701
1622=item $player->maps 1702=item $player->maps
1623 1703
1704=item cf::player::maps $login
1705
1624Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1625player. May block. 1707player. May block.
1626 1708
1627=cut 1709=cut
1628 1710
1690=cut 1772=cut
1691 1773
1692sub find_by_path($) { 1774sub find_by_path($) {
1693 my ($path) = @_; 1775 my ($path) = @_;
1694 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1695 my ($match, $specificity); 1779 my ($match, $specificity);
1696 1780
1697 for my $region (list) { 1781 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1699 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731 1815
1732 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1733 $self->_create_random_map ( 1817 $self->_create_random_map (
1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1738 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1739 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1740 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1762 1846
1763 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1764} 1848}
1765 1849
1766# also paths starting with '/' 1850# also paths starting with '/'
1767$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1768 1852
1769sub thawer_merge { 1853sub thawer_merge {
1770 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1771 1855
1772 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1870 1954
1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1872 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1873} 1957}
1874 1958
1875# and all this just because we cannot iterate over
1876# all maps in C++...
1877sub change_all_map_light {
1878 my ($change) = @_;
1879
1880 $_->change_map_light ($change)
1881 for grep $_->outdoor, values %cf::MAP;
1882}
1883
1884sub decay_objects { 1959sub decay_objects {
1885 my ($self) = @_; 1960 my ($self) = @_;
1886 1961
1887 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1888 1963
1970sub find { 2045sub find {
1971 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1972 2047
1973 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1974 2049
1975 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1976 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1977 2052
1978 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1982 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1983 or return; 2055 or return;
1984 2056
1985 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1986 2058
1998 2070
1999 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2000 } 2072 }
2001} 2073}
2002 2074
2003sub pre_load { } 2075sub pre_load { }
2004sub post_load { } 2076#sub post_load { } # XS
2005 2077
2006sub load { 2078sub load {
2007 my ($self) = @_; 2079 my ($self) = @_;
2008 2080
2009 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2054 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2055 $self->decay_objects; 2127 $self->decay_objects;
2056 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2057 $self->update_buttons; 2129 $self->update_buttons;
2058 cf::cede_to_tick; 2130 cf::cede_to_tick;
2059 $self->set_darkness_map;
2060 cf::cede_to_tick;
2061 $self->activate; 2131 $self->activate;
2062 } 2132 }
2063 2133
2064 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2068 } 2138 }
2069 2139
2070 $self->post_load; 2140 $self->post_load;
2071} 2141}
2072 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2073sub customise_for { 2146sub customise_for {
2074 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2075 2148
2076 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2077 if $self->per_player; 2150 if $self->per_player;
2093 or next; 2166 or next;
2094 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2095 or next; 2168 or next;
2096 $neigh->load; 2169 $neigh->load;
2097 2170
2171 # now find the diagonal neighbours
2098 push @neigh, 2172 push @neigh,
2099 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2100 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2101 } 2175 }
2102 2176
2154 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2155 2229
2156 () 2230 ()
2157} 2231}
2158 2232
2233# common code, used by both ->save and ->swapout
2159sub save { 2234sub _save {
2160 my ($self) = @_; 2235 my ($self) = @_;
2161
2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
2163 2236
2164 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2165 2238
2166 return unless $self->dirty; 2239 return unless $self->dirty;
2167 2240
2187 } else { 2260 } else {
2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2189 } 2262 }
2190} 2263}
2191 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2192sub swap_out { 2273sub swap_out {
2193 my ($self) = @_; 2274 my ($self) = @_;
2194 2275
2195 # save first because save cedes
2196 $self->save;
2197
2198 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2199 2277
2200 return if $self->players;
2201 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2202 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2203 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2204 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2205 2332
2206 $self->deactivate; 2333 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2208 $self->clear; 2335 $self->clear;
2209}
2210
2211sub reset_at {
2212 my ($self) = @_;
2213
2214 # TODO: safety, remove and allow resettable per-player maps
2215 return 1e99 if $self->{deny_reset};
2216
2217 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2218 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2219
2220 $time + $to
2221}
2222
2223sub should_reset {
2224 my ($self) = @_;
2225
2226 $self->reset_at <= $cf::RUNTIME
2227}
2228
2229sub reset {
2230 my ($self) = @_;
2231
2232 my $lock = cf::lock_acquire "map_data:$self->{path}";
2233
2234 return if $self->players;
2235
2236 warn "resetting map ", $self->path;
2237
2238 $self->in_memory (cf::MAP_SWAPPED);
2239
2240 # need to save uniques path
2241 unless ($self->{deny_save}) {
2242 my $uniq = $self->uniq_path; utf8::encode $uniq;
2243
2244 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2245 if $uniq;
2246 }
2247
2248 delete $cf::MAP{$self->path};
2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear;
2253 2336
2254 $self->unlink_save; 2337 $self->unlink_save;
2255 $self->destroy; 2338 $self->destroy;
2256} 2339}
2257 2340
2265 2348
2266 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2267 2350
2268 $self->unlink_save; 2351 $self->unlink_save;
2269 2352
2270 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2271 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2272 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2273 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2275 2358
2332 : normalise $_ 2415 : normalise $_
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2417 ]
2335} 2418}
2336 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2337=back 2452=back
2338 2453
2339=head3 cf::object 2454=head3 cf::object
2340 2455
2341=cut 2456=cut
2406 2521
2407our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2408 id => "say", 2523 id => "say",
2409 title => "Map", 2524 title => "Map",
2410 reply => "say ", 2525 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2412}; 2527};
2413 2528
2414our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2415 id => "chat", 2530 id => "chat",
2416 title => "Chat", 2531 title => "Chat",
2473 2588
2474Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2475 2590
2476The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2477for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2479map. 2594map.
2480 2595
2481Will never block. 2596Will never block.
2482 2597
2483=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2504sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2505 my ($self) = @_; 2620 my ($self) = @_;
2506 2621
2507 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2508 2623
2624 ++$self->{_link_recursion};
2625
2509 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2510 2627
2511 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2512 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2513 2630
2514 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2515} 2632}
2516 2633
2517sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2518 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2519 2636
2536 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2537 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2538 2655
2539 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2540 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2541 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2542 2659
2543 $map->load; 2660 $map->load;
2544 $map->load_neighbours; 2661 $map->load_neighbours;
2545 2662
2546 return unless $self->contr->active; 2663 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2548 $self->activate_recursive;
2549 2664
2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2551 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2552} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2553 2672
2673}
2674
2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2555 2676
2556Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2557her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2558that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2559the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2566 2687
2567our $GOTOGEN; 2688our $GOTOGEN;
2568 2689
2569sub cf::object::player::goto { 2690sub cf::object::player::goto {
2570 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2571 2698
2572 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2574 2701
2575 $self->enter_link; 2702 $self->enter_link;
2599 my $map = eval { 2726 my $map = eval {
2600 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2601 2728
2602 if ($map) { 2729 if ($map) {
2603 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2604 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2605 } else { 2732 } else {
2606 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 } 2734 }
2608 2735
2609 $map 2736 $map
2617 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2618 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2619 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2620 } 2747 }
2621 2748
2622 $done->() if $done; 2749 $done->($self) if $done;
2623 })->prio (1); 2750 })->prio (1);
2624} 2751}
2625 2752
2626=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2627 2754
2744 2871
2745 utf8::encode $text; 2872 utf8::encode $text;
2746 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2747} 2874}
2748 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2749=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2750 2902
2751Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2752client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2753the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
2755 2907
2756=cut 2908=cut
2757 2909
2758# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2759our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2760 "c/identify" => { 2918 "c/identify" => {
2761 id => "infobox", 2919 id => "infobox",
2762 title => "Identify", 2920 title => "Identify",
2763 reply => undef, 2921 reply => undef,
2764 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2766 "c/examine" => { 2924 "c/examine" => {
2767 id => "infobox", 2925 id => "infobox",
2768 title => "Examine", 2926 title => "Examine",
2769 reply => undef, 2927 reply => undef,
2770 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2771 }, 2935 },
2772 "c/book" => { 2936 "c/book" => {
2773 id => "infobox", 2937 id => "infobox",
2774 title => "Book", 2938 title => "Book",
2775 reply => undef, 2939 reply => undef,
2791 id => "infobox", 2955 id => "infobox",
2792 title => "Body Parts", 2956 title => "Body Parts",
2793 reply => undef, 2957 reply => undef,
2794 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2795 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2796 "c/skills" => { 2966 "c/skills" => {
2797 id => "infobox", 2967 id => "infobox",
2798 title => "Skills", 2968 title => "Skills",
2799 reply => undef, 2969 reply => undef,
2800 tooltip => "Shows your experience per skill and item power", 2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2995 },
2802 "c/uptime" => { 2996 "c/uptime" => {
2803 id => "infobox", 2997 id => "infobox",
2804 title => "Uptime", 2998 title => "Uptime",
2805 reply => undef, 2999 reply => undef,
2815 id => "party", 3009 id => "party",
2816 title => "Party", 3010 title => "Party",
2817 reply => "gsay ", 3011 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2819 }, 3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2820); 3022);
2821 3023
2822sub cf::client::send_msg { 3024sub cf::client::send_msg {
2823 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2824 3026
2829 3031
2830 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2831 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2832 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2833 3035
2834 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2835 if $self->can_msg;
2836
2837 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2838 3038
2839 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2840 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2841 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2842 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2843 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2844 if $self->can_msg;
2845 } 3044 }
2846 3045
2847 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2848 } 3047 }
2849 3048
2850 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2851 3050
2852 if ($self->can_msg) {
2853 # default colour, mask it out 3051 # default colour, mask it out
2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2855 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2856 3054
2857 my $pkt = "msg " 3055 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3058 );
2861 3059
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2873 } else {
2874 if ($color >= 0) {
2875 # replace some tags by gcfclient-compatible ones
2876 for ($msg) {
2877 1 while
2878 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2879 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2880 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2881 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2882 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2883 }
2884
2885 $color &= cf::NDI_COLOR_MASK;
2886
2887 utf8::encode $msg;
2888
2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2892 } else {
2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2894 $self->send_packet ("drawinfo $color $msg")
2895 }
2896 }
2897 }
2898} 3061}
2899 3062
2900=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2901 3064
2902Sends an ext event to the client. 3065Sends an ext event to the client.
2905 3068
2906sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2907 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2908 3071
2909 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2912 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2913 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2914 } 3077 }
2915} 3078}
2916 3079
2917=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2918 3081
2922 3085
2923sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2924 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2925 3088
2926 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2928 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2929 #TODO: version 1, remove 3092 #TODO: version 1, remove
2930 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3095 }
2933} 3096}
2934 3097
2935=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2936 3099
3037 3200
3038 $coro 3201 $coro
3039} 3202}
3040 3203
3041cf::client->attach ( 3204cf::client->attach (
3042 on_destroy => sub { 3205 on_client_destroy => sub {
3043 my ($ns) = @_; 3206 my ($ns) = @_;
3044 3207
3045 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3046 }, 3209 },
3047); 3210);
3063our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3064 3227
3065$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3066 3229
3067$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3068 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3069 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3070 sort time 3233 sort time
3071)); 3234));
3072 3235
3073# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3077The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3078 3241
3079 cf::object 3242 cf::object
3080 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3081 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3082 3246
3083 cf::object::player 3247 cf::object::player
3084 player 3248 player
3085 3249
3086 cf::player 3250 cf::player
3092=cut 3256=cut
3093 3257
3094for ( 3258for (
3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3096 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3097 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3101) { 3265) {
3102 no strict 'refs'; 3266 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 3286
3123 my $qcode = $code; 3287 my $qcode = $code;
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3126 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3127 local $_; 3294 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3295
3130 my $eval = 3296 my $eval =
3131 "do {\n" 3297 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3300 . $code
3135 . "\n}" 3301 . "\n}"
3136 ; 3302 ;
3137 3303
3304 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3141 3313
3142 if ($@) { 3314 if ($@) {
3143 warn "$@"; 3315 warn "$@";
3144 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3164=cut 3336=cut
3165 3337
3166sub register_script_function { 3338sub register_script_function {
3167 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3168 3340
3169 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3171} 3343}
3172 3344
3173=back 3345=back
3174 3346
3175=cut 3347=cut
3196 3368
3197 $facedata->{version} == 2 3369 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3371
3200 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3201 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3375 type => FT_RSRC,
3203 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3204 }; 3378 };
3205 cf::cede_to_tick; 3379 cf::cede_to_tick;
3206 3380
3207 { 3381 {
3208 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3386
3213 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3391
3218 cf::cede_to_tick; 3392 cf::cede_to_tick;
3219 } 3393 }
3220 3394
3221 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3245 3419
3246 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3247 } 3421 }
3248 3422
3249 { 3423 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3253 3425
3254 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3429
3259 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3274 } else { 3432 } else {
3275 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3276 } 3434 }
3277 3435
3278 cf::cede_to_tick; 3436 cf::cede_to_tick;
3279 } 3437 }
3280 } 3438 }
3281 3439
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3441
3284 1 3442 1
3285} 3443}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3444
3307register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3309 3447
3310 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3487sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3352} 3490}
3353 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3354sub reload_resources { 3515sub reload_resources {
3355 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3356 3517
3357 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3358 reload_archetypes; 3520 reload_archetypes;
3359 reload_regions; 3521 reload_regions;
3360 reload_treasures; 3522 reload_treasures;
3361 3523
3362 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3363} 3525}
3364 3526
3365sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3531 or return;
3368 3532
3369 local $/; 3533 local $/;
3370 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3371 3535
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3537
3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 3540
3377 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3545 };
3382 warn $@ if $@; 3546 warn $@ if $@;
3383 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3384} 3550}
3385 3551
3386sub pidfile() { 3552sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3554 or die "$PIDFILE: $!";
3400 3566
3401 seek $fh, 0, 0; 3567 seek $fh, 0, 0;
3402 print $fh $$; 3568 print $fh $$;
3403} 3569}
3404 3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3578}
3579
3405sub main { 3580sub main {
3406 cf::init_globals; # initialise logging 3581 cf::init_globals; # initialise logging
3407 3582
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418 3587
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420 3589
3421 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3422 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3428 }; 3597 };
3429 3598
3430 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3431 3600
3432 cf::sync_job { 3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3433 reload_resources; 3610 reload_resources;
3434 reload_config; 3611 reload_config;
3435 db_init; 3612 db_init;
3436 3613
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid; 3614 cf::init_uuid;
3440 cf::init_signals; 3615 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills; 3616 cf::init_skills;
3443 3617
3444 cf::init_beforeplay; 3618 cf::init_beforeplay;
3445 3619
3446 atomic; 3620 atomic;
3448 load_extensions; 3622 load_extensions;
3449 3623
3450 utime time, time, $RUNTIMEFILE; 3624 utime time, time, $RUNTIMEFILE;
3451 3625
3452 # no (long-running) fork's whatsoever before this point(!) 3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454 3629
3455 (pop @POST_INIT)->(0) while @POST_INIT; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3456 }; 3631 };
3457 3632
3458 EV::loop; 3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3459} 3637}
3460 3638
3461############################################################################# 3639#############################################################################
3462# initialisation and cleanup 3640# initialisation and cleanup
3463 3641
3464# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3465BEGIN { 3643BEGIN {
3466 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3467 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3468 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3469 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3470 }; 3648 };
3471 } 3649 }
3472} 3650}
3473 3651
3474sub write_runtime_sync { 3652sub write_runtime_sync {
3653 my $t0 = AE::time;
3654
3475 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3476 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3477 3657
3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3479 3659
3480 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3481 3661
3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3483 or return; 3663 or return;
3484 3664
3485 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3486 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3487 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3500 or return; 3680 or return;
3501 3681
3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3503 and return; 3683 and return;
3504 3684
3505 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3506 3686
3507 1 3687 1
3508} 3688}
3509 3689
3510our $uuid_lock; 3690our $uuid_lock;
3558} 3738}
3559 3739
3560sub emergency_save() { 3740sub emergency_save() {
3561 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3562 3742
3563 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3564 3744
3565 cf::sync_job { 3745 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750
3566 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3567 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3568 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3569 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3570 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3571 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3572 $pl->valid or next; 3757 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3574 $pl->save; 3759 $pl->save;
3575 } 3760 }
3576 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3577 3762
3578 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3579 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3580 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3581 $map->valid or next; 3766 $map->valid or next;
3582 $map->save; 3767 $map->save;
3583 } 3768 }
3584 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3585 3770
3586 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3587 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3588 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3589 3774
3590 warn "begin write uuid\n"; 3775 warn "emergency_perl_save: begin write uuid\n";
3591 write_uuid_sync 1; 3776 write_uuid_sync 1;
3592 warn "end write uuid\n"; 3777 warn "emergency_perl_save: end write uuid\n";
3593 }; 3778 };
3594 3779
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3595 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3596} 3786}
3597 3787
3598sub post_cleanup { 3788sub post_cleanup {
3599 my ($make_core) = @_; 3789 my ($make_core) = @_;
3600 3790
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 } 3820 }
3631 warn "cleared package $pkg\n";#d#
3632} 3821}
3633 3822
3634sub do_reload_perl() { 3823sub do_reload_perl() {
3635 # can/must only be called in main 3824 # can/must only be called in main
3636 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3637 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3638 return; 3827 return;
3639 } 3828 }
3640 3829
3641 return if $RELOAD++; 3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3642 3833
3643 while ($RELOAD) { 3834 while ($RELOAD) {
3644 warn "reloading..."; 3835 warn "reloading...";
3645 3836
3646 warn "entering sync_job"; 3837 warn "entering sync_job";
3707 clear_package "safe::$_" 3898 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3900
3710 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3904
3714 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3906 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3717 3908
3718 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3719 3910
3720 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3721 require cf; 3912 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3723 3914
3724 warn "loading config and database again"; 3915 warn "loading config and database again";
3725 cf::reload_config; 3916 cf::reload_config;
3726 3917
3727 warn "loading extensions"; 3918 warn "loading extensions";
3728 cf::load_extensions; 3919 cf::load_extensions;
3729 3920
3921 if ($REATTACH_ON_RELOAD) {
3730 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3731 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3732 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3733 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3734 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3735 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3736 3929
3737 warn "running post_load"; 3930 warn "running post_init jobs";
3738 (pop @POST_INIT)->(1) while @POST_INIT; 3931 (pop @POST_INIT)->(1) while @POST_INIT;
3739 3932
3740 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3741 3934
3742 1 3935 1
3746 }; 3939 };
3747 3940
3748 warn "reloaded"; 3941 warn "reloaded";
3749 --$RELOAD; 3942 --$RELOAD;
3750 } 3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3751}; 3947};
3752 3948
3753our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3754 3950
3755sub reload_perl() { 3951sub reload_perl() {
3756 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3757 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3758 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3760 do_reload_perl; 3959 do_reload_perl;
3761 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3762 }; 3962 };
3763} 3963}
3764 3964
3765register_command "reload" => sub { 3965register_command "reload" => sub {
3766 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3780 3980
3781our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3783 3983
3784sub wait_for_tick { 3984sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3986
3787 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3989 $signal->wait;
3790} 3990}
3791 3991
3792sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3994
3795 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3997 $signal->wait;
3798} 3998}
3803 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3804 return; 4004 return;
3805 } 4005 }
3806 4006
3807 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 4010
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 4013 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3835} 4037}
3836 4038
3837{ 4039{
3838 # configure BDB 4040 # configure BDB
3839 4041
3840 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3843 4045
3844 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4128 }
3927} 4129}
3928 4130
3929# load additional modules 4131# load additional modules
3930use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3931 4134
3932END { cf::emergency_save } 4135END { cf::emergency_save }
3933 4136
39341 41371
3935 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines