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.469 by root, Mon Mar 2 22:25:19 2009 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
117our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
118 127
119our %CFG; 128our %CFG;
120 129
121our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 131our $RUNTIME;
… …
134our $JITTER; # average jitter 143our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
136 145
137our @POST_INIT; 146our @POST_INIT;
138 147
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
140 150
141binmode STDOUT; 151binmode STDOUT;
142binmode STDERR; 152binmode STDERR;
143 153
144# read virtual server time, if available 154# read virtual server time, if available
… …
155 165
156our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
157 167
158sub cf::map::normalise; 168sub cf::map::normalise;
159 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::"} };
184
160############################################################################# 185#############################################################################
161 186
162=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
163 188
164=over 4 189=over 4
… …
210returns 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
211per 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.
212 237
213=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
214 239
215This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 242that call.
218 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
219=back 250=back
220 251
221=cut 252=cut
222 253
223BEGIN { 254$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 255 my $msg = join "", @_;
226 256
227 $msg .= "\n" 257 $msg .= "\n"
228 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
229 259
230 $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;
231 261
232 LOG llevError, $msg; 262 LOG llevError, $msg;
233 }; 263};
234}
235 264
236$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
238 267
239 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 272 return;#d#
242 }#d# 273 }#d#
243 274
244 # kill coroutine otherwise 275 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 276 Coro::terminate
247}; 277};
248
249$SIG{__DIE__} = sub { }; #d#?
250 278
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 296)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 298}
271 299
272$EV::DIED = sub { 300$EV::DIED = sub {
273 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
274}; 302};
275 303
276############################################################################# 304#############################################################################
277 305
278=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
375} 403}
376 404
377=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
378 406
379Like 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
380get spread over timer. 408get spread over time.
381 409
382=cut 410=cut
383 411
384sub periodic($$) { 412sub periodic($$) {
385 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
402 430
403=cut 431=cut
404 432
405our @SLOT_QUEUE; 433our @SLOT_QUEUE;
406our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
407 436
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
411 440
412 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
413 443
414 while () { 444 while () {
415 next_job: 445 next_job:
446
416 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 448
418 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 453 $job->[2]->send;
422 Coro::cede; 454 Coro::cede;
423 goto next_job; 455 goto next_job;
424 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 458 }
426 } 459 }
427 460
428 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 464 $signal->wait;
432 } else { 465 } else {
466 $busy = 0;
433 Coro::schedule; 467 Coro::schedule;
434 } 468 }
435 } 469 }
436}; 470};
437 471
438sub get_slot($;$$) { 472sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
440 474
441 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
442 476
443 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
444 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
445 480
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
475 510
476sub sync_job(&) { 511sub sync_job(&) {
477 my ($job) = @_; 512 my ($job) = @_;
478 513
479 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 515 my $time = AE::time;
481 516
482 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
484 519
485 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
502 } else { 537 } else {
503 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
504 } 539 }
505 } 540 }
506 541
507 my $time = EV::time - $time; 542 my $time = AE::time - $time;
508 543
509 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
510 545
511 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
512 } else { 547 } else {
… …
556 reset_signals; 591 reset_signals;
557 &$cb 592 &$cb
558 }, @args; 593 }, @args;
559 594
560 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 )
561} 607}
562 608
563=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
564 610
565=cut 611=cut
… …
1151 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1152 1198
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 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 }
1157 aio_close $fh; 1206 aio_close $fh;
1158 1207
1159 if (@$objs) { 1208 if (@$objs) {
1160 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) {
1161 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1164 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 }
1165 aio_close $fh; 1217 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1219 }
1168 } else { 1220 } else {
1169 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
… …
1276} 1328}
1277 1329
1278use File::Glob (); 1330use File::Glob ();
1279 1331
1280cf::player->attach ( 1332cf::player->attach (
1281 on_command => sub { 1333 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1283 1335
1284 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1285 or return; 1337 or return;
1286 1338
… …
1320 1372
1321# "readahead" all extensions 1373# "readahead" all extensions
1322sub cache_extensions { 1374sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1375 my $grp = IO::AIO::aio_group;
1324 1376
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1378 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1380 }
1329 }; 1381 };
1330 1382
… …
1365 . "\n};\n1"; 1417 . "\n};\n1";
1366 1418
1367 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1368 } 1420 }
1369 1421
1422 my $pass = 0;
1370 my %done; 1423 my %done;
1371 while (%todo) { 1424 while (%todo) {
1372 my $progress; 1425 my $progress;
1373 1426
1427 ++$pass;
1428
1429 ext:
1374 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1432 next ext
1377 unless exists $done{$_}; 1433 unless exists $done{$_};
1378 } 1434 }
1379 1435
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1437
1382 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1442
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1444 if exists $v->{meta}{mandatory};
1390 1445
1391 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;
1392 } 1455 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1456 }
1398 1457
1399 skip: 1458 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 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 }
1402 } 1466 }
1403 }; 1467 };
1404} 1468}
1405 1469
1406############################################################################# 1470#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1491 } 1555 }
1492 } 1556 }
1493} 1557}
1494 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
1495sub save($) { 1572sub save($) {
1496 my ($pl) = @_; 1573 my ($pl) = @_;
1497 1574
1498 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1499 1576
… …
1504 1581
1505 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1507 1584
1508 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];
1509 1589
1510 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1591 cf::cede_to_tick;
1512} 1592}
1513 1593
… …
1615 \@logins 1695 \@logins
1616} 1696}
1617 1697
1618=item $player->maps 1698=item $player->maps
1619 1699
1700=item cf::player::maps $login
1701
1620Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1621player. May block. 1703player. May block.
1622 1704
1623=cut 1705=cut
1624 1706
… …
1686=cut 1768=cut
1687 1769
1688sub find_by_path($) { 1770sub find_by_path($) {
1689 my ($path) = @_; 1771 my ($path) = @_;
1690 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1691 my ($match, $specificity); 1775 my ($match, $specificity);
1692 1776
1693 for my $region (list) { 1777 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1726 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
1727 1811
1728 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1813 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1982 2066
1983 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1984 } 2068 }
1985} 2069}
1986 2070
1987sub pre_load { } 2071sub pre_load { }
1988sub post_load { } 2072#sub post_load { } # XS
1989 2073
1990sub load { 2074sub load {
1991 my ($self) = @_; 2075 my ($self) = @_;
1992 2076
1993 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2134 }
2051 2135
2052 $self->post_load; 2136 $self->post_load;
2053} 2137}
2054 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
2055sub customise_for { 2142sub customise_for {
2056 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2057 2144
2058 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2146 if $self->per_player;
… …
2136 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2137 2224
2138 () 2225 ()
2139} 2226}
2140 2227
2228# common code, used by both ->save and ->swapout
2141sub save { 2229sub _save {
2142 my ($self) = @_; 2230 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2231
2146 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2147 2233
2148 return unless $self->dirty; 2234 return unless $self->dirty;
2149 2235
… …
2169 } else { 2255 } else {
2170 $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);
2171 } 2257 }
2172} 2258}
2173 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2174sub swap_out { 2268sub swap_out {
2175 my ($self) = @_; 2269 my ($self) = @_;
2176 2270
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2272
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2185 2276
2186 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2187
2188 $self->deactivate; 2278 $self->deactivate;
2189 $_->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
2190 $self->clear; 2286 $self->clear;
2191} 2287}
2192 2288
2193sub reset_at { 2289sub reset_at {
2194 my ($self) = @_; 2290 my ($self) = @_;
… …
2213 2309
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2311
2216 return if $self->players; 2312 return if $self->players;
2217 2313
2218 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2219 2315
2220 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2221 2317
2222 # need to save uniques path 2318 # need to save uniques path
2223 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
… …
2314 : normalise $_ 2410 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2412 ]
2317} 2413}
2318 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
2319=back 2447=back
2320 2448
2321=head3 cf::object 2449=head3 cf::object
2322 2450
2323=cut 2451=cut
… …
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2620
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2495 2623
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2625}
2498 2626
2499sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2501 2629
… …
2518 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2520 2648
2521 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2524 2652
2525 $map->load; 2653 $map->load;
2526 $map->load_neighbours; 2654 $map->load_neighbours;
2527 2655
2528 return unless $self->contr->active; 2656 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2657
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $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;
2534} 2663}
2535 2664
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2537 2666
2538Moves 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
… …
2726 2855
2727 utf8::encode $text; 2856 utf8::encode $text;
2728 $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);
2729} 2858}
2730 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
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2886
2733Send 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
2734client 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
2735the 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
… …
2737 2891
2738=cut 2892=cut
2739 2893
2740# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2742 "c/identify" => { 2902 "c/identify" => {
2743 id => "infobox", 2903 id => "infobox",
2744 title => "Identify", 2904 title => "Identify",
2745 reply => undef, 2905 reply => undef,
2746 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2908 "c/examine" => {
2749 id => "infobox", 2909 id => "infobox",
2750 title => "Examine", 2910 title => "Examine",
2751 reply => undef, 2911 reply => undef,
2752 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",
2753 }, 2919 },
2754 "c/book" => { 2920 "c/book" => {
2755 id => "infobox", 2921 id => "infobox",
2756 title => "Book", 2922 title => "Book",
2757 reply => undef, 2923 reply => undef,
… …
2785 id => "infobox", 2951 id => "infobox",
2786 title => "Skills", 2952 title => "Skills",
2787 reply => undef, 2953 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2954 tooltip => "Shows your experience per skill and item power",
2789 }, 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 },
2790 "c/resistances" => { 2962 "c/resistances" => {
2791 id => "infobox", 2963 id => "infobox",
2792 title => "Resistances", 2964 title => "Resistances",
2793 reply => undef, 2965 reply => undef,
2794 tooltip => "Shows your resistances", 2966 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2968 "c/pets" => {
2797 id => "infobox", 2969 id => "infobox",
2798 title => "Pets", 2970 title => "Pets",
2799 reply => undef, 2971 reply => undef,
2800 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",
2801 }, 2979 },
2802 "c/uptime" => { 2980 "c/uptime" => {
2803 id => "infobox", 2981 id => "infobox",
2804 title => "Uptime", 2982 title => "Uptime",
2805 reply => undef, 2983 reply => undef,
… …
2861 my $pkt = "msg " 3039 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3042 );
2865 3043
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2877} 3045}
2878 3046
2879=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2880 3048
2881Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2884 3052
2885sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2887 3055
2888 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3061 }
2894} 3062}
2895 3063
2896=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2897 3065
… …
2901 3069
2902sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2904 3072
2905 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3076 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3079 }
2912} 3080}
2913 3081
2914=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2915 3083
… …
3016 3184
3017 $coro 3185 $coro
3018} 3186}
3019 3187
3020cf::client->attach ( 3188cf::client->attach (
3021 on_destroy => sub { 3189 on_client_destroy => sub {
3022 my ($ns) = @_; 3190 my ($ns) = @_;
3023 3191
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3193 },
3026); 3194);
… …
3042our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3043 3211
3044$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3045 3213
3046$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3049 sort time 3217 sort time
3050)); 3218));
3051 3219
3052# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3106 3274
3107 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3108 3276
3277 my @res;
3109 local $_; 3278 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3279
3112 my $eval = 3280 my $eval =
3113 "do {\n" 3281 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3284 . $code
3117 . "\n}" 3285 . "\n}"
3118 ; 3286 ;
3119 3287
3288 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 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 }
3123 3297
3124 if ($@) { 3298 if ($@) {
3125 warn "$@"; 3299 warn "$@";
3126 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3146=cut 3320=cut
3147 3321
3148sub register_script_function { 3322sub register_script_function {
3149 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3150 3324
3151 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3153} 3327}
3154 3328
3155=back 3329=back
3156 3330
3157=cut 3331=cut
… …
3178 3352
3179 $facedata->{version} == 2 3353 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3355
3182 # 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]);
3183 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3359 type => FT_RSRC,
3185 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),
3186 }; 3362 };
3187 cf::cede_to_tick; 3363 cf::cede_to_tick;
3188 3364
3189 { 3365 {
3190 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3192 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3370
3195 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3375
3200 cf::cede_to_tick; 3376 cf::cede_to_tick;
3201 } 3377 }
3202 3378
3203 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3227 3403
3228 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3229 } 3405 }
3230 3406
3231 { 3407 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3235 3409
3236 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3413
3241 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3256 } else { 3416 } else {
3257 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3258 } 3418 }
3259 3419
… …
3343 3503
3344 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3345} 3505}
3346 3506
3347sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3511 or return;
3350 3512
3351 local $/; 3513 local $/;
3352 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3353 3515
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3355 3517
3356 $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};
3357 $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};
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3525 };
3364 warn $@ if $@; 3526 warn $@ if $@;
3365 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3366} 3530}
3367 3531
3368sub pidfile() { 3532sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
… …
3382 3546
3383 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3384 print $fh $$; 3548 print $fh $$;
3385} 3549}
3386 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
3387sub main { 3560sub main {
3388 cf::init_globals; # initialise logging 3561 cf::init_globals; # initialise logging
3389 3562
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 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.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3567
3400 $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
3401 3569
3402 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3409 }; 3577 };
3410 3578
3411 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3412 3580
3413 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
3414 reload_resources; 3590 reload_resources;
3415 reload_config; 3591 reload_config;
3416 db_init; 3592 db_init;
3417 3593
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3594 cf::init_uuid;
3421 cf::init_signals; 3595 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3596 cf::init_skills;
3424 3597
3425 cf::init_beforeplay; 3598 cf::init_beforeplay;
3426 3599
3427 atomic; 3600 atomic;
… …
3429 load_extensions; 3602 load_extensions;
3430 3603
3431 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3432 3605
3433 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3434 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};
3435 3609
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3611 };
3438 3612
3439 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;
3440} 3617}
3441 3618
3442############################################################################# 3619#############################################################################
3443# initialisation and cleanup 3620# initialisation and cleanup
3444 3621
3445# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3446BEGIN { 3623BEGIN {
3447 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3451 }; 3628 };
3452 } 3629 }
3453} 3630}
3454 3631
3455sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3456 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3458 3637
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3639
3461 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3462 3641
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3643 or return;
3465 3644
3466 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3481 or return; 3660 or return;
3482 3661
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3663 and return;
3485 3664
3486 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3666
3488 1 3667 1
3489} 3668}
3490 3669
3491our $uuid_lock; 3670our $uuid_lock;
… …
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3800 }
3622 warn "cleared package $pkg\n";#d#
3623} 3801}
3624 3802
3625sub do_reload_perl() { 3803sub do_reload_perl() {
3626 # can/must only be called in main 3804 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3628 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3629 return; 3807 return;
3630 } 3808 }
3631 3809
3632 return if $RELOAD++; 3810 return if $RELOAD++;
3633 3811
3634 my $t1 = EV::time; 3812 my $t1 = AE::time;
3635 3813
3636 while ($RELOAD) { 3814 while ($RELOAD) {
3637 warn "reloading..."; 3815 warn "reloading...";
3638 3816
3639 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3710 3888
3711 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3712 3890
3713 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3714 require cf; 3892 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3716 3894
3717 warn "loading config and database again"; 3895 warn "loading config and database again";
3718 cf::reload_config; 3896 cf::reload_config;
3719 3897
3720 warn "loading extensions"; 3898 warn "loading extensions";
… …
3742 3920
3743 warn "reloaded"; 3921 warn "reloaded";
3744 --$RELOAD; 3922 --$RELOAD;
3745 } 3923 }
3746 3924
3747 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3749}; 3927};
3750 3928
3751our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3752 3930
… …
3755 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3756 3934
3757 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3759 3937
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3939 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3763 }; 3941 };
3764 }; 3942 };
3765} 3943}
… …
3782 3960
3783our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3785 3963
3786sub wait_for_tick { 3964sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 3966
3789 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 3969 $signal->wait;
3792} 3970}
3793 3971
3794sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 3974
3797 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 3977 $signal->wait;
3800} 3978}
… …
3805 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3806 return; 3984 return;
3807 } 3985 }
3808 3986
3809 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#
3810 3990
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $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.;
3813 Coro::async_pool { 3993 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3837} 4017}
3838 4018
3839{ 4019{
3840 # configure BDB 4020 # configure BDB
3841 4021
3842 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3845 4025
3846 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
… …
3928 } 4108 }
3929} 4109}
3930 4110
3931# load additional modules 4111# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3933 4114
3934END { cf::emergency_save } 4115END { cf::emergency_save }
3935 4116
39361 41171
3937 4118

Diff Legend

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