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.530 by root, Wed Apr 28 21:05:33 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";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 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
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1636
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1638 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1558 1642
1559 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1615 \@logins 1699 \@logins
1616} 1700}
1617 1701
1618=item $player->maps 1702=item $player->maps
1619 1703
1704=item cf::player::maps $login
1705
1620Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1621player. May block. 1707player. May block.
1622 1708
1623=cut 1709=cut
1624 1710
1686=cut 1772=cut
1687 1773
1688sub find_by_path($) { 1774sub find_by_path($) {
1689 my ($path) = @_; 1775 my ($path) = @_;
1690 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1691 my ($match, $specificity); 1779 my ($match, $specificity);
1692 1780
1693 for my $region (list) { 1781 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1815
1728 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1817 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1846
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1848}
1761 1849
1762# also paths starting with '/' 1850# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1852
1765sub thawer_merge { 1853sub thawer_merge {
1766 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1767 1855
1768 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1982 2070
1983 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1984 } 2072 }
1985} 2073}
1986 2074
1987sub pre_load { } 2075sub pre_load { }
1988sub post_load { } 2076#sub post_load { } # XS
1989 2077
1990sub load { 2078sub load {
1991 my ($self) = @_; 2079 my ($self) = @_;
1992 2080
1993 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2138 }
2051 2139
2052 $self->post_load; 2140 $self->post_load;
2053} 2141}
2054 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2055sub customise_for { 2146sub customise_for {
2056 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2057 2148
2058 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2150 if $self->per_player;
2075 or next; 2166 or next;
2076 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2077 or next; 2168 or next;
2078 $neigh->load; 2169 $neigh->load;
2079 2170
2171 # now find the diagonal neighbours
2080 push @neigh, 2172 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2175 }
2084 2176
2136 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2137 2229
2138 () 2230 ()
2139} 2231}
2140 2232
2233# common code, used by both ->save and ->swapout
2141sub save { 2234sub _save {
2142 my ($self) = @_; 2235 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2236
2146 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2147 2238
2148 return unless $self->dirty; 2239 return unless $self->dirty;
2149 2240
2169 } else { 2260 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2262 }
2172} 2263}
2173 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2174sub swap_out { 2273sub swap_out {
2175 my ($self) = @_; 2274 my ($self) = @_;
2176 2275
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2277
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2185 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2187 2332
2188 $self->deactivate; 2333 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2335 $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 2336
2236 $self->unlink_save; 2337 $self->unlink_save;
2237 $self->destroy; 2338 $self->destroy;
2238} 2339}
2239 2340
2247 2348
2248 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2249 2350
2250 $self->unlink_save; 2351 $self->unlink_save;
2251 2352
2252 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2358
2314 : normalise $_ 2415 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2417 ]
2317} 2418}
2318 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2319=back 2452=back
2320 2453
2321=head3 cf::object 2454=head3 cf::object
2322 2455
2323=cut 2456=cut
2455 2588
2456Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2457 2590
2458The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2461map. 2594map.
2462 2595
2463Will never block. 2596Will never block.
2464 2597
2465=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2487 my ($self) = @_; 2620 my ($self) = @_;
2488 2621
2489 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2490 2623
2624 ++$self->{_link_recursion};
2625
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2627
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2495 2630
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2632}
2498 2633
2499sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2501 2636
2518 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2520 2655
2521 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2524 2659
2525 $map->load; 2660 $map->load;
2526 $map->load_neighbours; 2661 $map->load_neighbours;
2527 2662
2528 return unless $self->contr->active; 2663 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2664
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2534} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2535 2672
2673}
2674
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2676
2538Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2548 2687
2549our $GOTOGEN; 2688our $GOTOGEN;
2550 2689
2551sub cf::object::player::goto { 2690sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2553 2698
2554 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2701
2557 $self->enter_link; 2702 $self->enter_link;
2581 my $map = eval { 2726 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2583 2728
2584 if ($map) { 2729 if ($map) {
2585 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2732 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2734 }
2590 2735
2591 $map 2736 $map
2599 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2602 } 2747 }
2603 2748
2604 $done->() if $done; 2749 $done->($self) if $done;
2605 })->prio (1); 2750 })->prio (1);
2606} 2751}
2607 2752
2608=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2609 2754
2726 2871
2727 utf8::encode $text; 2872 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2874}
2730 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2902
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2734client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2735the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
2737 2907
2738=cut 2908=cut
2739 2909
2740# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2742 "c/identify" => { 2918 "c/identify" => {
2743 id => "infobox", 2919 id => "infobox",
2744 title => "Identify", 2920 title => "Identify",
2745 reply => undef, 2921 reply => undef,
2746 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2748 "c/examine" => { 2924 "c/examine" => {
2749 id => "infobox", 2925 id => "infobox",
2750 title => "Examine", 2926 title => "Examine",
2751 reply => undef, 2927 reply => undef,
2752 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2935 },
2754 "c/book" => { 2936 "c/book" => {
2755 id => "infobox", 2937 id => "infobox",
2756 title => "Book", 2938 title => "Book",
2757 reply => undef, 2939 reply => undef,
2785 id => "infobox", 2967 id => "infobox",
2786 title => "Skills", 2968 title => "Skills",
2787 reply => undef, 2969 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2970 tooltip => "Shows your experience per skill and item power",
2789 }, 2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2790 "c/resistances" => { 2978 "c/resistances" => {
2791 id => "infobox", 2979 id => "infobox",
2792 title => "Resistances", 2980 title => "Resistances",
2793 reply => undef, 2981 reply => undef,
2794 tooltip => "Shows your resistances", 2982 tooltip => "Shows your resistances",
2796 "c/pets" => { 2984 "c/pets" => {
2797 id => "infobox", 2985 id => "infobox",
2798 title => "Pets", 2986 title => "Pets",
2799 reply => undef, 2987 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2995 },
2802 "c/uptime" => { 2996 "c/uptime" => {
2803 id => "infobox", 2997 id => "infobox",
2804 title => "Uptime", 2998 title => "Uptime",
2805 reply => undef, 2999 reply => undef,
2861 my $pkt = "msg " 3055 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3058 );
2865 3059
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); 3060 $self->send_big_packet ($pkt);
2877} 3061}
2878 3062
2879=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2880 3064
2881Sends an ext event to the client. 3065Sends an ext event to the client.
2884 3068
2885sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2887 3071
2888 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3077 }
2894} 3078}
2895 3079
2896=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2897 3081
2901 3085
2902sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2904 3088
2905 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3092 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3095 }
2912} 3096}
2913 3097
2914=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2915 3099
3016 3200
3017 $coro 3201 $coro
3018} 3202}
3019 3203
3020cf::client->attach ( 3204cf::client->attach (
3021 on_destroy => sub { 3205 on_client_destroy => sub {
3022 my ($ns) = @_; 3206 my ($ns) = @_;
3023 3207
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3209 },
3026); 3210);
3042our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3043 3227
3044$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3045 3229
3046$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3049 sort time 3233 sort time
3050)); 3234));
3051 3235
3052# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3106 3290
3107 %vars = (_dummy => 0) unless %vars; 3291 %vars = (_dummy => 0) unless %vars;
3108 3292
3293 my @res;
3109 local $_; 3294 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3295
3112 my $eval = 3296 my $eval =
3113 "do {\n" 3297 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3300 . $code
3117 . "\n}" 3301 . "\n}"
3118 ; 3302 ;
3119 3303
3304 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3123 3313
3124 if ($@) { 3314 if ($@) {
3125 warn "$@"; 3315 warn "$@";
3126 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3146=cut 3336=cut
3147 3337
3148sub register_script_function { 3338sub register_script_function {
3149 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3150 3340
3151 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3153} 3343}
3154 3344
3155=back 3345=back
3156 3346
3157=cut 3347=cut
3178 3368
3179 $facedata->{version} == 2 3369 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3371
3182 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3375 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3378 };
3187 cf::cede_to_tick; 3379 cf::cede_to_tick;
3188 3380
3189 { 3381 {
3190 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3386
3195 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3391
3200 cf::cede_to_tick; 3392 cf::cede_to_tick;
3201 } 3393 }
3202 3394
3203 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3227 3419
3228 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3229 } 3421 }
3230 3422
3231 { 3423 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3235 3425
3236 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3429
3241 if ($info->{type} & 1) { 3430 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}; 3431 cf::face::set_type $idx, $info->{type};
3256 } else { 3432 } else {
3257 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3258 } 3434 }
3259 3435
3260 cf::cede_to_tick; 3436 cf::cede_to_tick;
3261 } 3437 }
3262 } 3438 }
3263 3439
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3441
3266 1 3442 1
3267} 3443}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3444
3289register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3291 3447
3292 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3487sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3334} 3490}
3335 3491
3492sub reload_sound {
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3494 or die "$DATADIR/sound $!";
3495
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3497
3498 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499 my $sound = $soundconf->{compat}[$_]
3500 or next;
3501
3502 my $face = cf::face::find "sound/$sound->[1]";
3503 cf::sound::set $sound->[0] => $face;
3504 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3505 }
3506
3507 while (my ($k, $v) = each %{$soundconf->{event}}) {
3508 my $face = cf::face::find "sound/$v";
3509 cf::sound::set $k => $face;
3510 }
3511}
3512
3336sub reload_resources { 3513sub reload_resources {
3337 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3338 3515
3339 reload_facedata; 3516 reload_facedata;
3517 reload_sound;
3340 reload_archetypes; 3518 reload_archetypes;
3341 reload_regions; 3519 reload_regions;
3342 reload_treasures; 3520 reload_treasures;
3343 3521
3344 warn "finished reloading resource files\n"; 3522 warn "finished reloading resource files\n";
3345} 3523}
3346 3524
3347sub reload_config { 3525sub reload_config {
3526 warn "reloading config file...\n";
3527
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3528 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3529 or return;
3350 3530
3351 local $/; 3531 local $/;
3352 *CFG = YAML::Load <$fh>; 3532 *CFG = YAML::XS::Load scalar <$fh>;
3353 3533
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3535
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3536 $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}; 3537 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3538
3359 if (exists $CFG{mlockall}) { 3539 if (exists $CFG{mlockall}) {
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3541 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3542 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3543 };
3364 warn $@ if $@; 3544 warn $@ if $@;
3365 } 3545 }
3546
3547 warn "finished reloading resource files\n";
3366} 3548}
3367 3549
3368sub pidfile() { 3550sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3551 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3552 or die "$PIDFILE: $!";
3382 3564
3383 seek $fh, 0, 0; 3565 seek $fh, 0, 0;
3384 print $fh $$; 3566 print $fh $$;
3385} 3567}
3386 3568
3569sub main_loop {
3570 warn "EV::loop starting\n";
3571 if (1) {
3572 EV::loop;
3573 }
3574 warn "EV::loop returned\n";
3575 goto &main_loop unless $REALLY_UNLOOP;
3576}
3577
3387sub main { 3578sub main {
3388 cf::init_globals; # initialise logging 3579 cf::init_globals; # initialise logging
3389 3580
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3582 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3584 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 3585
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3586 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3587
3402 # we must not ever block the main coroutine 3588 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3589 local $Coro::idle = sub {
3409 }; 3595 };
3410 3596
3411 evthread_start IO::AIO::poll_fileno; 3597 evthread_start IO::AIO::poll_fileno;
3412 3598
3413 cf::sync_job { 3599 cf::sync_job {
3600 cf::init_experience;
3601 cf::init_anim;
3602 cf::init_attackmess;
3603 cf::init_dynamic;
3604
3605 cf::load_settings;
3606 cf::load_materials;
3607
3414 reload_resources; 3608 reload_resources;
3415 reload_config; 3609 reload_config;
3416 db_init; 3610 db_init;
3417 3611
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3612 cf::init_uuid;
3421 cf::init_signals; 3613 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3614 cf::init_skills;
3424 3615
3425 cf::init_beforeplay; 3616 cf::init_beforeplay;
3426 3617
3427 atomic; 3618 atomic;
3429 load_extensions; 3620 load_extensions;
3430 3621
3431 utime time, time, $RUNTIMEFILE; 3622 utime time, time, $RUNTIMEFILE;
3432 3623
3433 # no (long-running) fork's whatsoever before this point(!) 3624 # no (long-running) fork's whatsoever before this point(!)
3625 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3626 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3627
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3628 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3629 };
3438 3630
3439 EV::loop; 3631 cf::object::thawer::errors_are_fatal 0;
3632 warn "parse errors in files are no longer fatal from this point on.\n";
3633
3634 main_loop;
3440} 3635}
3441 3636
3442############################################################################# 3637#############################################################################
3443# initialisation and cleanup 3638# initialisation and cleanup
3444 3639
3445# install some emergency cleanup handlers 3640# install some emergency cleanup handlers
3446BEGIN { 3641BEGIN {
3447 our %SIGWATCHER = (); 3642 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3643 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3644 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3645 cf::cleanup "SIG$signal";
3451 }; 3646 };
3452 } 3647 }
3453} 3648}
3454 3649
3455sub write_runtime_sync { 3650sub write_runtime_sync {
3651 my $t0 = AE::time;
3652
3456 # first touch the runtime file to show we are still running: 3653 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3654 # the fsync below can take a very very long time.
3458 3655
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3656 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3657
3461 my $guard = cf::lock_acquire "write_runtime"; 3658 my $guard = cf::lock_acquire "write_runtime";
3462 3659
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3660 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3661 or return;
3465 3662
3466 my $value = $cf::RUNTIME + 90 + 10; 3663 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3664 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3665 # 60 allows for the watchdog to kill the server.
3481 or return; 3678 or return;
3482 3679
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3681 and return;
3485 3682
3486 warn "runtime file written.\n"; 3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3684
3488 1 3685 1
3489} 3686}
3490 3687
3491our $uuid_lock; 3688our $uuid_lock;
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3814 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3815 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3816 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3817# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3818 }
3622 warn "cleared package $pkg\n";#d#
3623} 3819}
3624 3820
3625sub do_reload_perl() { 3821sub do_reload_perl() {
3626 # can/must only be called in main 3822 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3823 if (in_main) {
3628 warn "can only reload from main coroutine"; 3824 warn "can only reload from main coroutine";
3629 return; 3825 return;
3630 } 3826 }
3631 3827
3632 return if $RELOAD++; 3828 return if $RELOAD++;
3633 3829
3634 my $t1 = EV::time; 3830 my $t1 = AE::time;
3635 3831
3636 while ($RELOAD) { 3832 while ($RELOAD) {
3637 warn "reloading..."; 3833 warn "reloading...";
3638 3834
3639 warn "entering sync_job"; 3835 warn "entering sync_job";
3710 3906
3711 warn "unload completed, starting to reload now"; 3907 warn "unload completed, starting to reload now";
3712 3908
3713 warn "reloading cf.pm"; 3909 warn "reloading cf.pm";
3714 require cf; 3910 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3911 cf::_connect_to_perl_1;
3716 3912
3717 warn "loading config and database again"; 3913 warn "loading config and database again";
3718 cf::reload_config; 3914 cf::reload_config;
3719 3915
3720 warn "loading extensions"; 3916 warn "loading extensions";
3742 3938
3743 warn "reloaded"; 3939 warn "reloaded";
3744 --$RELOAD; 3940 --$RELOAD;
3745 } 3941 }
3746 3942
3747 $t1 = EV::time - $t1; 3943 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3944 warn "reload completed in ${t1}s\n";
3749}; 3945};
3750 3946
3751our $RELOAD_WATCHER; # used only during reload 3947our $RELOAD_WATCHER; # used only during reload
3752 3948
3755 # coro crashes during coro_state_free->destroy here. 3951 # coro crashes during coro_state_free->destroy here.
3756 3952
3757 $RELOAD_WATCHER ||= cf::async { 3953 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3954 Coro::AIO::aio_wait cache_extensions;
3759 3955
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3956 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3957 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3958 undef $RELOAD_WATCHER;
3763 }; 3959 };
3764 }; 3960 };
3765} 3961}
3782 3978
3783our @WAIT_FOR_TICK; 3979our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 3980our @WAIT_FOR_TICK_BEGIN;
3785 3981
3786sub wait_for_tick { 3982sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 3983 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 3984
3789 my $signal = new Coro::Signal; 3985 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 3986 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 3987 $signal->wait;
3792} 3988}
3793 3989
3794sub wait_for_tick_begin { 3990sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 3991 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 3992
3797 my $signal = new Coro::Signal; 3993 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 3994 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 3995 $signal->wait;
3800} 3996}
3805 unless ++$bug_warning > 10; 4001 unless ++$bug_warning > 10;
3806 return; 4002 return;
3807 } 4003 }
3808 4004
3809 cf::server_tick; # one server iteration 4005 cf::server_tick; # one server iteration
4006
4007 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3810 4008
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4009 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4010 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4011 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4012 $Coro::current->{desc} = "runtime saver";
3837} 4035}
3838 4036
3839{ 4037{
3840 # configure BDB 4038 # configure BDB
3841 4039
3842 BDB::min_parallel 8; 4040 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4041 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4042 $AnyEvent::BDB::WATCHER->priority (1);
3845 4043
3846 unless ($DB_ENV) { 4044 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4045 $DB_ENV = BDB::db_env_create;
3928 } 4126 }
3929} 4127}
3930 4128
3931# load additional modules 4129# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4130require "cf/$_.pm" for @EXTRA_MODULES;
4131cf::_connect_to_perl_2;
3933 4132
3934END { cf::emergency_save } 4133END { cf::emergency_save }
3935 4134
39361 41351
3937 4136

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines