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.465 by root, Thu Jan 8 00:54:55 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;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
117our %CFG; 128our %CFG;
118 129
119our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 131our $RUNTIME;
121our $NOW; 132our $NOW;
… …
132our $JITTER; # average jitter 143our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
134 145
135our @POST_INIT; 146our @POST_INIT;
136 147
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
138 150
139binmode STDOUT; 151binmode STDOUT;
140binmode STDERR; 152binmode STDERR;
141 153
142# read virtual server time, if available 154# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
147} 159}
148 160
161eval "sub TICK() { $TICK } 1" or die;
162
149mkdir $_ 163mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 165
152our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
153 167
154sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 184
156############################################################################# 185#############################################################################
157 186
158=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
159 188
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 237
209=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
210 239
211This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 242that call.
214 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
215=back 250=back
216 251
217=cut 252=cut
218 253
219BEGIN { 254$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 255 my $msg = join "", @_;
222 256
223 $msg .= "\n" 257 $msg .= "\n"
224 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
225 259
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 261
228 LOG llevError, $msg; 262 LOG llevError, $msg;
229 }; 263};
230}
231 264
232$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
234 267
235 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 272 return;#d#
238 }#d# 273 }#d#
239 274
240 # kill coroutine otherwise 275 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 276 Coro::terminate
243}; 277};
244
245$SIG{__DIE__} = sub { }; #d#?
246 278
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 296)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 298}
267 299
268$EV::DIED = sub { 300$EV::DIED = sub {
269 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
270}; 302};
271 303
272############################################################################# 304#############################################################################
273 305
274=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
371} 403}
372 404
373=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
374 406
375Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 408get spread over time.
377 409
378=cut 410=cut
379 411
380sub periodic($$) { 412sub periodic($$) {
381 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
398 430
399=cut 431=cut
400 432
401our @SLOT_QUEUE; 433our @SLOT_QUEUE;
402our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
403 436
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
407 440
408 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
409 443
410 while () { 444 while () {
411 next_job: 445 next_job:
446
412 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 448
414 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 453 $job->[2]->send;
418 Coro::cede; 454 Coro::cede;
419 goto next_job; 455 goto next_job;
420 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 458 }
422 } 459 }
423 460
424 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 464 $signal->wait;
428 } else { 465 } else {
466 $busy = 0;
429 Coro::schedule; 467 Coro::schedule;
430 } 468 }
431 } 469 }
432}; 470};
433 471
434sub get_slot($;$$) { 472sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
436 474
437 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
438 476
439 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
440 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
441 480
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
471 510
472sub sync_job(&) { 511sub sync_job(&) {
473 my ($job) = @_; 512 my ($job) = @_;
474 513
475 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 515 my $time = AE::time;
477 516
478 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
480 519
481 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
498 } else { 537 } else {
499 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
500 } 539 }
501 } 540 }
502 541
503 my $time = EV::time - $time; 542 my $time = AE::time - $time;
504 543
505 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
506 545
507 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
508 } else { 547 } else {
… …
552 reset_signals; 591 reset_signals;
553 &$cb 592 &$cb
554 }, @args; 593 }, @args;
555 594
556 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
557} 607}
558 608
559=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
560 610
561=cut 611=cut
… …
1147 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1148 1198
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1204 aio_fsync $fh;
1205 }
1153 aio_close $fh; 1206 aio_close $fh;
1154 1207
1155 if (@$objs) { 1208 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1215 aio_fsync $fh;
1216 }
1161 aio_close $fh; 1217 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1219 }
1164 } else { 1220 } else {
1165 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
… …
1272} 1328}
1273 1329
1274use File::Glob (); 1330use File::Glob ();
1275 1331
1276cf::player->attach ( 1332cf::player->attach (
1277 on_command => sub { 1333 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1279 1335
1280 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1281 or return; 1337 or return;
1282 1338
… …
1316 1372
1317# "readahead" all extensions 1373# "readahead" all extensions
1318sub cache_extensions { 1374sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1375 my $grp = IO::AIO::aio_group;
1320 1376
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1378 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1380 }
1325 }; 1381 };
1326 1382
… …
1361 . "\n};\n1"; 1417 . "\n};\n1";
1362 1418
1363 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1364 } 1420 }
1365 1421
1422 my $pass = 0;
1366 my %done; 1423 my %done;
1367 while (%todo) { 1424 while (%todo) {
1368 my $progress; 1425 my $progress;
1369 1426
1427 ++$pass;
1428
1429 ext:
1370 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1432 next ext
1373 unless exists $done{$_}; 1433 unless exists $done{$_};
1374 } 1434 }
1375 1435
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1437
1378 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1442
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1444 if exists $v->{meta}{mandatory};
1386 1445
1387 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1388 } 1455 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1456 }
1394 1457
1395 skip: 1458 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1398 } 1466 }
1399 }; 1467 };
1400} 1468}
1401 1469
1402############################################################################# 1470#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1487 } 1555 }
1488 } 1556 }
1489} 1557}
1490 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1491sub save($) { 1572sub save($) {
1492 my ($pl) = @_; 1573 my ($pl) = @_;
1493 1574
1494 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1495 1576
… …
1500 1581
1501 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1503 1584
1504 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1589
1506 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1591 cf::cede_to_tick;
1508} 1592}
1509 1593
… …
1611 \@logins 1695 \@logins
1612} 1696}
1613 1697
1614=item $player->maps 1698=item $player->maps
1615 1699
1700=item cf::player::maps $login
1701
1616Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1617player. May block. 1703player. May block.
1618 1704
1619=cut 1705=cut
1620 1706
… …
1682=cut 1768=cut
1683 1769
1684sub find_by_path($) { 1770sub find_by_path($) {
1685 my ($path) = @_; 1771 my ($path) = @_;
1686 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1687 my ($match, $specificity); 1775 my ($match, $specificity);
1688 1776
1689 for my $region (list) { 1777 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1722 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
1723 1811
1724 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1813 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1978 2066
1979 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1980 } 2068 }
1981} 2069}
1982 2070
1983sub pre_load { } 2071sub pre_load { }
1984sub post_load { } 2072#sub post_load { } # XS
1985 2073
1986sub load { 2074sub load {
1987 my ($self) = @_; 2075 my ($self) = @_;
1988 2076
1989 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2046 } 2134 }
2047 2135
2048 $self->post_load; 2136 $self->post_load;
2049} 2137}
2050 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
2051sub customise_for { 2142sub customise_for {
2052 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2053 2144
2054 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2146 if $self->per_player;
… …
2132 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2133 2224
2134 () 2225 ()
2135} 2226}
2136 2227
2228# common code, used by both ->save and ->swapout
2137sub save { 2229sub _save {
2138 my ($self) = @_; 2230 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2231
2142 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2143 2233
2144 return unless $self->dirty; 2234 return unless $self->dirty;
2145 2235
… …
2165 } else { 2255 } else {
2166 $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);
2167 } 2257 }
2168} 2258}
2169 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2170sub swap_out { 2268sub swap_out {
2171 my ($self) = @_; 2269 my ($self) = @_;
2172 2270
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2272
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2181 2276
2182 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2183
2184 $self->deactivate; 2278 $self->deactivate;
2185 $_->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
2186 $self->clear; 2286 $self->clear;
2187} 2287}
2188 2288
2189sub reset_at { 2289sub reset_at {
2190 my ($self) = @_; 2290 my ($self) = @_;
… …
2209 2309
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2311
2212 return if $self->players; 2312 return if $self->players;
2213 2313
2214 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2215 2315
2216 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2217 2317
2218 # need to save uniques path 2318 # need to save uniques path
2219 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
… …
2310 : normalise $_ 2410 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2412 ]
2313} 2413}
2314 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
2315=back 2447=back
2316 2448
2317=head3 cf::object 2449=head3 cf::object
2318 2450
2319=cut 2451=cut
… …
2384 2516
2385our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2386 id => "say", 2518 id => "say",
2387 title => "Map", 2519 title => "Map",
2388 reply => "say ", 2520 reply => "say ",
2389 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.",
2390}; 2522};
2391 2523
2392our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2393 id => "chat", 2525 id => "chat",
2394 title => "Chat", 2526 title => "Chat",
… …
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2620
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2491 2623
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2625}
2494 2626
2495sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2497 2629
… …
2514 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2516 2648
2517 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2520 2652
2521 $map->load; 2653 $map->load;
2522 $map->load_neighbours; 2654 $map->load_neighbours;
2523 2655
2524 return unless $self->contr->active; 2656 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2657
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $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;
2530} 2663}
2531 2664
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2666
2534Moves 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
… …
2722 2855
2723 utf8::encode $text; 2856 utf8::encode $text;
2724 $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);
2725} 2858}
2726 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
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2886
2729Send 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
2730client 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
2731the 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
… …
2733 2891
2734=cut 2892=cut
2735 2893
2736# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2738 "c/identify" => { 2902 "c/identify" => {
2739 id => "infobox", 2903 id => "infobox",
2740 title => "Identify", 2904 title => "Identify",
2741 reply => undef, 2905 reply => undef,
2742 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2908 "c/examine" => {
2745 id => "infobox", 2909 id => "infobox",
2746 title => "Examine", 2910 title => "Examine",
2747 reply => undef, 2911 reply => undef,
2748 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",
2749 }, 2919 },
2750 "c/book" => { 2920 "c/book" => {
2751 id => "infobox", 2921 id => "infobox",
2752 title => "Book", 2922 title => "Book",
2753 reply => undef, 2923 reply => undef,
… …
2781 id => "infobox", 2951 id => "infobox",
2782 title => "Skills", 2952 title => "Skills",
2783 reply => undef, 2953 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 2954 tooltip => "Shows your experience per skill and item power",
2785 }, 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 },
2786 "c/resistances" => { 2962 "c/resistances" => {
2787 id => "infobox", 2963 id => "infobox",
2788 title => "Resistances", 2964 title => "Resistances",
2789 reply => undef, 2965 reply => undef,
2790 tooltip => "Shows your resistances", 2966 tooltip => "Shows your resistances",
… …
2792 "c/pets" => { 2968 "c/pets" => {
2793 id => "infobox", 2969 id => "infobox",
2794 title => "Pets", 2970 title => "Pets",
2795 reply => undef, 2971 reply => undef,
2796 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",
2797 }, 2979 },
2798 "c/uptime" => { 2980 "c/uptime" => {
2799 id => "infobox", 2981 id => "infobox",
2800 title => "Uptime", 2982 title => "Uptime",
2801 reply => undef, 2983 reply => undef,
… …
2857 my $pkt = "msg " 3039 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3042 );
2861 3043
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2873} 3045}
2874 3046
2875=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2876 3048
2877Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2880 3052
2881sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2883 3055
2884 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3061 }
2890} 3062}
2891 3063
2892=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2893 3065
… …
2897 3069
2898sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2900 3072
2901 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3076 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3079 }
2908} 3080}
2909 3081
2910=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2911 3083
… …
3012 3184
3013 $coro 3185 $coro
3014} 3186}
3015 3187
3016cf::client->attach ( 3188cf::client->attach (
3017 on_destroy => sub { 3189 on_client_destroy => sub {
3018 my ($ns) = @_; 3190 my ($ns) = @_;
3019 3191
3020 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3021 }, 3193 },
3022); 3194);
… …
3038our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3039 3211
3040$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3041 3213
3042$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3045 sort time 3217 sort time
3046)); 3218));
3047 3219
3048# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3052The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3053 3225
3054 cf::object 3226 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3057 3230
3058 cf::object::player 3231 cf::object::player
3059 player 3232 player
3060 3233
3061 cf::player 3234 cf::player
… …
3067=cut 3240=cut
3068 3241
3069for ( 3242for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3076) { 3249) {
3077 no strict 'refs'; 3250 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3097 3270
3098 my $qcode = $code; 3271 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3101 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3102 local $_; 3278 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3279
3105 my $eval = 3280 my $eval =
3106 "do {\n" 3281 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3284 . $code
3110 . "\n}" 3285 . "\n}"
3111 ; 3286 ;
3112 3287
3288 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 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 }
3116 3297
3117 if ($@) { 3298 if ($@) {
3118 warn "$@"; 3299 warn "$@";
3119 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3139=cut 3320=cut
3140 3321
3141sub register_script_function { 3322sub register_script_function {
3142 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3143 3324
3144 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3146} 3327}
3147 3328
3148=back 3329=back
3149 3330
3150=cut 3331=cut
… …
3171 3352
3172 $facedata->{version} == 2 3353 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3355
3175 # 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]);
3176 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3359 type => FT_RSRC,
3178 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),
3179 }; 3362 };
3180 cf::cede_to_tick; 3363 cf::cede_to_tick;
3181 3364
3182 { 3365 {
3183 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3185 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3370
3188 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3192 3375
3193 cf::cede_to_tick; 3376 cf::cede_to_tick;
3194 } 3377 }
3195 3378
3196 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3220 3403
3221 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3222 } 3405 }
3223 3406
3224 { 3407 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3228 3409
3229 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3413
3234 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3249 } else { 3416 } else {
3250 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3251 } 3418 }
3252 3419
… …
3336 3503
3337 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3338} 3505}
3339 3506
3340sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3511 or return;
3343 3512
3344 local $/; 3513 local $/;
3345 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3346 3515
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3517
3349 $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};
3350 $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};
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3525 };
3357 warn $@ if $@; 3526 warn $@ if $@;
3358 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3359} 3530}
3360 3531
3361sub pidfile() { 3532sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
… …
3375 3546
3376 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3377 print $fh $$; 3548 print $fh $$;
3378} 3549}
3379 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
3380sub main { 3560sub main {
3381 cf::init_globals; # initialise logging 3561 cf::init_globals; # initialise logging
3382 3562
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 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.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392 3567
3393 $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
3394 3569
3395 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3402 }; 3577 };
3403 3578
3404 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3405 3580
3406 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
3407 reload_resources; 3590 reload_resources;
3408 reload_config; 3591 reload_config;
3409 db_init; 3592 db_init;
3410 3593
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3594 cf::init_uuid;
3414 cf::init_signals; 3595 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills; 3596 cf::init_skills;
3417 3597
3418 cf::init_beforeplay; 3598 cf::init_beforeplay;
3419 3599
3420 atomic; 3600 atomic;
… …
3422 load_extensions; 3602 load_extensions;
3423 3603
3424 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3425 3605
3426 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3427 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};
3428 3609
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3430 }; 3611 };
3431 3612
3432 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;
3433} 3617}
3434 3618
3435############################################################################# 3619#############################################################################
3436# initialisation and cleanup 3620# initialisation and cleanup
3437 3621
3438# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3439BEGIN { 3623BEGIN {
3440 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3441 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3442 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3443 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3444 }; 3628 };
3445 } 3629 }
3446} 3630}
3447 3631
3448sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3449 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3451 3637
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3639
3454 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3455 3641
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3643 or return;
3458 3644
3459 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3474 or return; 3660 or return;
3475 3661
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3663 and return;
3478 3664
3479 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3480 3666
3481 1 3667 1
3482} 3668}
3483 3669
3484our $uuid_lock; 3670our $uuid_lock;
… …
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 } 3800 }
3615 warn "cleared package $pkg\n";#d#
3616} 3801}
3617 3802
3618sub do_reload_perl() { 3803sub do_reload_perl() {
3619 # can/must only be called in main 3804 # can/must only be called in main
3620 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3621 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3622 return; 3807 return;
3623 } 3808 }
3624 3809
3625 return if $RELOAD++; 3810 return if $RELOAD++;
3626 3811
3627 my $t1 = EV::time; 3812 my $t1 = AE::time;
3628 3813
3629 while ($RELOAD) { 3814 while ($RELOAD) {
3630 warn "reloading..."; 3815 warn "reloading...";
3631 3816
3632 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3693 clear_package "safe::$_" 3878 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3880
3696 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3884
3700 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3886 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3703 3888
3704 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3705 3890
3706 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3707 require cf; 3892 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3709 3894
3710 warn "loading config and database again"; 3895 warn "loading config and database again";
3711 cf::reload_config; 3896 cf::reload_config;
3712 3897
3713 warn "loading extensions"; 3898 warn "loading extensions";
… …
3735 3920
3736 warn "reloaded"; 3921 warn "reloaded";
3737 --$RELOAD; 3922 --$RELOAD;
3738 } 3923 }
3739 3924
3740 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3741 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3742}; 3927};
3743 3928
3744our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3745 3930
… …
3748 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3749 3934
3750 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3752 3937
3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl; 3939 do_reload_perl;
3755 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3756 }; 3941 };
3757 }; 3942 };
3758} 3943}
… …
3775 3960
3776our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3778 3963
3779sub wait_for_tick { 3964sub wait_for_tick {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3966
3782 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 3969 $signal->wait;
3785} 3970}
3786 3971
3787sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 3974
3790 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 3977 $signal->wait;
3793} 3978}
… …
3798 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3799 return; 3984 return;
3800 } 3985 }
3801 3986
3802 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#
3803 3990
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $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.;
3806 Coro::async_pool { 3993 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3830} 4017}
3831 4018
3832{ 4019{
3833 # configure BDB 4020 # configure BDB
3834 4021
3835 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3838 4025
3839 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 4108 }
3922} 4109}
3923 4110
3924# load additional modules 4111# load additional modules
3925use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3926 4114
3927END { cf::emergency_save } 4115END { cf::emergency_save }
3928 4116
39291 41171
3930 4118

Diff Legend

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