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.461 by root, Fri Dec 19 22:47:29 2008 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$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
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::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" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
117our %CFG; 128our %CFG;
118 129
119our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 131our $RUNTIME;
121our $NOW; 132our $NOW;
… …
132our $JITTER; # average jitter 143our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
134 145
135our @POST_INIT; 146our @POST_INIT;
136 147
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
138 150
139binmode STDOUT; 151binmode STDOUT;
140binmode STDERR; 152binmode STDERR;
141 153
142# read virtual server time, if available 154# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
147} 159}
148 160
161eval "sub TICK() { $TICK } 1" or die;
162
149mkdir $_ 163mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 165
152our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
153 167
154sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 184
156############################################################################# 185#############################################################################
157 186
158=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
159 188
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 237
209=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
210 239
211This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 242that call.
214 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
215=back 250=back
216 251
217=cut 252=cut
218 253
219BEGIN { 254$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 255 my $msg = join "", @_;
222 256
223 $msg .= "\n" 257 $msg .= "\n"
224 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
225 259
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 261
228 LOG llevError, $msg; 262 LOG llevError, $msg;
229 }; 263};
230}
231 264
232$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
234 267
235 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 272 return;#d#
238 }#d# 273 }#d#
239 274
240 # kill coroutine otherwise 275 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 276 Coro::terminate
243}; 277};
244
245$SIG{__DIE__} = sub { }; #d#?
246 278
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 296)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 298}
267 299
268$EV::DIED = sub { 300$EV::DIED = sub {
269 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
270}; 302};
271 303
272############################################################################# 304#############################################################################
273 305
274=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
371} 403}
372 404
373=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
374 406
375Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 408get spread over time.
377 409
378=cut 410=cut
379 411
380sub periodic($$) { 412sub periodic($$) {
381 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
398 430
399=cut 431=cut
400 432
401our @SLOT_QUEUE; 433our @SLOT_QUEUE;
402our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
403 436
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
407 440
408 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
409 443
410 while () { 444 while () {
411 next_job: 445 next_job:
446
412 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 448
414 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 453 $job->[2]->send;
418 Coro::cede; 454 Coro::cede;
419 goto next_job; 455 goto next_job;
420 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 458 }
422 } 459 }
423 460
424 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 464 $signal->wait;
428 } else { 465 } else {
466 $busy = 0;
429 Coro::schedule; 467 Coro::schedule;
430 } 468 }
431 } 469 }
432}; 470};
433 471
434sub get_slot($;$$) { 472sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
436 474
437 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
438 476
439 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
440 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
441 480
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
471 510
472sub sync_job(&) { 511sub sync_job(&) {
473 my ($job) = @_; 512 my ($job) = @_;
474 513
475 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 515 my $time = AE::time;
477 516
478 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
480 519
481 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
498 } else { 537 } else {
499 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
500 } 539 }
501 } 540 }
502 541
503 my $time = EV::time - $time; 542 my $time = AE::time - $time;
504 543
505 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
506 545
507 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
508 } else { 547 } else {
… …
552 reset_signals; 591 reset_signals;
553 &$cb 592 &$cb
554 }, @args; 593 }, @args;
555 594
556 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
557} 607}
558 608
559=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
560 610
561=cut 611=cut
… …
1147 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1148 1198
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1153 aio_close $fh; 1206 aio_close $fh;
1154 1207
1155 if (@$objs) { 1208 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1161 aio_close $fh; 1217 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1219 }
1164 } else { 1220 } else {
1165 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
… …
1272} 1328}
1273 1329
1274use File::Glob (); 1330use File::Glob ();
1275 1331
1276cf::player->attach ( 1332cf::player->attach (
1277 on_command => sub { 1333 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1279 1335
1280 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1281 or return; 1337 or return;
1282 1338
… …
1316 1372
1317# "readahead" all extensions 1373# "readahead" all extensions
1318sub cache_extensions { 1374sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1375 my $grp = IO::AIO::aio_group;
1320 1376
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1378 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1380 }
1325 }; 1381 };
1326 1382
… …
1361 . "\n};\n1"; 1417 . "\n};\n1";
1362 1418
1363 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1364 } 1420 }
1365 1421
1422 my $pass = 0;
1366 my %done; 1423 my %done;
1367 while (%todo) { 1424 while (%todo) {
1368 my $progress; 1425 my $progress;
1369 1426
1427 ++$pass;
1428
1429 ext:
1370 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1432 next ext
1373 unless exists $done{$_}; 1433 unless exists $done{$_};
1374 } 1434 }
1375 1435
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1437
1378 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1442
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1444 if exists $v->{meta}{mandatory};
1386 1445
1387 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1388 } 1455 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1456 }
1394 1457
1395 skip: 1458 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1398 } 1466 }
1399 }; 1467 };
1400} 1468}
1401 1469
1402############################################################################# 1470#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1487 } 1555 }
1488 } 1556 }
1489} 1557}
1490 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1491sub save($) { 1572sub save($) {
1492 my ($pl) = @_; 1573 my ($pl) = @_;
1493 1574
1494 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1495 1576
… …
1500 1581
1501 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1503 1584
1504 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1589
1506 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1591 cf::cede_to_tick;
1508} 1592}
1509 1593
… …
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1807
1724 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1809 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1862 1946
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1865} 1949}
1866 1950
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 1951sub decay_objects {
1877 my ($self) = @_; 1952 my ($self) = @_;
1878 1953
1879 return if $self->{deny_reset}; 1954 return if $self->{deny_reset};
1880 1955
… …
1987 2062
1988 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
1989 } 2064 }
1990} 2065}
1991 2066
1992sub pre_load { } 2067sub pre_load { }
1993sub post_load { } 2068#sub post_load { } # XS
1994 2069
1995sub load { 2070sub load {
1996 my ($self) = @_; 2071 my ($self) = @_;
1997 2072
1998 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
… …
2043 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2119 $self->decay_objects;
2045 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2046 $self->update_buttons; 2121 $self->update_buttons;
2047 cf::cede_to_tick; 2122 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2123 $self->activate;
2051 } 2124 }
2052 2125
2053 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
… …
2057 } 2130 }
2058 2131
2059 $self->post_load; 2132 $self->post_load;
2060} 2133}
2061 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2062sub customise_for { 2138sub customise_for {
2063 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2064 2140
2065 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2142 if $self->per_player;
… …
2143 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2144 2220
2145 () 2221 ()
2146} 2222}
2147 2223
2224# common code, used by both ->save and ->swapout
2148sub save { 2225sub _save {
2149 my ($self) = @_; 2226 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2227
2153 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2154 2229
2155 return unless $self->dirty; 2230 return unless $self->dirty;
2156 2231
… …
2176 } else { 2251 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2253 }
2179} 2254}
2180 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2181sub swap_out { 2264sub swap_out {
2182 my ($self) = @_; 2265 my ($self) = @_;
2183 2266
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2268
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2192 2272
2193 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2194
2195 $self->deactivate; 2274 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2197 $self->clear; 2282 $self->clear;
2198} 2283}
2199 2284
2200sub reset_at { 2285sub reset_at {
2201 my ($self) = @_; 2286 my ($self) = @_;
… …
2220 2305
2221 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222 2307
2223 return if $self->players; 2308 return if $self->players;
2224 2309
2225 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2226 2311
2227 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2228 2313
2229 # need to save uniques path 2314 # need to save uniques path
2230 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
… …
2321 : normalise $_ 2406 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2408 ]
2324} 2409}
2325 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2326=back 2443=back
2327 2444
2328=head3 cf::object 2445=head3 cf::object
2329 2446
2330=cut 2447=cut
… …
2395 2512
2396our $SAY_CHANNEL = { 2513our $SAY_CHANNEL = {
2397 id => "say", 2514 id => "say",
2398 title => "Map", 2515 title => "Map",
2399 reply => "say ", 2516 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2518};
2402 2519
2403our $CHAT_CHANNEL = { 2520our $CHAT_CHANNEL = {
2404 id => "chat", 2521 id => "chat",
2405 title => "Chat", 2522 title => "Chat",
… …
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2616
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2502 2619
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2621}
2505 2622
2506sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2508 2625
… …
2525 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2527 2644
2528 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2531 2648
2532 $map->load; 2649 $map->load;
2533 $map->load_neighbours; 2650 $map->load_neighbours;
2534 2651
2535 return unless $self->contr->active; 2652 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2653
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2541} 2659}
2542 2660
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2544 2662
2545Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
… …
2733 2851
2734 utf8::encode $text; 2852 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2736} 2854}
2737 2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2879}
2880
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 2882
2740Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2741client if neccessary. C<$type> should be a string identifying the type of 2884client if neccessary. C<$type> should be a string identifying the type of
2742the message, with C<log> being the default. If C<$color> is negative, suppress 2885the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2744 2887
2745=cut 2888=cut
2746 2889
2747# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2749 "c/identify" => { 2898 "c/identify" => {
2750 id => "infobox", 2899 id => "infobox",
2751 title => "Identify", 2900 title => "Identify",
2752 reply => undef, 2901 reply => undef,
2753 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
… …
2755 "c/examine" => { 2904 "c/examine" => {
2756 id => "infobox", 2905 id => "infobox",
2757 title => "Examine", 2906 title => "Examine",
2758 reply => undef, 2907 reply => undef,
2759 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 2915 },
2761 "c/book" => { 2916 "c/book" => {
2762 id => "infobox", 2917 id => "infobox",
2763 title => "Book", 2918 title => "Book",
2764 reply => undef, 2919 reply => undef,
… …
2780 id => "infobox", 2935 id => "infobox",
2781 title => "Body Parts", 2936 title => "Body Parts",
2782 reply => undef, 2937 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2784 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2785 "c/skills" => { 2946 "c/skills" => {
2786 id => "infobox", 2947 id => "infobox",
2787 title => "Skills", 2948 title => "Skills",
2788 reply => undef, 2949 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2790 }, 2975 },
2791 "c/uptime" => { 2976 "c/uptime" => {
2792 id => "infobox", 2977 id => "infobox",
2793 title => "Uptime", 2978 title => "Uptime",
2794 reply => undef, 2979 reply => undef,
… …
2804 id => "party", 2989 id => "party",
2805 title => "Party", 2990 title => "Party",
2806 reply => "gsay ", 2991 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 2992 tooltip => "Messages and chat related to your party",
2808 }, 2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2809); 3002);
2810 3003
2811sub cf::client::send_msg { 3004sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3006
… …
2818 3011
2819 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2822 3015
2823 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2827 3018
2828 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3024 }
2835 3025
2836 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2837 } 3027 }
2838 3028
2839 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2840 3030
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3031 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2845 3034
2846 my $pkt = "msg " 3035 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3036 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3038 );
2850 3039
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3040 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3041}
2888 3042
2889=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2890 3044
2891Sends an ext event to the client. 3045Sends an ext event to the client.
… …
2894 3048
2895sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2897 3051
2898 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3057 }
2904} 3058}
2905 3059
2906=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2907 3061
… …
2911 3065
2912sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2914 3068
2915 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3072 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3075 }
2922} 3076}
2923 3077
2924=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2925 3079
… …
3026 3180
3027 $coro 3181 $coro
3028} 3182}
3029 3183
3030cf::client->attach ( 3184cf::client->attach (
3031 on_destroy => sub { 3185 on_client_destroy => sub {
3032 my ($ns) = @_; 3186 my ($ns) = @_;
3033 3187
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3189 },
3036); 3190);
… …
3052our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3053 3207
3054$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3055 3209
3056$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3059 sort time 3213 sort time
3060)); 3214));
3061 3215
3062# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
… …
3066The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3067 3221
3068 cf::object 3222 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3224 insert remove name archname title slaying race decrease split
3225 value
3071 3226
3072 cf::object::player 3227 cf::object::player
3073 player 3228 player
3074 3229
3075 cf::player 3230 cf::player
… …
3081=cut 3236=cut
3082 3237
3083for ( 3238for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3240 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3090) { 3245) {
3091 no strict 'refs'; 3246 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3111 3266
3112 my $qcode = $code; 3267 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3115 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3116 local $_; 3274 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3275
3119 my $eval = 3276 my $eval =
3120 "do {\n" 3277 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3280 . $code
3124 . "\n}" 3281 . "\n}"
3125 ; 3282 ;
3126 3283
3284 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3130 3293
3131 if ($@) { 3294 if ($@) {
3132 warn "$@"; 3295 warn "$@";
3133 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
… …
3153=cut 3316=cut
3154 3317
3155sub register_script_function { 3318sub register_script_function {
3156 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3157 3320
3158 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3160} 3323}
3161 3324
3162=back 3325=back
3163 3326
3164=cut 3327=cut
… …
3185 3348
3186 $facedata->{version} == 2 3349 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3351
3189 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3355 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3358 };
3194 cf::cede_to_tick; 3359 cf::cede_to_tick;
3195 3360
3196 { 3361 {
3197 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
… …
3199 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3366
3202 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3206 3371
3207 cf::cede_to_tick; 3372 cf::cede_to_tick;
3208 } 3373 }
3209 3374
3210 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
… …
3234 3399
3235 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3236 } 3401 }
3237 3402
3238 { 3403 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3242 3405
3243 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3409
3248 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3263 } else { 3412 } else {
3264 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3265 } 3414 }
3266 3415
… …
3350 3499
3351 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3352} 3501}
3353 3502
3354sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3507 or return;
3357 3508
3358 local $/; 3509 local $/;
3359 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3360 3511
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3513
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3521 };
3371 warn $@ if $@; 3522 warn $@ if $@;
3372 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3373} 3526}
3374 3527
3375sub pidfile() { 3528sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3530 or die "$PIDFILE: $!";
… …
3389 3542
3390 seek $fh, 0, 0; 3543 seek $fh, 0, 0;
3391 print $fh $$; 3544 print $fh $$;
3392} 3545}
3393 3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3554}
3555
3394sub main { 3556sub main {
3395 cf::init_globals; # initialise logging 3557 cf::init_globals; # initialise logging
3396 3558
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 3563
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3408 3565
3409 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3410 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
… …
3416 }; 3573 };
3417 3574
3418 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3419 3576
3420 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3421 reload_resources; 3586 reload_resources;
3422 reload_config; 3587 reload_config;
3423 db_init; 3588 db_init;
3424 3589
3425 cf::load_settings;
3426 cf::load_materials;
3427 cf::init_uuid; 3590 cf::init_uuid;
3428 cf::init_signals; 3591 cf::init_signals;
3429 cf::init_commands;
3430 cf::init_skills; 3592 cf::init_skills;
3431 3593
3432 cf::init_beforeplay; 3594 cf::init_beforeplay;
3433 3595
3434 atomic; 3596 atomic;
… …
3436 load_extensions; 3598 load_extensions;
3437 3599
3438 utime time, time, $RUNTIMEFILE; 3600 utime time, time, $RUNTIMEFILE;
3439 3601
3440 # no (long-running) fork's whatsoever before this point(!) 3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3441 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3442 3605
3443 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3444 }; 3607 };
3445 3608
3446 EV::loop; 3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3447} 3613}
3448 3614
3449############################################################################# 3615#############################################################################
3450# initialisation and cleanup 3616# initialisation and cleanup
3451 3617
3452# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3453BEGIN { 3619BEGIN {
3454 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3458 }; 3624 };
3459 } 3625 }
3460} 3626}
3461 3627
3462sub write_runtime_sync { 3628sub write_runtime_sync {
3629 my $t0 = AE::time;
3630
3463 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3464 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3465 3633
3466 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3467 3635
3468 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3469 3637
3470 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3471 or return; 3639 or return;
3472 3640
3473 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3474 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3475 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
… …
3488 or return; 3656 or return;
3489 3657
3490 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3491 and return; 3659 and return;
3492 3660
3493 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3494 3662
3495 1 3663 1
3496} 3664}
3497 3665
3498our $uuid_lock; 3666our $uuid_lock;
… …
3624 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3625 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3626 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3627# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3628 } 3796 }
3629 warn "cleared package $pkg\n";#d#
3630} 3797}
3631 3798
3632sub do_reload_perl() { 3799sub do_reload_perl() {
3633 # can/must only be called in main 3800 # can/must only be called in main
3634 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3635 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3636 return; 3803 return;
3637 } 3804 }
3638 3805
3639 return if $RELOAD++; 3806 return if $RELOAD++;
3640 3807
3641 my $t1 = EV::time; 3808 my $t1 = AE::time;
3642 3809
3643 while ($RELOAD) { 3810 while ($RELOAD) {
3644 warn "reloading..."; 3811 warn "reloading...";
3645 3812
3646 warn "entering sync_job"; 3813 warn "entering sync_job";
… …
3707 clear_package "safe::$_" 3874 clear_package "safe::$_"
3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3709 3876
3710 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3711 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3712 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3713 3880
3714 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3715 # and global variables created in xs 3882 # and global variables created in xs
3716 #clear_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3717 3884
3718 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3719 3886
3720 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3721 require cf; 3888 require cf;
3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3723 3890
3724 warn "loading config and database again"; 3891 warn "loading config and database again";
3725 cf::reload_config; 3892 cf::reload_config;
3726 3893
3727 warn "loading extensions"; 3894 warn "loading extensions";
… …
3749 3916
3750 warn "reloaded"; 3917 warn "reloaded";
3751 --$RELOAD; 3918 --$RELOAD;
3752 } 3919 }
3753 3920
3754 $t1 = EV::time - $t1; 3921 $t1 = AE::time - $t1;
3755 warn "reload completed in ${t1}s\n"; 3922 warn "reload completed in ${t1}s\n";
3756}; 3923};
3757 3924
3758our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3759 3926
… …
3762 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3763 3930
3764 $RELOAD_WATCHER ||= cf::async { 3931 $RELOAD_WATCHER ||= cf::async {
3765 Coro::AIO::aio_wait cache_extensions; 3932 Coro::AIO::aio_wait cache_extensions;
3766 3933
3767 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3768 do_reload_perl; 3935 do_reload_perl;
3769 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3770 }; 3937 };
3771 }; 3938 };
3772} 3939}
… …
3789 3956
3790our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3791our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3792 3959
3793sub wait_for_tick { 3960sub wait_for_tick {
3794 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3795 3962
3796 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3797 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3798 $signal->wait; 3965 $signal->wait;
3799} 3966}
3800 3967
3801sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3802 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3803 3970
3804 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3805 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3806 $signal->wait; 3973 $signal->wait;
3807} 3974}
… …
3812 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3813 return; 3980 return;
3814 } 3981 }
3815 3982
3816 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3817 3986
3818 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3819 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3820 Coro::async_pool { 3989 Coro::async_pool {
3821 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
… …
3844} 4013}
3845 4014
3846{ 4015{
3847 # configure BDB 4016 # configure BDB
3848 4017
3849 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3850 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3851 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3852 4021
3853 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3854 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
… …
3934 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3935 } 4104 }
3936} 4105}
3937 4106
3938# load additional modules 4107# load additional modules
3939use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3940 4110
3941END { cf::emergency_save } 4111END { cf::emergency_save }
3942 4112
39431 41131
3944 4114

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines