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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 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 = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
117our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
118 127
119our %CFG; 128our %CFG;
120 129
121our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 131our $RUNTIME;
… …
134our $JITTER; # average jitter 143our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
136 145
137our @POST_INIT; 146our @POST_INIT;
138 147
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
140 150
141binmode STDOUT; 151binmode STDOUT;
142binmode STDERR; 152binmode STDERR;
143 153
144# read virtual server time, if available 154# read virtual server time, if available
… …
146 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
149} 159}
150 160
161eval "sub TICK() { $TICK } 1" or die;
162
151mkdir $_ 163mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 165
154our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
155 167
156sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
157 184
158############################################################################# 185#############################################################################
159 186
160=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
161 188
… …
208returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
209per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
210 237
211=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
212 239
213This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
214C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
215that call. 242that call.
216 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
217=back 250=back
218 251
219=cut 252=cut
220 253
221BEGIN { 254$Coro::State::WARNHOOK = sub {
222 *CORE::GLOBAL::warn = sub {
223 my $msg = join "", @_; 255 my $msg = join "", @_;
224 256
225 $msg .= "\n" 257 $msg .= "\n"
226 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
227 259
228 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
229 261
230 LOG llevError, $msg; 262 LOG llevError, $msg;
231 }; 263};
232}
233 264
234$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
236 267
237 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 272 return;#d#
240 }#d# 273 }#d#
241 274
242 # kill coroutine otherwise 275 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 276 Coro::terminate
245}; 277};
246
247$SIG{__DIE__} = sub { }; #d#?
248 278
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
266)) { 296)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 298}
269 299
270$EV::DIED = sub { 300$EV::DIED = sub {
271 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
272}; 302};
273 303
274############################################################################# 304#############################################################################
275 305
276=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
373} 403}
374 404
375=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
376 406
377Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
378get spread over timer. 408get spread over time.
379 409
380=cut 410=cut
381 411
382sub periodic($$) { 412sub periodic($$) {
383 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
400 430
401=cut 431=cut
402 432
403our @SLOT_QUEUE; 433our @SLOT_QUEUE;
404our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
405 436
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
409 440
410 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
411 443
412 while () { 444 while () {
413 next_job: 445 next_job:
446
414 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 448
416 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 453 $job->[2]->send;
420 Coro::cede; 454 Coro::cede;
421 goto next_job; 455 goto next_job;
422 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 458 }
424 } 459 }
425 460
426 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
427 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
428 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait; 464 $signal->wait;
430 } else { 465 } else {
466 $busy = 0;
431 Coro::schedule; 467 Coro::schedule;
432 } 468 }
433 } 469 }
434}; 470};
435 471
436sub get_slot($;$$) { 472sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
438 474
439 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
440 476
441 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
442 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
443 480
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
473 510
474sub sync_job(&) { 511sub sync_job(&) {
475 my ($job) = @_; 512 my ($job) = @_;
476 513
477 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
478 my $time = EV::time; 515 my $time = AE::time;
479 516
480 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
481 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
482 519
483 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
500 } else { 537 } else {
501 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
502 } 539 }
503 } 540 }
504 541
505 my $time = EV::time - $time; 542 my $time = AE::time - $time;
506 543
507 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
508 545
509 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
510 } else { 547 } else {
… …
554 reset_signals; 591 reset_signals;
555 &$cb 592 &$cb
556 }, @args; 593 }, @args;
557 594
558 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
559} 607}
560 608
561=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
562 610
563=cut 611=cut
… …
1149 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1150 1198
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1204 aio_fsync $fh;
1205 }
1155 aio_close $fh; 1206 aio_close $fh;
1156 1207
1157 if (@$objs) { 1208 if (@$objs) {
1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1159 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1162 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1163 aio_close $fh; 1217 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1219 }
1166 } else { 1220 } else {
1167 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
… …
1274} 1328}
1275 1329
1276use File::Glob (); 1330use File::Glob ();
1277 1331
1278cf::player->attach ( 1332cf::player->attach (
1279 on_command => sub { 1333 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1281 1335
1282 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1283 or return; 1337 or return;
1284 1338
… …
1318 1372
1319# "readahead" all extensions 1373# "readahead" all extensions
1320sub cache_extensions { 1374sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1375 my $grp = IO::AIO::aio_group;
1322 1376
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1378 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1380 }
1327 }; 1381 };
1328 1382
… …
1363 . "\n};\n1"; 1417 . "\n};\n1";
1364 1418
1365 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1366 } 1420 }
1367 1421
1422 my $pass = 0;
1368 my %done; 1423 my %done;
1369 while (%todo) { 1424 while (%todo) {
1370 my $progress; 1425 my $progress;
1371 1426
1427 ++$pass;
1428
1429 ext:
1372 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1432 next ext
1375 unless exists $done{$_}; 1433 unless exists $done{$_};
1376 } 1434 }
1377 1435
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1437
1380 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1442
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1444 if exists $v->{meta}{mandatory};
1388 1445
1389 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1390 } 1455 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1456 }
1396 1457
1397 skip: 1458 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1400 } 1466 }
1401 }; 1467 };
1402} 1468}
1403 1469
1404############################################################################# 1470#############################################################################
… …
1488 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1489 } 1555 }
1490 } 1556 }
1491} 1557}
1492 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1493sub save($) { 1572sub save($) {
1494 my ($pl) = @_; 1573 my ($pl) = @_;
1495 1574
1496 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1497 1576
… …
1502 1581
1503 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1505 1584
1506 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1507 1589
1508 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1591 cf::cede_to_tick;
1510} 1592}
1511 1593
… …
1613 \@logins 1695 \@logins
1614} 1696}
1615 1697
1616=item $player->maps 1698=item $player->maps
1617 1699
1700=item cf::player::maps $login
1701
1618Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1619player. May block. 1703player. May block.
1620 1704
1621=cut 1705=cut
1622 1706
… …
1684=cut 1768=cut
1685 1769
1686sub find_by_path($) { 1770sub find_by_path($) {
1687 my ($path) = @_; 1771 my ($path) = @_;
1688 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1689 my ($match, $specificity); 1775 my ($match, $specificity);
1690 1776
1691 for my $region (list) { 1777 for my $region (list) {
1692 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1693 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725 1811
1726 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1813 $self->_create_random_map (
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1980 2066
1981 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1982 } 2068 }
1983} 2069}
1984 2070
1985sub pre_load { } 2071sub pre_load { }
1986sub post_load { } 2072#sub post_load { } # XS
1987 2073
1988sub load { 2074sub load {
1989 my ($self) = @_; 2075 my ($self) = @_;
1990 2076
1991 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2048 } 2134 }
2049 2135
2050 $self->post_load; 2136 $self->post_load;
2051} 2137}
2052 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2053sub customise_for { 2142sub customise_for {
2054 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2055 2144
2056 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2146 if $self->per_player;
… …
2134 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2135 2224
2136 () 2225 ()
2137} 2226}
2138 2227
2228# common code, used by both ->save and ->swapout
2139sub save { 2229sub _save {
2140 my ($self) = @_; 2230 my ($self) = @_;
2141
2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
2143 2231
2144 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2145 2233
2146 return unless $self->dirty; 2234 return unless $self->dirty;
2147 2235
… …
2167 } else { 2255 } else {
2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2169 } 2257 }
2170} 2258}
2171 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2172sub swap_out { 2268sub swap_out {
2173 my ($self) = @_; 2269 my ($self) = @_;
2174 2270
2175 # save first because save cedes
2176 $self->save;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2272
2180 return if $self->players;
2181 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2182 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2183 2276
2184 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2185
2186 $self->deactivate; 2278 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2188 $self->clear; 2286 $self->clear;
2189} 2287}
2190 2288
2191sub reset_at { 2289sub reset_at {
2192 my ($self) = @_; 2290 my ($self) = @_;
… …
2211 2309
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2311
2214 return if $self->players; 2312 return if $self->players;
2215 2313
2216 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2217 2315
2218 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2219 2317
2220 # need to save uniques path 2318 # need to save uniques path
2221 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
… …
2312 : normalise $_ 2410 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2412 ]
2315} 2413}
2316 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2317=back 2447=back
2318 2448
2319=head3 cf::object 2449=head3 cf::object
2320 2450
2321=cut 2451=cut
… …
2386 2516
2387our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2388 id => "say", 2518 id => "say",
2389 title => "Map", 2519 title => "Map",
2390 reply => "say ", 2520 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2392}; 2522};
2393 2523
2394our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2395 id => "chat", 2525 id => "chat",
2396 title => "Chat", 2526 title => "Chat",
… …
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2620
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2493 2623
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2625}
2496 2626
2497sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2499 2629
… …
2516 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2518 2648
2519 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2522 2652
2523 $map->load; 2653 $map->load;
2524 $map->load_neighbours; 2654 $map->load_neighbours;
2525 2655
2526 return unless $self->contr->active; 2656 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2657
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2532} 2663}
2533 2664
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2666
2536Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
… …
2724 2855
2725 utf8::encode $text; 2856 utf8::encode $text;
2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2727} 2858}
2728 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2886
2731Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2732client if neccessary. C<$type> should be a string identifying the type of 2888client if neccessary. C<$type> should be a string identifying the type of
2733the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2735 2891
2736=cut 2892=cut
2737 2893
2738# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2740 "c/identify" => { 2902 "c/identify" => {
2741 id => "infobox", 2903 id => "infobox",
2742 title => "Identify", 2904 title => "Identify",
2743 reply => undef, 2905 reply => undef,
2744 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2746 "c/examine" => { 2908 "c/examine" => {
2747 id => "infobox", 2909 id => "infobox",
2748 title => "Examine", 2910 title => "Examine",
2749 reply => undef, 2911 reply => undef,
2750 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2751 }, 2919 },
2752 "c/book" => { 2920 "c/book" => {
2753 id => "infobox", 2921 id => "infobox",
2754 title => "Book", 2922 title => "Book",
2755 reply => undef, 2923 reply => undef,
… …
2783 id => "infobox", 2951 id => "infobox",
2784 title => "Skills", 2952 title => "Skills",
2785 reply => undef, 2953 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 2954 tooltip => "Shows your experience per skill and item power",
2787 }, 2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2788 "c/resistances" => { 2962 "c/resistances" => {
2789 id => "infobox", 2963 id => "infobox",
2790 title => "Resistances", 2964 title => "Resistances",
2791 reply => undef, 2965 reply => undef,
2792 tooltip => "Shows your resistances", 2966 tooltip => "Shows your resistances",
… …
2794 "c/pets" => { 2968 "c/pets" => {
2795 id => "infobox", 2969 id => "infobox",
2796 title => "Pets", 2970 title => "Pets",
2797 reply => undef, 2971 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2799 }, 2979 },
2800 "c/uptime" => { 2980 "c/uptime" => {
2801 id => "infobox", 2981 id => "infobox",
2802 title => "Uptime", 2982 title => "Uptime",
2803 reply => undef, 2983 reply => undef,
… …
2859 my $pkt = "msg " 3039 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3042 );
2863 3043
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2875} 3045}
2876 3046
2877=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2878 3048
2879Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2882 3052
2883sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2885 3055
2886 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3061 }
2892} 3062}
2893 3063
2894=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2895 3065
… …
2899 3069
2900sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2902 3072
2903 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3076 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3079 }
2910} 3080}
2911 3081
2912=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2913 3083
… …
3014 3184
3015 $coro 3185 $coro
3016} 3186}
3017 3187
3018cf::client->attach ( 3188cf::client->attach (
3019 on_destroy => sub { 3189 on_client_destroy => sub {
3020 my ($ns) = @_; 3190 my ($ns) = @_;
3021 3191
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3193 },
3024); 3194);
… …
3040our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3041 3211
3042$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3043 3213
3044$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3047 sort time 3217 sort time
3048)); 3218));
3049 3219
3050# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3104 3274
3105 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3106 3276
3277 my @res;
3107 local $_; 3278 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3279
3110 my $eval = 3280 my $eval =
3111 "do {\n" 3281 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3284 . $code
3115 . "\n}" 3285 . "\n}"
3116 ; 3286 ;
3117 3287
3288 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3121 3297
3122 if ($@) { 3298 if ($@) {
3123 warn "$@"; 3299 warn "$@";
3124 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3144=cut 3320=cut
3145 3321
3146sub register_script_function { 3322sub register_script_function {
3147 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3148 3324
3149 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3151} 3327}
3152 3328
3153=back 3329=back
3154 3330
3155=cut 3331=cut
… …
3176 3352
3177 $facedata->{version} == 2 3353 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3355
3180 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3181 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3359 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3184 }; 3362 };
3185 cf::cede_to_tick; 3363 cf::cede_to_tick;
3186 3364
3187 { 3365 {
3188 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3190 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3370
3193 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3375
3198 cf::cede_to_tick; 3376 cf::cede_to_tick;
3199 } 3377 }
3200 3378
3201 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3225 3403
3226 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3227 } 3405 }
3228 3406
3229 { 3407 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3233 3409
3234 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3413
3239 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3254 } else { 3416 } else {
3255 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3256 } 3418 }
3257 3419
… …
3341 3503
3342 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3343} 3505}
3344 3506
3345sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3511 or return;
3348 3512
3349 local $/; 3513 local $/;
3350 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3351 3515
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3353 3517
3354 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3355 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3525 };
3362 warn $@ if $@; 3526 warn $@ if $@;
3363 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3364} 3530}
3365 3531
3366sub pidfile() { 3532sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
… …
3380 3546
3381 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3382 print $fh $$; 3548 print $fh $$;
3383} 3549}
3384 3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3558}
3559
3385sub main { 3560sub main {
3386 cf::init_globals; # initialise logging 3561 cf::init_globals; # initialise logging
3387 3562
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397 3567
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399 3569
3400 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3401 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3407 }; 3577 };
3408 3578
3409 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3410 3580
3411 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3412 reload_resources; 3590 reload_resources;
3413 reload_config; 3591 reload_config;
3414 db_init; 3592 db_init;
3415 3593
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3594 cf::init_uuid;
3419 cf::init_signals; 3595 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3596 cf::init_skills;
3422 3597
3423 cf::init_beforeplay; 3598 cf::init_beforeplay;
3424 3599
3425 atomic; 3600 atomic;
… …
3427 load_extensions; 3602 load_extensions;
3428 3603
3429 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3430 3605
3431 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433 3609
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3611 };
3436 3612
3437 EV::loop; 3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3438} 3617}
3439 3618
3440############################################################################# 3619#############################################################################
3441# initialisation and cleanup 3620# initialisation and cleanup
3442 3621
3443# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3444BEGIN { 3623BEGIN {
3445 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3446 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3447 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3448 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3449 }; 3628 };
3450 } 3629 }
3451} 3630}
3452 3631
3453sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3454 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3456 3637
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3639
3459 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3460 3641
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3643 or return;
3463 3644
3464 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3479 or return; 3660 or return;
3480 3661
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3663 and return;
3483 3664
3484 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3485 3666
3486 1 3667 1
3487} 3668}
3488 3669
3489our $uuid_lock; 3670our $uuid_lock;
… …
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 } 3800 }
3620 warn "cleared package $pkg\n";#d#
3621} 3801}
3622 3802
3623sub do_reload_perl() { 3803sub do_reload_perl() {
3624 # can/must only be called in main 3804 # can/must only be called in main
3625 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3626 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3627 return; 3807 return;
3628 } 3808 }
3629 3809
3630 return if $RELOAD++; 3810 return if $RELOAD++;
3631 3811
3632 my $t1 = EV::time; 3812 my $t1 = AE::time;
3633 3813
3634 while ($RELOAD) { 3814 while ($RELOAD) {
3635 warn "reloading..."; 3815 warn "reloading...";
3636 3816
3637 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3708 3888
3709 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3710 3890
3711 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3712 require cf; 3892 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3714 3894
3715 warn "loading config and database again"; 3895 warn "loading config and database again";
3716 cf::reload_config; 3896 cf::reload_config;
3717 3897
3718 warn "loading extensions"; 3898 warn "loading extensions";
… …
3740 3920
3741 warn "reloaded"; 3921 warn "reloaded";
3742 --$RELOAD; 3922 --$RELOAD;
3743 } 3923 }
3744 3924
3745 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3746 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3747}; 3927};
3748 3928
3749our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3750 3930
… …
3753 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3754 3934
3755 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3757 3937
3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3759 do_reload_perl; 3939 do_reload_perl;
3760 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3761 }; 3941 };
3762 }; 3942 };
3763} 3943}
… …
3780 3960
3781our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3783 3963
3784sub wait_for_tick { 3964sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3966
3787 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3969 $signal->wait;
3790} 3970}
3791 3971
3792sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3974
3795 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3977 $signal->wait;
3798} 3978}
… …
3803 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3804 return; 3984 return;
3805 } 3985 }
3806 3986
3807 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3808 3990
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3811 Coro::async_pool { 3993 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3835} 4017}
3836 4018
3837{ 4019{
3838 # configure BDB 4020 # configure BDB
3839 4021
3840 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3843 4025
3844 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4108 }
3927} 4109}
3928 4110
3929# load additional modules 4111# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3931 4114
3932END { cf::emergency_save } 4115END { cf::emergency_save }
3933 4116
39341 41171
3935 4118

Diff Legend

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