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.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 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;
… …
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 = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 0;#d#
118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
… …
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
… …
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 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::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
… …
210returns 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
211per 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.
212 240
213=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
214 242
215This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 245that call.
218 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
219=back 253=back
220 254
221=cut 255=cut
222 256
223BEGIN { 257$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 258 my $msg = join "", @_;
226 259
227 $msg .= "\n" 260 $msg .= "\n"
228 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
229 262
230 $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;
231 264
232 LOG llevError, $msg; 265 LOG llevError, $msg;
233 }; 266};
234}
235 267
236$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
238 270
239 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 275 return;#d#
242 }#d# 276 }#d#
243 277
244 # kill coroutine otherwise 278 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 279 Coro::terminate
247}; 280};
248
249$SIG{__DIE__} = sub { }; #d#?
250 281
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 299)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 301}
271 302
272$EV::DIED = sub { 303$EV::DIED = sub {
273 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
274}; 305};
275 306
276############################################################################# 307#############################################################################
277 308
278=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
375} 406}
376 407
377=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
378 409
379Like 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
380get spread over timer. 411get spread over time.
381 412
382=cut 413=cut
383 414
384sub periodic($$) { 415sub periodic($$) {
385 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
402 433
403=cut 434=cut
404 435
405our @SLOT_QUEUE; 436our @SLOT_QUEUE;
406our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
407 439
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
411 443
412 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
413 446
414 while () { 447 while () {
415 next_job: 448 next_job:
449
416 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 451
418 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 456 $job->[2]->send;
422 Coro::cede; 457 Coro::cede;
423 goto next_job; 458 goto next_job;
424 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 461 }
426 } 462 }
427 463
428 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 467 $signal->wait;
432 } else { 468 } else {
469 $busy = 0;
433 Coro::schedule; 470 Coro::schedule;
434 } 471 }
435 } 472 }
436}; 473};
437 474
438sub get_slot($;$$) { 475sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
440 477
441 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
442 479
443 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
444 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
445 483
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
475 513
476sub sync_job(&) { 514sub sync_job(&) {
477 my ($job) = @_; 515 my ($job) = @_;
478 516
479 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 518 my $time = AE::time;
481 519
482 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
484 522
485 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
502 } else { 540 } else {
503 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
504 } 542 }
505 } 543 }
506 544
507 my $time = EV::time - $time; 545 my $time = AE::time - $time;
508 546
509 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
510 548
511 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
512 } else { 550 } else {
… …
556 reset_signals; 594 reset_signals;
557 &$cb 595 &$cb
558 }, @args; 596 }, @args;
559 597
560 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 )
561} 610}
562 611
563=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
564 613
565=cut 614=cut
… …
1146 1195
1147 sync_job { 1196 sync_job {
1148 if (length $$rdata) { 1197 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1152 1202
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 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 }
1157 aio_close $fh; 1210 aio_close $fh;
1158 1211
1159 if (@$objs) { 1212 if (@$objs) {
1160 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) {
1161 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1164 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 }
1165 aio_close $fh; 1221 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1223 }
1168 } else { 1224 } else {
1169 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
… …
1207 $av = $st->{objs}; 1263 $av = $st->{objs};
1208 } 1264 }
1209 1265
1210 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1213 1270
1214 ($data, $av) 1271 ($data, $av)
1215} 1272}
1216 1273
1217=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1276} 1333}
1277 1334
1278use File::Glob (); 1335use File::Glob ();
1279 1336
1280cf::player->attach ( 1337cf::player->attach (
1281 on_command => sub { 1338 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1283 1340
1284 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1285 or return; 1342 or return;
1286 1343
… …
1320 1377
1321# "readahead" all extensions 1378# "readahead" all extensions
1322sub cache_extensions { 1379sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1380 my $grp = IO::AIO::aio_group;
1324 1381
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1383 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1385 }
1329 }; 1386 };
1330 1387
… …
1365 . "\n};\n1"; 1422 . "\n};\n1";
1366 1423
1367 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1368 } 1425 }
1369 1426
1427 my $pass = 0;
1370 my %done; 1428 my %done;
1371 while (%todo) { 1429 while (%todo) {
1372 my $progress; 1430 my $progress;
1373 1431
1432 ++$pass;
1433
1434 ext:
1374 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1437 next ext
1377 unless exists $done{$_}; 1438 unless exists $done{$_};
1378 } 1439 }
1379 1440
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1442
1382 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1447
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1449 if exists $v->{meta}{mandatory};
1390 1450
1391 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;
1392 } 1460 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1461 }
1398 1462
1399 skip: 1463 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1471 }
1403 }; 1472 };
1404} 1473}
1405 1474
1406############################################################################# 1475#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1491 } 1560 }
1492 } 1561 }
1493} 1562}
1494 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
1495sub save($) { 1577sub save($) {
1496 my ($pl) = @_; 1578 my ($pl) = @_;
1497 1579
1498 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1499 1581
… …
1504 1586
1505 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1507 1589
1508 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];
1509 1594
1510 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1596 cf::cede_to_tick;
1512} 1597}
1513 1598
… …
1615 \@logins 1700 \@logins
1616} 1701}
1617 1702
1618=item $player->maps 1703=item $player->maps
1619 1704
1705=item cf::player::maps $login
1706
1620Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1621player. May block. 1708player. May block.
1622 1709
1623=cut 1710=cut
1624 1711
… …
1686=cut 1773=cut
1687 1774
1688sub find_by_path($) { 1775sub find_by_path($) {
1689 my ($path) = @_; 1776 my ($path) = @_;
1690 1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1779
1691 my ($match, $specificity); 1780 my ($match, $specificity);
1692 1781
1693 for my $region (list) { 1782 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1784 ($match, $specificity) = ($region, $region->specificity)
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1816
1728 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1818 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1758 1847
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1849}
1761 1850
1762# also paths starting with '/' 1851# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1853
1765sub thawer_merge { 1854sub thawer_merge {
1766 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1767 1856
1768 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
… …
1982 2071
1983 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1984 } 2073 }
1985} 2074}
1986 2075
1987sub pre_load { } 2076sub pre_load { }
1988sub post_load { } 2077#sub post_load { } # XS
1989 2078
1990sub load { 2079sub load {
1991 my ($self) = @_; 2080 my ($self) = @_;
1992 2081
1993 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2139 }
2051 2140
2052 $self->post_load; 2141 $self->post_load;
2053} 2142}
2054 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2055sub customise_for { 2147sub customise_for {
2056 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2057 2149
2058 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2151 if $self->per_player;
… …
2075 or next; 2167 or next;
2076 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2077 or next; 2169 or next;
2078 $neigh->load; 2170 $neigh->load;
2079 2171
2172 # now find the diagonal neighbours
2080 push @neigh, 2173 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2176 }
2084 2177
… …
2136 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2137 2230
2138 () 2231 ()
2139} 2232}
2140 2233
2234# common code, used by both ->save and ->swapout
2141sub save { 2235sub _save {
2142 my ($self) = @_; 2236 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2237
2146 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2147 2239
2148 return unless $self->dirty; 2240 return unless $self->dirty;
2149 2241
… …
2169 } else { 2261 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2263 }
2172} 2264}
2173 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2174sub swap_out { 2274sub swap_out {
2175 my ($self) = @_; 2275 my ($self) = @_;
2176 2276
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2278
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2185 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2187 2333
2188 $self->deactivate; 2334 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2336 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2337
2236 $self->unlink_save; 2338 $self->unlink_save;
2237 $self->destroy; 2339 $self->destroy;
2238} 2340}
2239 2341
… …
2247 2349
2248 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2249 2351
2250 $self->unlink_save; 2352 $self->unlink_save;
2251 2353
2252 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2359
… …
2314 : normalise $_ 2416 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2418 ]
2317} 2419}
2318 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2319=back 2453=back
2320 2454
2321=head3 cf::object 2455=head3 cf::object
2322 2456
2323=cut 2457=cut
… …
2455 2589
2456Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2457 2591
2458The player should be reasonably safe there for short amounts of time (e.g. 2592The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2594though, as the player cannot control the character while it is on the link
2461map. 2595map.
2462 2596
2463Will never block. 2597Will never block.
2464 2598
2465=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
… …
2486sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2487 my ($self) = @_; 2621 my ($self) = @_;
2488 2622
2489 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2490 2624
2625 ++$self->{_link_recursion};
2626
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2628
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2495 2631
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2633}
2498 2634
2499sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2501 2637
… …
2518 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2520 2656
2521 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2524 2660
2525 $map->load; 2661 $map->load;
2526 $map->load_neighbours; 2662 $map->load_neighbours;
2527 2663
2528 return unless $self->contr->active; 2664 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2665
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2534} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2535 2673
2674}
2675
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2677
2538Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
… …
2548 2688
2549our $GOTOGEN; 2689our $GOTOGEN;
2550 2690
2551sub cf::object::player::goto { 2691sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2553 2699
2554 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2702
2557 $self->enter_link; 2703 $self->enter_link;
… …
2581 my $map = eval { 2727 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2583 2729
2584 if ($map) { 2730 if ($map) {
2585 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2733 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2735 }
2590 2736
2591 $map 2737 $map
… …
2599 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2602 } 2748 }
2603 2749
2604 $done->() if $done; 2750 $done->($self) if $done;
2605 })->prio (1); 2751 })->prio (1);
2606} 2752}
2607 2753
2608=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2609 2755
… …
2726 2872
2727 utf8::encode $text; 2873 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2875}
2730 2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2900}
2901
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2903
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
2734client if neccessary. C<$type> should be a string identifying the type of 2905client if neccessary. C<$type> should be a string identifying the type of
2735the message, with C<log> being the default. If C<$color> is negative, suppress 2906the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2737 2908
2738=cut 2909=cut
2739 2910
2740# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2742 "c/identify" => { 2919 "c/identify" => {
2743 id => "infobox", 2920 id => "infobox",
2744 title => "Identify", 2921 title => "Identify",
2745 reply => undef, 2922 reply => undef,
2746 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2925 "c/examine" => {
2749 id => "infobox", 2926 id => "infobox",
2750 title => "Examine", 2927 title => "Examine",
2751 reply => undef, 2928 reply => undef,
2752 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2936 },
2754 "c/book" => { 2937 "c/book" => {
2755 id => "infobox", 2938 id => "infobox",
2756 title => "Book", 2939 title => "Book",
2757 reply => undef, 2940 reply => undef,
… …
2785 id => "infobox", 2968 id => "infobox",
2786 title => "Skills", 2969 title => "Skills",
2787 reply => undef, 2970 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2971 tooltip => "Shows your experience per skill and item power",
2789 }, 2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2790 "c/resistances" => { 2979 "c/resistances" => {
2791 id => "infobox", 2980 id => "infobox",
2792 title => "Resistances", 2981 title => "Resistances",
2793 reply => undef, 2982 reply => undef,
2794 tooltip => "Shows your resistances", 2983 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2985 "c/pets" => {
2797 id => "infobox", 2986 id => "infobox",
2798 title => "Pets", 2987 title => "Pets",
2799 reply => undef, 2988 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2996 },
2802 "c/uptime" => { 2997 "c/uptime" => {
2803 id => "infobox", 2998 id => "infobox",
2804 title => "Uptime", 2999 title => "Uptime",
2805 reply => undef, 3000 reply => undef,
… …
2861 my $pkt = "msg " 3056 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3059 );
2865 3060
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3061 $self->send_big_packet ($pkt);
2877} 3062}
2878 3063
2879=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2880 3065
2881Sends an ext event to the client. 3066Sends an ext event to the client.
… …
2884 3069
2885sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2887 3072
2888 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3078 }
2894} 3079}
2895 3080
2896=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2897 3082
… …
2901 3086
2902sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2904 3089
2905 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3093 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3096 }
2912} 3097}
2913 3098
2914=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2915 3100
… …
3016 3201
3017 $coro 3202 $coro
3018} 3203}
3019 3204
3020cf::client->attach ( 3205cf::client->attach (
3021 on_destroy => sub { 3206 on_client_destroy => sub {
3022 my ($ns) = @_; 3207 my ($ns) = @_;
3023 3208
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3210 },
3026); 3211);
… …
3042our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3043 3228
3044$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3045 3230
3046$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3049 sort time 3234 sort time
3050)); 3235));
3051 3236
3052# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
… …
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3106 3291
3107 %vars = (_dummy => 0) unless %vars; 3292 %vars = (_dummy => 0) unless %vars;
3108 3293
3294 my @res;
3109 local $_; 3295 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3296
3112 my $eval = 3297 my $eval =
3113 "do {\n" 3298 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3301 . $code
3117 . "\n}" 3302 . "\n}"
3118 ; 3303 ;
3119 3304
3305 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3123 3314
3124 if ($@) { 3315 if ($@) {
3125 warn "$@"; 3316 warn "$@";
3126 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
… …
3146=cut 3337=cut
3147 3338
3148sub register_script_function { 3339sub register_script_function {
3149 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3150 3341
3151 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3153} 3344}
3154 3345
3155=back 3346=back
3156 3347
3157=cut 3348=cut
… …
3178 3369
3179 $facedata->{version} == 2 3370 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3372
3182 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3376 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3379 };
3187 cf::cede_to_tick; 3380 cf::cede_to_tick;
3188 3381
3189 { 3382 {
3190 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
… …
3192 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3387
3195 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3392
3200 cf::cede_to_tick; 3393 cf::cede_to_tick;
3201 } 3394 }
3202 3395
3203 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
… …
3227 3420
3228 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3229 } 3422 }
3230 3423
3231 { 3424 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3235 3426
3236 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3430
3241 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3256 } else { 3433 } else {
3257 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3258 } 3435 }
3259 3436
… …
3343 3520
3344 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3345} 3522}
3346 3523
3347sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3528 or return;
3350 3529
3351 local $/; 3530 local $/;
3352 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3353 3532
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3534
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3537
3359 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3542 };
3364 warn $@ if $@; 3543 warn $@ if $@;
3365 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3366} 3547}
3367 3548
3368sub pidfile() { 3549sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3551 or die "$PIDFILE: $!";
… …
3382 3563
3383 seek $fh, 0, 0; 3564 seek $fh, 0, 0;
3384 print $fh $$; 3565 print $fh $$;
3385} 3566}
3386 3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3575}
3576
3387sub main { 3577sub main {
3388 cf::init_globals; # initialise logging 3578 cf::init_globals; # initialise logging
3389 3579
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3584
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3586
3402 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
… …
3409 }; 3594 };
3410 3595
3411 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3412 3597
3413 cf::sync_job { 3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3414 reload_resources; 3607 reload_resources;
3415 reload_config; 3608 reload_config;
3416 db_init; 3609 db_init;
3417 3610
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3611 cf::init_uuid;
3421 cf::init_signals; 3612 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3613 cf::init_skills;
3424 3614
3425 cf::init_beforeplay; 3615 cf::init_beforeplay;
3426 3616
3427 atomic; 3617 atomic;
… …
3429 load_extensions; 3619 load_extensions;
3430 3620
3431 utime time, time, $RUNTIMEFILE; 3621 utime time, time, $RUNTIMEFILE;
3432 3622
3433 # no (long-running) fork's whatsoever before this point(!) 3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3626
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3627 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3628 };
3438 3629
3439 EV::loop; 3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3440} 3634}
3441 3635
3442############################################################################# 3636#############################################################################
3443# initialisation and cleanup 3637# initialisation and cleanup
3444 3638
3445# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3446BEGIN { 3640BEGIN {
3447 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3451 }; 3645 };
3452 } 3646 }
3453} 3647}
3454 3648
3455sub write_runtime_sync { 3649sub write_runtime_sync {
3650 my $t0 = AE::time;
3651
3456 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3458 3654
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3656
3461 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3462 3658
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3660 or return;
3465 3661
3466 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
… …
3481 or return; 3677 or return;
3482 3678
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3680 and return;
3485 3681
3486 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3683
3488 1 3684 1
3489} 3685}
3490 3686
3491our $uuid_lock; 3687our $uuid_lock;
… …
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3817 }
3622 warn "cleared package $pkg\n";#d#
3623} 3818}
3624 3819
3625sub do_reload_perl() { 3820sub do_reload_perl() {
3626 # can/must only be called in main 3821 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3628 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3629 return; 3824 return;
3630 } 3825 }
3631 3826
3632 return if $RELOAD++; 3827 return if $RELOAD++;
3633 3828
3634 my $t1 = EV::time; 3829 my $t1 = AE::time;
3635 3830
3636 while ($RELOAD) { 3831 while ($RELOAD) {
3637 warn "reloading..."; 3832 warn "reloading...";
3638 3833
3639 warn "entering sync_job"; 3834 warn "entering sync_job";
… …
3710 3905
3711 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3712 3907
3713 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3714 require cf; 3909 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3716 3911
3717 warn "loading config and database again"; 3912 warn "loading config and database again";
3718 cf::reload_config; 3913 cf::reload_config;
3719 3914
3720 warn "loading extensions"; 3915 warn "loading extensions";
… …
3742 3937
3743 warn "reloaded"; 3938 warn "reloaded";
3744 --$RELOAD; 3939 --$RELOAD;
3745 } 3940 }
3746 3941
3747 $t1 = EV::time - $t1; 3942 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3943 warn "reload completed in ${t1}s\n";
3749}; 3944};
3750 3945
3751our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3752 3947
… …
3755 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3756 3951
3757 $RELOAD_WATCHER ||= cf::async { 3952 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3953 Coro::AIO::aio_wait cache_extensions;
3759 3954
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3956 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3763 }; 3958 };
3764 }; 3959 };
3765} 3960}
… …
3782 3977
3783our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3785 3980
3786sub wait_for_tick { 3981sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 3983
3789 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 3986 $signal->wait;
3792} 3987}
3793 3988
3794sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 3991
3797 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 3994 $signal->wait;
3800} 3995}
… …
3805 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3806 return; 4001 return;
3807 } 4002 }
3808 4003
3809 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3810 4007
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4010 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
… …
3837} 4034}
3838 4035
3839{ 4036{
3840 # configure BDB 4037 # configure BDB
3841 4038
3842 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3845 4042
3846 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
… …
3928 } 4125 }
3929} 4126}
3930 4127
3931# load additional modules 4128# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3933 4131
3934END { cf::emergency_save } 4132END { cf::emergency_save }
3935 4133
39361 41341
3937 4135

Diff Legend

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