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.453 by root, Tue Sep 23 04:29:11 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;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1232 } else {
1193 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1194 } 1234 }
1195 } else { 1235 } else {
1196 aio_unlink $filename; 1236 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1198 } 1238 }
1223 $av = $st->{objs}; 1263 $av = $st->{objs};
1224 } 1264 }
1225 1265
1226 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1229 1270
1230 ($data, $av) 1271 ($data, $av)
1231} 1272}
1232 1273
1233=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1289 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1290 1331
1291 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1292} 1333}
1293 1334
1335use File::Glob ();
1336
1294cf::player->attach ( 1337cf::player->attach (
1295 on_command => sub { 1338 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1297 1340
1298 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1299 or return; 1342 or return;
1300 1343
1330 1373
1331 cf::override; 1374 cf::override;
1332 }, 1375 },
1333); 1376);
1334 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
1335sub load_extensions { 1391sub load_extensions {
1336 cf::sync_job { 1392 cf::sync_job {
1337 my %todo; 1393 my %todo;
1338 1394
1339 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1366 . "\n};\n1"; 1422 . "\n};\n1";
1367 1423
1368 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1369 } 1425 }
1370 1426
1427 my $pass = 0;
1371 my %done; 1428 my %done;
1372 while (%todo) { 1429 while (%todo) {
1373 my $progress; 1430 my $progress;
1374 1431
1432 ++$pass;
1433
1434 ext:
1375 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1437 next ext
1378 unless exists $done{$_}; 1438 unless exists $done{$_};
1379 } 1439 }
1380 1440
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1442
1383 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1447
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1449 if exists $v->{meta}{mandatory};
1391 1450
1392 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;
1393 } 1460 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1461 }
1399 1462
1400 skip: 1463 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1471 }
1404 }; 1472 };
1405} 1473}
1406 1474
1407############################################################################# 1475#############################################################################
1491 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1492 } 1560 }
1493 } 1561 }
1494} 1562}
1495 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
1496sub save($) { 1577sub save($) {
1497 my ($pl) = @_; 1578 my ($pl) = @_;
1498 1579
1499 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1500 1581
1505 1586
1506 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1508 1589
1509 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];
1510 1594
1511 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1596 cf::cede_to_tick;
1513} 1597}
1514 1598
1551 $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
1552 1636
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1554 $pl->deactivate; 1638 $pl->deactivate;
1555 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;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1558 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1559 1642
1560 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1616 \@logins 1699 \@logins
1617} 1700}
1618 1701
1619=item $player->maps 1702=item $player->maps
1620 1703
1704=item cf::player::maps $login
1705
1621Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1622player. May block. 1707player. May block.
1623 1708
1624=cut 1709=cut
1625 1710
1687=cut 1772=cut
1688 1773
1689sub find_by_path($) { 1774sub find_by_path($) {
1690 my ($path) = @_; 1775 my ($path) = @_;
1691 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1692 my ($match, $specificity); 1779 my ($match, $specificity);
1693 1780
1694 for my $region (list) { 1781 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1727 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
1728 1815
1729 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1817 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1759 1846
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1848}
1762 1849
1763# also paths starting with '/' 1850# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1852
1766sub thawer_merge { 1853sub thawer_merge {
1767 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1768 1855
1769 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1867 1954
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1870} 1957}
1871 1958
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1959sub decay_objects {
1882 my ($self) = @_; 1960 my ($self) = @_;
1883 1961
1884 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1885 1963
1967sub find { 2045sub find {
1968 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1969 2047
1970 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1971 2049
1972 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2052
1975 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1980 or return; 2055 or return;
1981 2056
1982 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1983 2058
1995 2070
1996 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1997 } 2072 }
1998} 2073}
1999 2074
2000sub pre_load { } 2075sub pre_load { }
2001sub post_load { } 2076#sub post_load { } # XS
2002 2077
2003sub load { 2078sub load {
2004 my ($self) = @_; 2079 my ($self) = @_;
2005 2080
2006 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2127 $self->decay_objects;
2053 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2054 $self->update_buttons; 2129 $self->update_buttons;
2055 cf::cede_to_tick; 2130 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2131 $self->activate;
2059 } 2132 }
2060 2133
2061 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2065 } 2138 }
2066 2139
2067 $self->post_load; 2140 $self->post_load;
2068} 2141}
2069 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
2070sub customise_for { 2146sub customise_for {
2071 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2072 2148
2073 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2150 if $self->per_player;
2090 or next; 2166 or next;
2091 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2092 or next; 2168 or next;
2093 $neigh->load; 2169 $neigh->load;
2094 2170
2171 # now find the diagonal neighbours
2095 push @neigh, 2172 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 } 2175 }
2099 2176
2151 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2152 2229
2153 () 2230 ()
2154} 2231}
2155 2232
2233# common code, used by both ->save and ->swapout
2156sub save { 2234sub _save {
2157 my ($self) = @_; 2235 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2236
2161 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2162 2238
2163 return unless $self->dirty; 2239 return unless $self->dirty;
2164 2240
2184 } else { 2260 } else {
2185 $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);
2186 } 2262 }
2187} 2263}
2188 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2189sub swap_out { 2273sub swap_out {
2190 my ($self) = @_; 2274 my ($self) = @_;
2191 2275
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2277
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2200 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2201 $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};
2202 2332
2203 $self->deactivate; 2333 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2335 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2336
2251 $self->unlink_save; 2337 $self->unlink_save;
2252 $self->destroy; 2338 $self->destroy;
2253} 2339}
2254 2340
2262 2348
2263 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2264 2350
2265 $self->unlink_save; 2351 $self->unlink_save;
2266 2352
2267 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2358
2329 : normalise $_ 2415 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2417 ]
2332} 2418}
2333 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
2334=back 2452=back
2335 2453
2336=head3 cf::object 2454=head3 cf::object
2337 2455
2338=cut 2456=cut
2403 2521
2404our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2405 id => "say", 2523 id => "say",
2406 title => "Map", 2524 title => "Map",
2407 reply => "say ", 2525 reply => "say ",
2408 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.",
2409}; 2527};
2410 2528
2411our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2412 id => "chat", 2530 id => "chat",
2413 title => "Chat", 2531 title => "Chat",
2470 2588
2471Freezes 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}>).
2472 2590
2473The 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.
2474for 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,
2475though, 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
2476map. 2594map.
2477 2595
2478Will never block. 2596Will never block.
2479 2597
2480=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2502 my ($self) = @_; 2620 my ($self) = @_;
2503 2621
2504 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2505 2623
2624 ++$self->{_link_recursion};
2625
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2627
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2510 2630
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2632}
2513 2633
2514sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2516 2636
2533 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2535 2655
2536 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2539 2659
2540 $map->load; 2660 $map->load;
2541 $map->load_neighbours; 2661 $map->load_neighbours;
2542 2662
2543 return unless $self->contr->active; 2663 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2664
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2549} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2550 2672
2673}
2674
2551=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)]])
2552 2676
2553Moves 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
2554her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2555that 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
2556the 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
2563 2687
2564our $GOTOGEN; 2688our $GOTOGEN;
2565 2689
2566sub cf::object::player::goto { 2690sub cf::object::player::goto {
2567 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 }
2568 2698
2569 # 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
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2701
2572 $self->enter_link; 2702 $self->enter_link;
2596 my $map = eval { 2726 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2598 2728
2599 if ($map) { 2729 if ($map) {
2600 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2732 } else {
2603 $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);
2604 } 2734 }
2605 2735
2606 $map 2736 $map
2614 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2617 } 2747 }
2618 2748
2619 $done->() if $done; 2749 $done->($self) if $done;
2620 })->prio (1); 2750 })->prio (1);
2621} 2751}
2622 2752
2623=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2624 2754
2741 2871
2742 utf8::encode $text; 2872 utf8::encode $text;
2743 $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);
2744} 2874}
2745 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
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2902
2748Send 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
2749client 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
2750the 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
2752 2907
2753=cut 2908=cut
2754 2909
2755# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2757 "c/identify" => { 2918 "c/identify" => {
2758 id => "infobox", 2919 id => "infobox",
2759 title => "Identify", 2920 title => "Identify",
2760 reply => undef, 2921 reply => undef,
2761 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2763 "c/examine" => { 2924 "c/examine" => {
2764 id => "infobox", 2925 id => "infobox",
2765 title => "Examine", 2926 title => "Examine",
2766 reply => undef, 2927 reply => undef,
2767 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",
2768 }, 2935 },
2769 "c/book" => { 2936 "c/book" => {
2770 id => "infobox", 2937 id => "infobox",
2771 title => "Book", 2938 title => "Book",
2772 reply => undef, 2939 reply => undef,
2788 id => "infobox", 2955 id => "infobox",
2789 title => "Body Parts", 2956 title => "Body Parts",
2790 reply => undef, 2957 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2792 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2793 "c/skills" => { 2966 "c/skills" => {
2794 id => "infobox", 2967 id => "infobox",
2795 title => "Skills", 2968 title => "Skills",
2796 reply => undef, 2969 reply => undef,
2797 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",
2798 }, 2995 },
2799 "c/uptime" => { 2996 "c/uptime" => {
2800 id => "infobox", 2997 id => "infobox",
2801 title => "Uptime", 2998 title => "Uptime",
2802 reply => undef, 2999 reply => undef,
2812 id => "party", 3009 id => "party",
2813 title => "Party", 3010 title => "Party",
2814 reply => "gsay ", 3011 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2816 }, 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,
2817); 3022);
2818 3023
2819sub cf::client::send_msg { 3024sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3026
2826 3031
2827 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2830 3035
2831 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2835 3038
2836 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3044 }
2843 3045
2844 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2845 } 3047 }
2846 3048
2847 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2848 3050
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3051 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2853 3054
2854 my $pkt = "msg " 3055 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3058 );
2858 3059
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3061}
2896 3062
2897=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2898 3064
2899Sends an ext event to the client. 3065Sends an ext event to the client.
2902 3068
2903sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2905 3071
2906 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3077 }
2912} 3078}
2913 3079
2914=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2915 3081
2919 3085
2920sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2922 3088
2923 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3092 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3095 }
2930} 3096}
2931 3097
2932=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2933 3099
3034 3200
3035 $coro 3201 $coro
3036} 3202}
3037 3203
3038cf::client->attach ( 3204cf::client->attach (
3039 on_destroy => sub { 3205 on_client_destroy => sub {
3040 my ($ns) = @_; 3206 my ($ns) = @_;
3041 3207
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3209 },
3044); 3210);
3060our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3061 3227
3062$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3063 3229
3064$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3067 sort time 3233 sort time
3068)); 3234));
3069 3235
3070# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3075 3241
3076 cf::object 3242 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3079 3246
3080 cf::object::player 3247 cf::object::player
3081 player 3248 player
3082 3249
3083 cf::player 3250 cf::player
3089=cut 3256=cut
3090 3257
3091for ( 3258for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3098) { 3265) {
3099 no strict 'refs'; 3266 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3119 3286
3120 my $qcode = $code; 3287 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3123 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3124 local $_; 3294 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3295
3127 my $eval = 3296 my $eval =
3128 "do {\n" 3297 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3300 . $code
3132 . "\n}" 3301 . "\n}"
3133 ; 3302 ;
3134 3303
3304 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3313
3139 if ($@) { 3314 if ($@) {
3140 warn "$@"; 3315 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3161=cut 3336=cut
3162 3337
3163sub register_script_function { 3338sub register_script_function {
3164 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3165 3340
3166 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3168} 3343}
3169 3344
3170=back 3345=back
3171 3346
3172=cut 3347=cut
3193 3368
3194 $facedata->{version} == 2 3369 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3371
3197 # 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]);
3198 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3375 type => FT_RSRC,
3200 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),
3201 }; 3378 };
3202 cf::cede_to_tick; 3379 cf::cede_to_tick;
3203 3380
3204 { 3381 {
3205 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3386
3210 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3391
3215 cf::cede_to_tick; 3392 cf::cede_to_tick;
3216 } 3393 }
3217 3394
3218 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3242 3419
3243 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3244 } 3421 }
3245 3422
3246 { 3423 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3250 3425
3251 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3429
3256 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3271 } else { 3432 } else {
3272 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3273 } 3434 }
3274 3435
3275 cf::cede_to_tick; 3436 cf::cede_to_tick;
3276 } 3437 }
3277 } 3438 }
3278 3439
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3441
3281 1 3442 1
3282} 3443}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3444
3304register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3306 3447
3307 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3346sub reload_treasures { 3487sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3349} 3490}
3350 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
3351sub reload_resources { 3515sub reload_resources {
3352 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3353 3517
3354 reload_facedata; 3518 reload_facedata;
3519 reload_sound;
3355 reload_archetypes; 3520 reload_archetypes;
3356 reload_regions; 3521 reload_regions;
3357 reload_treasures; 3522 reload_treasures;
3358 3523
3359 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3360} 3525}
3361 3526
3362sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3531 or return;
3365 3532
3366 local $/; 3533 local $/;
3367 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3368 3535
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3537
3371 $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};
3372 $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};
3373 3540
3374 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3545 };
3379 warn $@ if $@; 3546 warn $@ if $@;
3380 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3381} 3550}
3382 3551
3383sub pidfile() { 3552sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3554 or die "$PIDFILE: $!";
3397 3566
3398 seek $fh, 0, 0; 3567 seek $fh, 0, 0;
3399 print $fh $$; 3568 print $fh $$;
3400} 3569}
3401 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
3402sub main { 3580sub main {
3403 cf::init_globals; # initialise logging 3581 cf::init_globals; # initialise logging
3404 3582
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 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.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3587
3416 $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
3417 3589
3418 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3425 }; 3597 };
3426 3598
3427 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3428 3600
3429 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
3430 reload_resources; 3610 reload_resources;
3431 reload_config; 3611 reload_config;
3432 db_init; 3612 db_init;
3433 3613
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3614 cf::init_uuid;
3437 cf::init_signals; 3615 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3616 cf::init_skills;
3440 3617
3441 cf::init_beforeplay; 3618 cf::init_beforeplay;
3442 3619
3443 atomic; 3620 atomic;
3445 load_extensions; 3622 load_extensions;
3446 3623
3447 utime time, time, $RUNTIMEFILE; 3624 utime time, time, $RUNTIMEFILE;
3448 3625
3449 # no (long-running) fork's whatsoever before this point(!) 3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3450 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};
3451 3629
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3630 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3631 };
3454 3632
3455 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;
3456} 3637}
3457 3638
3458############################################################################# 3639#############################################################################
3459# initialisation and cleanup 3640# initialisation and cleanup
3460 3641
3461# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3462BEGIN { 3643BEGIN {
3463 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3467 }; 3648 };
3468 } 3649 }
3469} 3650}
3470 3651
3471sub write_runtime_sync { 3652sub write_runtime_sync {
3653 my $t0 = AE::time;
3654
3472 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3474 3657
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3659
3477 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3478 3661
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3663 or return;
3481 3664
3482 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
3497 or return; 3680 or return;
3498 3681
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3683 and return;
3501 3684
3502 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3686
3504 1 3687 1
3505} 3688}
3506 3689
3507our $uuid_lock; 3690our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3699 my $uuid = "$LOCALDIR/uuid";
3517 3700
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3701 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3702 or return;
3520 3703
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3704 my $value = uuid_seq uuid_cur;
3705
3706 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n";
3708 return;
3709 }
3710
3711 my $value = uuid_str $value + $uuid_skip;
3522 $uuid_skip = 0; 3712 $uuid_skip = 0;
3523 3713
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3714 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3715 and return;
3526 3716
3548} 3738}
3549 3739
3550sub emergency_save() { 3740sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3552 3742
3553 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3554 3744
3555 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
3556 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3757 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3759 $pl->save;
3565 } 3760 }
3566 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3567 3762
3568 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3569 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 3766 $map->valid or next;
3572 $map->save; 3767 $map->save;
3573 } 3768 }
3574 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3575 3770
3576 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3579 3774
3580 warn "begin write uuid\n"; 3775 warn "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 3776 write_uuid_sync 1;
3582 warn "end write uuid\n"; 3777 warn "emergency_perl_save: end write uuid\n";
3583 }; 3778 };
3584 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
3585 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3586} 3786}
3587 3787
3588sub post_cleanup { 3788sub post_cleanup {
3589 my ($make_core) = @_; 3789 my ($make_core) = @_;
3590 3790
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) { 3817 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"}; 3818 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 } 3820 }
3621 warn "cleared package $pkg\n";#d#
3622} 3821}
3623 3822
3624sub do_reload_perl() { 3823sub do_reload_perl() {
3625 # can/must only be called in main 3824 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3627 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3628 return; 3827 return;
3629 } 3828 }
3630 3829
3631 return if $RELOAD++; 3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3632 3833
3633 while ($RELOAD) { 3834 while ($RELOAD) {
3634 warn "reloading..."; 3835 warn "reloading...";
3635 3836
3636 warn "entering sync_job"; 3837 warn "entering sync_job";
3697 clear_package "safe::$_" 3898 clear_package "safe::$_"
3698 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);
3699 3900
3700 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 3904
3704 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3705 # and global variables created in xs 3906 # and global variables created in xs
3706 #clear_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3707 3908
3708 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3709 3910
3710 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3711 require cf; 3912 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3713 3914
3714 warn "loading config and database again"; 3915 warn "loading config and database again";
3715 cf::reload_config; 3916 cf::reload_config;
3716 3917
3717 warn "loading extensions"; 3918 warn "loading extensions";
3718 cf::load_extensions; 3919 cf::load_extensions;
3719 3920
3921 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3723 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3726 3929
3727 warn "running post_load"; 3930 warn "running post_init jobs";
3728 (pop @POST_INIT)->(1) while @POST_INIT; 3931 (pop @POST_INIT)->(1) while @POST_INIT;
3729 3932
3730 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3731 3934
3732 1 3935 1
3736 }; 3939 };
3737 3940
3738 warn "reloaded"; 3941 warn "reloaded";
3739 --$RELOAD; 3942 --$RELOAD;
3740 } 3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3741}; 3947};
3742 3948
3743our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3744 3950
3745sub reload_perl() { 3951sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3748 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 3959 do_reload_perl;
3751 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3752 }; 3962 };
3753} 3963}
3754 3964
3755register_command "reload" => sub { 3965register_command "reload" => sub {
3756 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
3770 3980
3771our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3773 3983
3774sub wait_for_tick { 3984sub wait_for_tick {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3776 3986
3777 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3778 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait; 3989 $signal->wait;
3780} 3990}
3781 3991
3782sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3784 3994
3785 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 3997 $signal->wait;
3788} 3998}
3793 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3794 return; 4004 return;
3795 } 4005 }
3796 4006
3797 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#
3798 4010
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $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.;
3801 Coro::async_pool { 4013 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
3825} 4037}
3826 4038
3827{ 4039{
3828 # configure BDB 4040 # configure BDB
3829 4041
3830 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3833 4045
3834 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3916 } 4128 }
3917} 4129}
3918 4130
3919# load additional modules 4131# load additional modules
3920use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3921 4134
3922END { cf::emergency_save } 4135END { cf::emergency_save }
3923 4136
39241 41371
3925 4138

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines