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.521 by root, Fri Apr 16 23:28:42 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
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 180
156############################################################################# 181#############################################################################
157 182
158=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
159 184
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 231returns 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. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 233
209=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
210 235
211This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 238that call.
214 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
215=back 246=back
216 247
217=cut 248=cut
218 249
219BEGIN { 250$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 251 my $msg = join "", @_;
222 252
223 $msg .= "\n" 253 $msg .= "\n"
224 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
225 255
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 257
228 LOG llevError, $msg; 258 LOG llevError, $msg;
229 }; 259};
230}
231 260
232$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
234 265
235 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 268 return;#d#
238 }#d# 269 }#d#
239 270
240 # kill coroutine otherwise 271 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 272 Coro::terminate
243}; 273};
244
245$SIG{__DIE__} = sub { }; #d#?
246 274
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 292)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 294}
267 295
268$EV::DIED = sub { 296$EV::DIED = sub {
269 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
270}; 298};
271 299
272############################################################################# 300#############################################################################
273 301
274=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
371} 399}
372 400
373=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
374 402
375Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 404get spread over time.
377 405
378=cut 406=cut
379 407
380sub periodic($$) { 408sub periodic($$) {
381 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
398 426
399=cut 427=cut
400 428
401our @SLOT_QUEUE; 429our @SLOT_QUEUE;
402our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
403 432
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
407 436
408 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
409 439
410 while () { 440 while () {
411 next_job: 441 next_job:
442
412 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 444
414 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 449 $job->[2]->send;
418 Coro::cede; 450 Coro::cede;
419 goto next_job; 451 goto next_job;
420 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 454 }
422 } 455 }
423 456
424 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 460 $signal->wait;
428 } else { 461 } else {
462 $busy = 0;
429 Coro::schedule; 463 Coro::schedule;
430 } 464 }
431 } 465 }
432}; 466};
433 467
434sub get_slot($;$$) { 468sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
436 470
437 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
438 472
439 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
440 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
441 476
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
471 506
472sub sync_job(&) { 507sub sync_job(&) {
473 my ($job) = @_; 508 my ($job) = @_;
474 509
475 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 511 my $time = AE::time;
477 512
478 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
480 515
481 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
498 } else { 533 } else {
499 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
500 } 535 }
501 } 536 }
502 537
503 my $time = EV::time - $time; 538 my $time = AE::time - $time;
504 539
505 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
506 541
507 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
508 } else { 543 } else {
… …
552 reset_signals; 587 reset_signals;
553 &$cb 588 &$cb
554 }, @args; 589 }, @args;
555 590
556 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
557} 603}
558 604
559=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
560 606
561=cut 607=cut
… …
1147 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1148 1194
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1153 aio_close $fh; 1202 aio_close $fh;
1154 1203
1155 if (@$objs) { 1204 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1161 aio_close $fh; 1213 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1215 }
1164 } else { 1216 } else {
1165 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
… …
1272} 1324}
1273 1325
1274use File::Glob (); 1326use File::Glob ();
1275 1327
1276cf::player->attach ( 1328cf::player->attach (
1277 on_command => sub { 1329 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1279 1331
1280 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1281 or return; 1333 or return;
1282 1334
… …
1316 1368
1317# "readahead" all extensions 1369# "readahead" all extensions
1318sub cache_extensions { 1370sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1371 my $grp = IO::AIO::aio_group;
1320 1372
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1374 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1376 }
1325 }; 1377 };
1326 1378
… …
1361 . "\n};\n1"; 1413 . "\n};\n1";
1362 1414
1363 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1364 } 1416 }
1365 1417
1418 my $pass = 0;
1366 my %done; 1419 my %done;
1367 while (%todo) { 1420 while (%todo) {
1368 my $progress; 1421 my $progress;
1369 1422
1423 ++$pass;
1424
1425 ext:
1370 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1428 next ext
1373 unless exists $done{$_}; 1429 unless exists $done{$_};
1374 } 1430 }
1375 1431
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1433
1378 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1438
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1440 if exists $v->{meta}{mandatory};
1386 1441
1387 warn $msg; 1442 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1443 delete $todo{$k};
1444 } else {
1445 $done{$k} = delete $todo{$k};
1446 push @EXTS, $v->{pkg};
1447 $progress = 1;
1448
1449 warn "$v->{base}: extension inactive.\n"
1450 unless $active;
1388 } 1451 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1452 }
1394 1453
1395 skip: 1454 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1455 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1456
1457 while (my ($k, $v) = each %todo) {
1458 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459 if exists $v->{meta}{mandatory};
1460 }
1461 }
1398 } 1462 }
1399 }; 1463 };
1400} 1464}
1401 1465
1402############################################################################# 1466#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1550 $cf::PLAYER{$login} = $pl
1487 } 1551 }
1488 } 1552 }
1489} 1553}
1490 1554
1555cf::player->attach (
1556 on_load => sub {
1557 my ($pl, $path) = @_;
1558
1559 # restore slots saved in save, below
1560 my $slots = delete $pl->{_slots};
1561
1562 $pl->ob->current_weapon ($slots->[0]);
1563 $pl->combat_ob ($slots->[1]);
1564 $pl->ranged_ob ($slots->[2]);
1565 },
1566);
1567
1491sub save($) { 1568sub save($) {
1492 my ($pl) = @_; 1569 my ($pl) = @_;
1493 1570
1494 return if $pl->{deny_save}; 1571 return if $pl->{deny_save};
1495 1572
… …
1500 1577
1501 aio_mkdir playerdir $pl, 0770; 1578 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1579 $pl->{last_save} = $cf::RUNTIME;
1503 1580
1504 cf::get_slot 0.01; 1581 cf::get_slot 0.01;
1582
1583 # save slots, to be restored later
1584 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1585
1506 $pl->save_pl ($path); 1586 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1587 cf::cede_to_tick;
1508} 1588}
1509 1589
… …
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1802 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1803
1724 # mit "rum" bekleckern, nicht 1804 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1805 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1806 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1807 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1808 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1809 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1810 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1811 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1812 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1978 2058
1979 $cf::MAP{$path} = $map 2059 $cf::MAP{$path} = $map
1980 } 2060 }
1981} 2061}
1982 2062
1983sub pre_load { } 2063sub pre_load { }
1984sub post_load { } 2064#sub post_load { } # XS
1985 2065
1986sub load { 2066sub load {
1987 my ($self) = @_; 2067 my ($self) = @_;
1988 2068
1989 local $self->{deny_reset} = 1; # loading can take a long time 2069 local $self->{deny_reset} = 1; # loading can take a long time
… …
2046 } 2126 }
2047 2127
2048 $self->post_load; 2128 $self->post_load;
2049} 2129}
2050 2130
2131# customize the map for a given player, i.e.
2132# return the _real_ map. used by e.g. per-player
2133# maps to change the path to ~playername/mappath
2051sub customise_for { 2134sub customise_for {
2052 my ($self, $ob) = @_; 2135 my ($self, $ob) = @_;
2053 2136
2054 return find "~" . $ob->name . "/" . $self->{path} 2137 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2138 if $self->per_player;
… …
2132 $MAP_PREFETCHER->prio (6); 2215 $MAP_PREFETCHER->prio (6);
2133 2216
2134 () 2217 ()
2135} 2218}
2136 2219
2220# common code, used by both ->save and ->swapout
2137sub save { 2221sub _save {
2138 my ($self) = @_; 2222 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2223
2142 $self->{last_save} = $cf::RUNTIME; 2224 $self->{last_save} = $cf::RUNTIME;
2143 2225
2144 return unless $self->dirty; 2226 return unless $self->dirty;
2145 2227
… …
2165 } else { 2247 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2249 }
2168} 2250}
2169 2251
2252sub save {
2253 my ($self) = @_;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256
2257 $self->_save;
2258}
2259
2170sub swap_out { 2260sub swap_out {
2171 my ($self) = @_; 2261 my ($self) = @_;
2172 2262
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2264
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2265 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2266 return if $self->{deny_save};
2267 return if $self->players;
2181 2268
2182 $self->in_memory (cf::MAP_SWAPPED); 2269 # first deactivate the map and "unlink" it from the core
2183
2184 $self->deactivate; 2270 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2271 $_->clear_links_to ($self) for values %cf::MAP;
2272 $self->in_memory (cf::MAP_SWAPPED);
2273
2274 # then atomically save
2275 $self->_save;
2276
2277 # then free the map
2186 $self->clear; 2278 $self->clear;
2187} 2279}
2188 2280
2189sub reset_at { 2281sub reset_at {
2190 my ($self) = @_; 2282 my ($self) = @_;
… …
2209 2301
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2302 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2303
2212 return if $self->players; 2304 return if $self->players;
2213 2305
2214 warn "resetting map ", $self->path; 2306 warn "resetting map ", $self->path, "\n";
2215 2307
2216 $self->in_memory (cf::MAP_SWAPPED); 2308 $self->in_memory (cf::MAP_SWAPPED);
2217 2309
2218 # need to save uniques path 2310 # need to save uniques path
2219 unless ($self->{deny_save}) { 2311 unless ($self->{deny_save}) {
… …
2310 : normalise $_ 2402 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2403 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2404 ]
2313} 2405}
2314 2406
2407=item cf::map::static_maps
2408
2409Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2410file in the shared directory excluding F</styles> and F</editor>). May
2411block.
2412
2413=cut
2414
2415sub static_maps() {
2416 my @dirs = "";
2417 my @maps;
2418
2419 while (@dirs) {
2420 my $dir = shift @dirs;
2421
2422 next if $dir eq "/styles" || $dir eq "/editor";
2423
2424 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2425 or return;
2426
2427 for (@$files) {
2428 s/\.map$// or next;
2429 utf8::decode $_;
2430 push @maps, "$dir/$_";
2431 }
2432
2433 push @dirs, map "$dir/$_", @$dirs;
2434 }
2435
2436 \@maps
2437}
2438
2315=back 2439=back
2316 2440
2317=head3 cf::object 2441=head3 cf::object
2318 2442
2319=cut 2443=cut
… …
2384 2508
2385our $SAY_CHANNEL = { 2509our $SAY_CHANNEL = {
2386 id => "say", 2510 id => "say",
2387 title => "Map", 2511 title => "Map",
2388 reply => "say ", 2512 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2513 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2514};
2391 2515
2392our $CHAT_CHANNEL = { 2516our $CHAT_CHANNEL = {
2393 id => "chat", 2517 id => "chat",
2394 title => "Chat", 2518 title => "Chat",
… …
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2611 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2612
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2613 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2614 if $self->map && $self->map->{path} ne "{link}";
2491 2615
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2616 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2617}
2494 2618
2495sub cf::object::player::leave_link { 2619sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2620 my ($self, $map, $x, $y) = @_;
2497 2621
… …
2514 ($x, $y) = (-1, -1) 2638 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2639 unless (defined $x) && (defined $y);
2516 2640
2517 # use -1 or undef as default coordinates, not 0, 0 2641 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2642 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2643 if $x <= 0 && $y <= 0;
2520 2644
2521 $map->load; 2645 $map->load;
2522 $map->load_neighbours; 2646 $map->load_neighbours;
2523 2647
2524 return unless $self->contr->active; 2648 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2649
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2650 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2651 $self->enter_map ($map, $x, $y);
2652
2653 # only activate afterwards, to support waiting in hooks
2654 $self->activate_recursive;
2530} 2655}
2531 2656
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2657=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2658
2534Moves the player to the given map-path and coordinates by first freezing 2659Moves the player to the given map-path and coordinates by first freezing
… …
2722 2847
2723 utf8::encode $text; 2848 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2849 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2725} 2850}
2726 2851
2852=item $client->send_big_packet ($pkt)
2853
2854Like C<send_packet>, but tries to compress large packets, and fragments
2855them as required.
2856
2857=cut
2858
2859our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2860
2861sub cf::client::send_big_packet {
2862 my ($self, $pkt) = @_;
2863
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 ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt);
2875}
2876
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2877=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2878
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2879Send 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 2880client 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 2881the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2733 2883
2734=cut 2884=cut
2735 2885
2736# non-persistent channels (usually the info channel) 2886# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2887our %CHANNEL = (
2888 "c/motd" => {
2889 id => "infobox",
2890 title => "MOTD",
2891 reply => undef,
2892 tooltip => "The message of the day",
2893 },
2738 "c/identify" => { 2894 "c/identify" => {
2739 id => "infobox", 2895 id => "infobox",
2740 title => "Identify", 2896 title => "Identify",
2741 reply => undef, 2897 reply => undef,
2742 tooltip => "Items recently identified", 2898 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2900 "c/examine" => {
2745 id => "infobox", 2901 id => "infobox",
2746 title => "Examine", 2902 title => "Examine",
2747 reply => undef, 2903 reply => undef,
2748 tooltip => "Signs and other items you examined", 2904 tooltip => "Signs and other items you examined",
2905 },
2906 "c/shopinfo" => {
2907 id => "infobox",
2908 title => "Shop Info",
2909 reply => undef,
2910 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2911 },
2750 "c/book" => { 2912 "c/book" => {
2751 id => "infobox", 2913 id => "infobox",
2752 title => "Book", 2914 title => "Book",
2753 reply => undef, 2915 reply => undef,
… …
2781 id => "infobox", 2943 id => "infobox",
2782 title => "Skills", 2944 title => "Skills",
2783 reply => undef, 2945 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 2946 tooltip => "Shows your experience per skill and item power",
2785 }, 2947 },
2948 "c/shopitems" => {
2949 id => "infobox",
2950 title => "Shop Items",
2951 reply => undef,
2952 tooltip => "Shows the items currently for sale in this shop",
2953 },
2786 "c/resistances" => { 2954 "c/resistances" => {
2787 id => "infobox", 2955 id => "infobox",
2788 title => "Resistances", 2956 title => "Resistances",
2789 reply => undef, 2957 reply => undef,
2790 tooltip => "Shows your resistances", 2958 tooltip => "Shows your resistances",
… …
2792 "c/pets" => { 2960 "c/pets" => {
2793 id => "infobox", 2961 id => "infobox",
2794 title => "Pets", 2962 title => "Pets",
2795 reply => undef, 2963 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet", 2964 tooltip => "Shows information abotu your pets/a specific pet",
2965 },
2966 "c/perceiveself" => {
2967 id => "infobox",
2968 title => "Perceive Self",
2969 reply => undef,
2970 tooltip => "You gained detailed knowledge about yourself",
2797 }, 2971 },
2798 "c/uptime" => { 2972 "c/uptime" => {
2799 id => "infobox", 2973 id => "infobox",
2800 title => "Uptime", 2974 title => "Uptime",
2801 reply => undef, 2975 reply => undef,
… …
2857 my $pkt = "msg " 3031 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3032 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3033 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3034 );
2861 3035
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); 3036 $self->send_big_packet ($pkt);
2873} 3037}
2874 3038
2875=item $client->ext_msg ($type, @msg) 3039=item $client->ext_msg ($type, @msg)
2876 3040
2877Sends an ext event to the client. 3041Sends an ext event to the client.
… …
2880 3044
2881sub cf::client::ext_msg($$@) { 3045sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3046 my ($self, $type, @msg) = @_;
2883 3047
2884 if ($self->extcmd == 2) { 3048 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3050 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3051 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3052 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3053 }
2890} 3054}
2891 3055
2892=item $client->ext_reply ($msgid, @msg) 3056=item $client->ext_reply ($msgid, @msg)
2893 3057
… …
2897 3061
2898sub cf::client::ext_reply($$@) { 3062sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3063 my ($self, $id, @msg) = @_;
2900 3064
2901 if ($self->extcmd == 2) { 3065 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3066 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3067 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3068 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3069 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3071 }
2908} 3072}
2909 3073
2910=item $success = $client->query ($flags, "text", \&cb) 3074=item $success = $client->query ($flags, "text", \&cb)
2911 3075
… …
3012 3176
3013 $coro 3177 $coro
3014} 3178}
3015 3179
3016cf::client->attach ( 3180cf::client->attach (
3017 on_destroy => sub { 3181 on_client_destroy => sub {
3018 my ($ns) = @_; 3182 my ($ns) = @_;
3019 3183
3020 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3184 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3021 }, 3185 },
3022); 3186);
… …
3038our $safe_hole = new Safe::Hole; 3202our $safe_hole = new Safe::Hole;
3039 3203
3040$SIG{FPE} = 'IGNORE'; 3204$SIG{FPE} = 'IGNORE';
3041 3205
3042$safe->permit_only (Opcode::opset qw( 3206$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3207 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3208 grepstart grepwhile mapstart mapwhile
3045 sort time 3209 sort time
3046)); 3210));
3047 3211
3048# here we export the classes and methods available to script code 3212# here we export the classes and methods available to script code
… …
3052The following functions and methods are available within a safe environment: 3216The following functions and methods are available within a safe environment:
3053 3217
3054 cf::object 3218 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3219 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3220 insert remove name archname title slaying race decrease split
3221 value
3057 3222
3058 cf::object::player 3223 cf::object::player
3059 player 3224 player
3060 3225
3061 cf::player 3226 cf::player
… …
3067=cut 3232=cut
3068 3233
3069for ( 3234for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3235 ["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 3236 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3237 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3238 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3239 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3240 ["cf::map" => qw(trigger)],
3076) { 3241) {
3077 no strict 'refs'; 3242 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3243 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3244 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3097 3262
3098 my $qcode = $code; 3263 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3264 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3265 $qcode =~ s/\n/\\n/g;
3101 3266
3267 %vars = (_dummy => 0) unless %vars;
3268
3269 my @res;
3102 local $_; 3270 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3271
3105 my $eval = 3272 my $eval =
3106 "do {\n" 3273 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3274 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3275 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3276 . $code
3110 . "\n}" 3277 . "\n}"
3111 ; 3278 ;
3112 3279
3280 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3281 sub_generation_inc;
3282 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3283 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 sub_generation_inc; 3284 sub_generation_inc;
3285 } else {
3286 local @cf::_safe_eval_args = values %vars;
3287 @res = wantarray ? eval eval : scalar eval $eval;
3288 }
3116 3289
3117 if ($@) { 3290 if ($@) {
3118 warn "$@"; 3291 warn "$@";
3119 warn "while executing safe code '$code'\n"; 3292 warn "while executing safe code '$code'\n";
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3293 warn "with arguments " . (join " ", %vars) . "\n";
… …
3139=cut 3312=cut
3140 3313
3141sub register_script_function { 3314sub register_script_function {
3142 my ($fun, $cb) = @_; 3315 my ($fun, $cb) = @_;
3143 3316
3144 no strict 'refs'; 3317 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3318 *$fun = $safe_hole->wrap ($cb);
3146} 3319}
3147 3320
3148=back 3321=back
3149 3322
3150=cut 3323=cut
… …
3171 3344
3172 $facedata->{version} == 2 3345 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3346 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3347
3175 # patch in the exptable 3348 # patch in the exptable
3349 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3176 $facedata->{resource}{"res/exp_table"} = { 3350 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3351 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3352 data => $exp_table,
3353 hash => (Digest::MD5::md5 $exp_table),
3179 }; 3354 };
3180 cf::cede_to_tick; 3355 cf::cede_to_tick;
3181 3356
3182 { 3357 {
3183 my $faces = $facedata->{faceinfo}; 3358 my $faces = $facedata->{faceinfo};
… …
3185 while (my ($face, $info) = each %$faces) { 3360 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3361 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3362
3188 cf::face::set_visibility $idx, $info->{visibility}; 3363 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3364 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3365 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3366 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3192 3367
3193 cf::cede_to_tick; 3368 cf::cede_to_tick;
3194 } 3369 }
3195 3370
3196 while (my ($face, $info) = each %$faces) { 3371 while (my ($face, $info) = each %$faces) {
… …
3220 3395
3221 cf::anim::invalidate_all; # d'oh 3396 cf::anim::invalidate_all; # d'oh
3222 } 3397 }
3223 3398
3224 { 3399 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3400 my $res = $facedata->{resource};
3228 3401
3229 while (my ($name, $info) = each %$res) { 3402 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3403 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3404 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3405
3234 if ($info->{type} & 1) { 3406 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}; 3407 cf::face::set_type $idx, $info->{type};
3249 } else { 3408 } else {
3250 $RESOURCE{$name} = $info; 3409 $RESOURCE{$name} = $info;
3251 } 3410 }
3252 3411
… …
3336 3495
3337 warn "finished reloading resource files\n"; 3496 warn "finished reloading resource files\n";
3338} 3497}
3339 3498
3340sub reload_config { 3499sub reload_config {
3500 warn "reloading config file...\n";
3501
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3502 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3503 or return;
3343 3504
3344 local $/; 3505 local $/;
3345 *CFG = YAML::Load <$fh>; 3506 *CFG = YAML::XS::Load scalar <$fh>;
3346 3507
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3508 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3348 3509
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3510 $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}; 3511 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3515 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3516 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3517 };
3357 warn $@ if $@; 3518 warn $@ if $@;
3358 } 3519 }
3520
3521 warn "finished reloading resource files\n";
3359} 3522}
3360 3523
3361sub pidfile() { 3524sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3525 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3526 or die "$PIDFILE: $!";
… …
3375 3538
3376 seek $fh, 0, 0; 3539 seek $fh, 0, 0;
3377 print $fh $$; 3540 print $fh $$;
3378} 3541}
3379 3542
3543sub main_loop {
3544 warn "EV::loop starting\n";
3545 if (1) {
3546 EV::loop;
3547 }
3548 warn "EV::loop returned\n";
3549 goto &main_loop unless $REALLY_UNLOOP;
3550}
3551
3380sub main { 3552sub main {
3381 cf::init_globals; # initialise logging 3553 cf::init_globals; # initialise logging
3382 3554
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3555 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3556 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3557 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3558 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 3559
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3560 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394 3561
3395 # we must not ever block the main coroutine 3562 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3563 local $Coro::idle = sub {
… …
3402 }; 3569 };
3403 3570
3404 evthread_start IO::AIO::poll_fileno; 3571 evthread_start IO::AIO::poll_fileno;
3405 3572
3406 cf::sync_job { 3573 cf::sync_job {
3574 cf::init_experience;
3575 cf::init_anim;
3576 cf::init_attackmess;
3577 cf::init_dynamic;
3578
3579 cf::load_settings;
3580 cf::load_materials;
3581
3407 reload_resources; 3582 reload_resources;
3408 reload_config; 3583 reload_config;
3409 db_init; 3584 db_init;
3410 3585
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3586 cf::init_uuid;
3414 cf::init_signals; 3587 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills; 3588 cf::init_skills;
3417 3589
3418 cf::init_beforeplay; 3590 cf::init_beforeplay;
3419 3591
3420 atomic; 3592 atomic;
… …
3422 load_extensions; 3594 load_extensions;
3423 3595
3424 utime time, time, $RUNTIMEFILE; 3596 utime time, time, $RUNTIMEFILE;
3425 3597
3426 # no (long-running) fork's whatsoever before this point(!) 3598 # no (long-running) fork's whatsoever before this point(!)
3599 use POSIX ();
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3600 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428 3601
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3602 (pop @POST_INIT)->(0) while @POST_INIT;
3430 }; 3603 };
3431 3604
3432 EV::loop; 3605 cf::object::thawer::errors_are_fatal 0;
3606 warn "parse errors in files are no longer fatal from this point on.\n";
3607
3608 main_loop;
3433} 3609}
3434 3610
3435############################################################################# 3611#############################################################################
3436# initialisation and cleanup 3612# initialisation and cleanup
3437 3613
3438# install some emergency cleanup handlers 3614# install some emergency cleanup handlers
3439BEGIN { 3615BEGIN {
3440 our %SIGWATCHER = (); 3616 our %SIGWATCHER = ();
3441 for my $signal (qw(INT HUP TERM)) { 3617 for my $signal (qw(INT HUP TERM)) {
3442 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3618 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3443 cf::cleanup "SIG$signal"; 3619 cf::cleanup "SIG$signal";
3444 }; 3620 };
3445 } 3621 }
3446} 3622}
3447 3623
3448sub write_runtime_sync { 3624sub write_runtime_sync {
3625 my $t0 = AE::time;
3626
3449 # first touch the runtime file to show we are still running: 3627 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3628 # the fsync below can take a very very long time.
3451 3629
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3630 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3631
3454 my $guard = cf::lock_acquire "write_runtime"; 3632 my $guard = cf::lock_acquire "write_runtime";
3455 3633
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3634 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3635 or return;
3458 3636
3459 my $value = $cf::RUNTIME + 90 + 10; 3637 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3638 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3639 # 60 allows for the watchdog to kill the server.
… …
3474 or return; 3652 or return;
3475 3653
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3654 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3655 and return;
3478 3656
3479 warn "runtime file written.\n"; 3657 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3480 3658
3481 1 3659 1
3482} 3660}
3483 3661
3484our $uuid_lock; 3662our $uuid_lock;
… …
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3788 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) { 3789 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"}; 3790 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3791# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 } 3792 }
3615 warn "cleared package $pkg\n";#d#
3616} 3793}
3617 3794
3618sub do_reload_perl() { 3795sub do_reload_perl() {
3619 # can/must only be called in main 3796 # can/must only be called in main
3620 if ($Coro::current != $Coro::main) { 3797 if ($Coro::current != $Coro::main) {
… …
3622 return; 3799 return;
3623 } 3800 }
3624 3801
3625 return if $RELOAD++; 3802 return if $RELOAD++;
3626 3803
3627 my $t1 = EV::time; 3804 my $t1 = AE::time;
3628 3805
3629 while ($RELOAD) { 3806 while ($RELOAD) {
3630 warn "reloading..."; 3807 warn "reloading...";
3631 3808
3632 warn "entering sync_job"; 3809 warn "entering sync_job";
… …
3693 clear_package "safe::$_" 3870 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3871 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3872
3696 warn "unloading cf.pm \"a bit\""; 3873 warn "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3874 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3875 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3876
3700 # don't, removes xs symbols, too, 3877 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3878 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3879 #clear_package __PACKAGE__;
3703 3880
3704 warn "unload completed, starting to reload now"; 3881 warn "unload completed, starting to reload now";
3705 3882
3706 warn "reloading cf.pm"; 3883 warn "reloading cf.pm";
3707 require cf; 3884 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3885 cf::_connect_to_perl_1;
3709 3886
3710 warn "loading config and database again"; 3887 warn "loading config and database again";
3711 cf::reload_config; 3888 cf::reload_config;
3712 3889
3713 warn "loading extensions"; 3890 warn "loading extensions";
… …
3735 3912
3736 warn "reloaded"; 3913 warn "reloaded";
3737 --$RELOAD; 3914 --$RELOAD;
3738 } 3915 }
3739 3916
3740 $t1 = EV::time - $t1; 3917 $t1 = AE::time - $t1;
3741 warn "reload completed in ${t1}s\n"; 3918 warn "reload completed in ${t1}s\n";
3742}; 3919};
3743 3920
3744our $RELOAD_WATCHER; # used only during reload 3921our $RELOAD_WATCHER; # used only during reload
3745 3922
… …
3748 # coro crashes during coro_state_free->destroy here. 3925 # coro crashes during coro_state_free->destroy here.
3749 3926
3750 $RELOAD_WATCHER ||= cf::async { 3927 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions; 3928 Coro::AIO::aio_wait cache_extensions;
3752 3929
3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3930 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl; 3931 do_reload_perl;
3755 undef $RELOAD_WATCHER; 3932 undef $RELOAD_WATCHER;
3756 }; 3933 };
3757 }; 3934 };
3758} 3935}
… …
3775 3952
3776our @WAIT_FOR_TICK; 3953our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 3954our @WAIT_FOR_TICK_BEGIN;
3778 3955
3779sub wait_for_tick { 3956sub wait_for_tick {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3957 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3958
3782 my $signal = new Coro::Signal; 3959 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 3960 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 3961 $signal->wait;
3785} 3962}
3786 3963
3787sub wait_for_tick_begin { 3964sub wait_for_tick_begin {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 3966
3790 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 3968 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 3969 $signal->wait;
3793} 3970}
… …
3798 unless ++$bug_warning > 10; 3975 unless ++$bug_warning > 10;
3799 return; 3976 return;
3800 } 3977 }
3801 3978
3802 cf::server_tick; # one server iteration 3979 cf::server_tick; # one server iteration
3980
3981 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3803 3982
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3983 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3984 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3806 Coro::async_pool { 3985 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 3986 $Coro::current->{desc} = "runtime saver";
… …
3830} 4009}
3831 4010
3832{ 4011{
3833 # configure BDB 4012 # configure BDB
3834 4013
3835 BDB::min_parallel 8; 4014 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 4015 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 4016 $AnyEvent::BDB::WATCHER->priority (1);
3838 4017
3839 unless ($DB_ENV) { 4018 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 4019 $DB_ENV = BDB::db_env_create;
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4099 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 4100 }
3922} 4101}
3923 4102
3924# load additional modules 4103# load additional modules
3925use cf::pod; 4104require "cf/$_.pm" for @EXTRA_MODULES;
4105cf::_connect_to_perl_2;
3926 4106
3927END { cf::emergency_save } 4107END { cf::emergency_save }
3928 4108
39291 41091
3930 4110

Diff Legend

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