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.470 by root, Sun Apr 26 19:42:45 2009 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 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
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1807
1728 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1809 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1982 2062
1983 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
1984 } 2064 }
1985} 2065}
1986 2066
1987sub pre_load { } 2067sub pre_load { }
1988sub post_load { } 2068#sub post_load { } # XS
1989 2069
1990sub load { 2070sub load {
1991 my ($self) = @_; 2071 my ($self) = @_;
1992 2072
1993 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2130 }
2051 2131
2052 $self->post_load; 2132 $self->post_load;
2053} 2133}
2054 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2055sub customise_for { 2138sub customise_for {
2056 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2057 2140
2058 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2142 if $self->per_player;
… …
2136 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2137 2220
2138 () 2221 ()
2139} 2222}
2140 2223
2224# common code, used by both ->save and ->swapout
2141sub save { 2225sub _save {
2142 my ($self) = @_; 2226 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2227
2146 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2147 2229
2148 return unless $self->dirty; 2230 return unless $self->dirty;
2149 2231
… …
2169 } else { 2251 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2253 }
2172} 2254}
2173 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2174sub swap_out { 2264sub swap_out {
2175 my ($self) = @_; 2265 my ($self) = @_;
2176 2266
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2268
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2185 2272
2186 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2187
2188 $self->deactivate; 2274 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2190 $self->clear; 2282 $self->clear;
2191} 2283}
2192 2284
2193sub reset_at { 2285sub reset_at {
2194 my ($self) = @_; 2286 my ($self) = @_;
… …
2213 2305
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2307
2216 return if $self->players; 2308 return if $self->players;
2217 2309
2218 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2219 2311
2220 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2221 2313
2222 # need to save uniques path 2314 # need to save uniques path
2223 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
… …
2314 : normalise $_ 2406 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2408 ]
2317} 2409}
2318 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2319=back 2443=back
2320 2444
2321=head3 cf::object 2445=head3 cf::object
2322 2446
2323=cut 2447=cut
… …
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2616
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2495 2619
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2621}
2498 2622
2499sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2501 2625
… …
2518 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2520 2644
2521 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2524 2648
2525 $map->load; 2649 $map->load;
2526 $map->load_neighbours; 2650 $map->load_neighbours;
2527 2651
2528 return unless $self->contr->active; 2652 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2653
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2534} 2659}
2535 2660
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2537 2662
2538Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
… …
2726 2851
2727 utf8::encode $text; 2852 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2854}
2730 2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2879}
2880
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2882
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send 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 2884client 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 2885the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2737 2887
2738=cut 2888=cut
2739 2889
2740# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2742 "c/identify" => { 2898 "c/identify" => {
2743 id => "infobox", 2899 id => "infobox",
2744 title => "Identify", 2900 title => "Identify",
2745 reply => undef, 2901 reply => undef,
2746 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2904 "c/examine" => {
2749 id => "infobox", 2905 id => "infobox",
2750 title => "Examine", 2906 title => "Examine",
2751 reply => undef, 2907 reply => undef,
2752 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2915 },
2754 "c/book" => { 2916 "c/book" => {
2755 id => "infobox", 2917 id => "infobox",
2756 title => "Book", 2918 title => "Book",
2757 reply => undef, 2919 reply => undef,
… …
2803 id => "infobox", 2965 id => "infobox",
2804 title => "Pets", 2966 title => "Pets",
2805 reply => undef, 2967 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet", 2968 tooltip => "Shows information abotu your pets/a specific pet",
2807 }, 2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2808 "c/uptime" => { 2976 "c/uptime" => {
2809 id => "infobox", 2977 id => "infobox",
2810 title => "Uptime", 2978 title => "Uptime",
2811 reply => undef, 2979 reply => undef,
2812 tooltip => "How long the server has been running since last restart", 2980 tooltip => "How long the server has been running since last restart",
… …
2867 my $pkt = "msg " 3035 my $pkt = "msg "
2868 . $self->{json_coder}->encode ( 3036 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 ); 3038 );
2871 3039
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 (8192 < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt); 3040 $self->send_big_packet ($pkt);
2883} 3041}
2884 3042
2885=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2886 3044
2887Sends an ext event to the client. 3045Sends an ext event to the client.
… …
2890 3048
2891sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2892 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2893 3051
2894 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2897 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3057 }
2900} 3058}
2901 3059
2902=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2903 3061
… …
2907 3065
2908sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2910 3068
2911 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove 3072 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 } 3075 }
2918} 3076}
2919 3077
2920=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2921 3079
… …
3022 3180
3023 $coro 3181 $coro
3024} 3182}
3025 3183
3026cf::client->attach ( 3184cf::client->attach (
3027 on_destroy => sub { 3185 on_client_destroy => sub {
3028 my ($ns) = @_; 3186 my ($ns) = @_;
3029 3187
3030 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031 }, 3189 },
3032); 3190);
… …
3048our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3049 3207
3050$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3051 3209
3052$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3053 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3054 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3055 sort time 3213 sort time
3056)); 3214));
3057 3215
3058# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
… …
3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3111 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3112 3270
3113 %vars = (_dummy => 0) unless %vars; 3271 %vars = (_dummy => 0) unless %vars;
3114 3272
3273 my @res;
3115 local $_; 3274 local $_;
3116 local @safe::cf::_safe_eval_args = values %vars;
3117 3275
3118 my $eval = 3276 my $eval =
3119 "do {\n" 3277 "do {\n"
3120 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3122 . $code 3280 . $code
3123 . "\n}" 3281 . "\n}"
3124 ; 3282 ;
3125 3283
3284 if ($CFG{safe_eval}) {
3126 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3127 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3129 3293
3130 if ($@) { 3294 if ($@) {
3131 warn "$@"; 3295 warn "$@";
3132 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3133 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
… …
3152=cut 3316=cut
3153 3317
3154sub register_script_function { 3318sub register_script_function {
3155 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3156 3320
3157 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3158 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3159} 3323}
3160 3324
3161=back 3325=back
3162 3326
3163=cut 3327=cut
… …
3184 3348
3185 $facedata->{version} == 2 3349 $facedata->{version} == 2
3186 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3187 3351
3188 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3190 type => FT_RSRC, 3355 type => FT_RSRC,
3191 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3192 }; 3358 };
3193 cf::cede_to_tick; 3359 cf::cede_to_tick;
3194 3360
3195 { 3361 {
3196 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
… …
3198 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3199 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200 3366
3201 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3202 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3203 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3205 3371
3206 cf::cede_to_tick; 3372 cf::cede_to_tick;
3207 } 3373 }
3208 3374
3209 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
… …
3233 3399
3234 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3235 } 3401 }
3236 3402
3237 { 3403 {
3238 # TODO: for gcfclient pleasure, we should give resources
3239 # that gcfclient doesn't grok a >10000 face index.
3240 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3241 3405
3242 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3244 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245 my $data;
3246 3409
3247 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3248 # prepend meta info
3249
3250 my $meta = $enc->encode ({
3251 name => $name,
3252 %{ $info->{meta} || {} },
3253 });
3254
3255 $data = pack "(w/a*)*", $meta, $info->{data};
3256 } else {
3257 $data = $info->{data};
3258 }
3259
3260 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3262 } else { 3412 } else {
3263 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3264 } 3414 }
3265 3415
… …
3349 3499
3350 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3351} 3501}
3352 3502
3353sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3507 or return;
3356 3508
3357 local $/; 3509 local $/;
3358 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3359 3511
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3361 3513
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3521 };
3370 warn $@ if $@; 3522 warn $@ if $@;
3371 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3372} 3526}
3373 3527
3374sub pidfile() { 3528sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3530 or die "$PIDFILE: $!";
… …
3388 3542
3389 seek $fh, 0, 0; 3543 seek $fh, 0, 0;
3390 print $fh $$; 3544 print $fh $$;
3391} 3545}
3392 3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3554}
3555
3393sub main { 3556sub main {
3394 cf::init_globals; # initialise logging 3557 cf::init_globals; # initialise logging
3395 3558
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405 3563
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407 3565
3408 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3409 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
… …
3415 }; 3573 };
3416 3574
3417 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3418 3576
3419 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3420 reload_resources; 3586 reload_resources;
3421 reload_config; 3587 reload_config;
3422 db_init; 3588 db_init;
3423 3589
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid; 3590 cf::init_uuid;
3427 cf::init_signals; 3591 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills; 3592 cf::init_skills;
3430 3593
3431 cf::init_beforeplay; 3594 cf::init_beforeplay;
3432 3595
3433 atomic; 3596 atomic;
… …
3435 load_extensions; 3598 load_extensions;
3436 3599
3437 utime time, time, $RUNTIMEFILE; 3600 utime time, time, $RUNTIMEFILE;
3438 3601
3439 # no (long-running) fork's whatsoever before this point(!) 3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441 3605
3442 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3443 }; 3607 };
3444 3608
3445 EV::loop; 3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3446} 3613}
3447 3614
3448############################################################################# 3615#############################################################################
3449# initialisation and cleanup 3616# initialisation and cleanup
3450 3617
3451# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3452BEGIN { 3619BEGIN {
3453 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3454 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3455 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3456 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3457 }; 3624 };
3458 } 3625 }
3459} 3626}
3460 3627
3461sub write_runtime_sync { 3628sub write_runtime_sync {
3629 my $t0 = AE::time;
3630
3462 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3463 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3464 3633
3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466 3635
3467 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3468 3637
3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470 or return; 3639 or return;
3471 3640
3472 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3473 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3474 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
… …
3487 or return; 3656 or return;
3488 3657
3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490 and return; 3659 and return;
3491 3660
3492 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493 3662
3494 1 3663 1
3495} 3664}
3496 3665
3497our $uuid_lock; 3666our $uuid_lock;
… …
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3796 }
3628 warn "cleared package $pkg\n";#d#
3629} 3797}
3630 3798
3631sub do_reload_perl() { 3799sub do_reload_perl() {
3632 # can/must only be called in main 3800 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3634 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3635 return; 3803 return;
3636 } 3804 }
3637 3805
3638 return if $RELOAD++; 3806 return if $RELOAD++;
3639 3807
3640 my $t1 = EV::time; 3808 my $t1 = AE::time;
3641 3809
3642 while ($RELOAD) { 3810 while ($RELOAD) {
3643 warn "reloading..."; 3811 warn "reloading...";
3644 3812
3645 warn "entering sync_job"; 3813 warn "entering sync_job";
… …
3716 3884
3717 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3718 3886
3719 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3720 require cf; 3888 require cf;
3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3722 3890
3723 warn "loading config and database again"; 3891 warn "loading config and database again";
3724 cf::reload_config; 3892 cf::reload_config;
3725 3893
3726 warn "loading extensions"; 3894 warn "loading extensions";
… …
3748 3916
3749 warn "reloaded"; 3917 warn "reloaded";
3750 --$RELOAD; 3918 --$RELOAD;
3751 } 3919 }
3752 3920
3753 $t1 = EV::time - $t1; 3921 $t1 = AE::time - $t1;
3754 warn "reload completed in ${t1}s\n"; 3922 warn "reload completed in ${t1}s\n";
3755}; 3923};
3756 3924
3757our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3758 3926
… …
3761 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3762 3930
3763 $RELOAD_WATCHER ||= cf::async { 3931 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions; 3932 Coro::AIO::aio_wait cache_extensions;
3765 3933
3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767 do_reload_perl; 3935 do_reload_perl;
3768 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3769 }; 3937 };
3770 }; 3938 };
3771} 3939}
… …
3788 3956
3789our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3790our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3791 3959
3792sub wait_for_tick { 3960sub wait_for_tick {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3962
3795 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3797 $signal->wait; 3965 $signal->wait;
3798} 3966}
3799 3967
3800sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3801 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802 3970
3803 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3804 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3805 $signal->wait; 3973 $signal->wait;
3806} 3974}
… …
3811 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3812 return; 3980 return;
3813 } 3981 }
3814 3982
3815 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3816 3986
3817 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819 Coro::async_pool { 3989 Coro::async_pool {
3820 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
… …
3843} 4013}
3844 4014
3845{ 4015{
3846 # configure BDB 4016 # configure BDB
3847 4017
3848 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3849 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3850 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3851 4021
3852 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3853 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
… …
3934 } 4104 }
3935} 4105}
3936 4106
3937# load additional modules 4107# load additional modules
3938require "cf/$_.pm" for @EXTRA_MODULES; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3939 4110
3940END { cf::emergency_save } 4111END { cf::emergency_save }
3941 4112
39421 41131
3943 4114

Diff Legend

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