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.520 by root, Fri Apr 16 02:37:50 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
… …
157 167
158sub cf::map::normalise; 168sub cf::map::normalise;
159 169
160############################################################################# 170#############################################################################
161 171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
180
181#############################################################################
182
162=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
163 184
164=over 4 185=over 4
165 186
166=item $cf::UPTIME 187=item $cf::UPTIME
… …
210returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 233
213=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
214 235
215This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 238that call.
218 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
219=back 246=back
220 247
221=cut 248=cut
222 249
223BEGIN { 250$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 251 my $msg = join "", @_;
226 252
227 $msg .= "\n" 253 $msg .= "\n"
228 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
229 255
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 257
232 LOG llevError, $msg; 258 LOG llevError, $msg;
233 }; 259};
234}
235 260
236$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
238 265
239 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 268 return;#d#
242 }#d# 269 }#d#
243 270
244 # kill coroutine otherwise 271 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 272 Coro::terminate
247}; 273};
248
249$SIG{__DIE__} = sub { }; #d#?
250 274
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 292)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 294}
271 295
272$EV::DIED = sub { 296$EV::DIED = sub {
273 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
274}; 298};
275 299
276############################################################################# 300#############################################################################
277 301
278=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
375} 399}
376 400
377=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
378 402
379Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 404get spread over time.
381 405
382=cut 406=cut
383 407
384sub periodic($$) { 408sub periodic($$) {
385 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
402 426
403=cut 427=cut
404 428
405our @SLOT_QUEUE; 429our @SLOT_QUEUE;
406our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
407 432
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
411 436
412 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
413 439
414 while () { 440 while () {
415 next_job: 441 next_job:
442
416 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 444
418 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 449 $job->[2]->send;
422 Coro::cede; 450 Coro::cede;
423 goto next_job; 451 goto next_job;
424 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 454 }
426 } 455 }
427 456
428 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 460 $signal->wait;
432 } else { 461 } else {
462 $busy = 0;
433 Coro::schedule; 463 Coro::schedule;
434 } 464 }
435 } 465 }
436}; 466};
437 467
438sub get_slot($;$$) { 468sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
440 470
441 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
442 472
443 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
444 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
445 476
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
475 506
476sub sync_job(&) { 507sub sync_job(&) {
477 my ($job) = @_; 508 my ($job) = @_;
478 509
479 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 511 my $time = AE::time;
481 512
482 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
484 515
485 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
502 } else { 533 } else {
503 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
504 } 535 }
505 } 536 }
506 537
507 my $time = EV::time - $time; 538 my $time = AE::time - $time;
508 539
509 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
510 541
511 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
512 } else { 543 } else {
… …
556 reset_signals; 587 reset_signals;
557 &$cb 588 &$cb
558 }, @args; 589 }, @args;
559 590
560 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
561} 603}
562 604
563=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
564 606
565=cut 607=cut
… …
1151 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1152 1194
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1200 aio_fsync $fh;
1201 }
1157 aio_close $fh; 1202 aio_close $fh;
1158 1203
1159 if (@$objs) { 1204 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1211 aio_fsync $fh;
1212 }
1165 aio_close $fh; 1213 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1215 }
1168 } else { 1216 } else {
1169 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
… …
1276} 1324}
1277 1325
1278use File::Glob (); 1326use File::Glob ();
1279 1327
1280cf::player->attach ( 1328cf::player->attach (
1281 on_command => sub { 1329 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1283 1331
1284 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1285 or return; 1333 or return;
1286 1334
… …
1320 1368
1321# "readahead" all extensions 1369# "readahead" all extensions
1322sub cache_extensions { 1370sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1371 my $grp = IO::AIO::aio_group;
1324 1372
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1374 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1376 }
1329 }; 1377 };
1330 1378
… …
1365 . "\n};\n1"; 1413 . "\n};\n1";
1366 1414
1367 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1368 } 1416 }
1369 1417
1418 my $pass = 0;
1370 my %done; 1419 my %done;
1371 while (%todo) { 1420 while (%todo) {
1372 my $progress; 1421 my $progress;
1373 1422
1423 ++$pass;
1424
1425 ext:
1374 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1428 next ext
1377 unless exists $done{$_}; 1429 unless exists $done{$_};
1378 } 1430 }
1379 1431
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1433
1382 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1438
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1440 if exists $v->{meta}{mandatory};
1390 1441 } else {
1391 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1392 } 1448 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1449 }
1398 1450
1399 skip: 1451 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1402 } 1459 }
1403 }; 1460 };
1404} 1461}
1405 1462
1406############################################################################# 1463#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1491 } 1548 }
1492 } 1549 }
1493} 1550}
1494 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1495sub save($) { 1565sub save($) {
1496 my ($pl) = @_; 1566 my ($pl) = @_;
1497 1567
1498 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1499 1569
… …
1504 1574
1505 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1507 1577
1508 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1582
1510 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1584 cf::cede_to_tick;
1512} 1585}
1513 1586
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1800
1728 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1802 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1982 2055
1983 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1984 } 2057 }
1985} 2058}
1986 2059
1987sub pre_load { } 2060sub pre_load { }
1988sub post_load { } 2061#sub post_load { } # XS
1989 2062
1990sub load { 2063sub load {
1991 my ($self) = @_; 2064 my ($self) = @_;
1992 2065
1993 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2123 }
2051 2124
2052 $self->post_load; 2125 $self->post_load;
2053} 2126}
2054 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2055sub customise_for { 2131sub customise_for {
2056 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2057 2133
2058 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2135 if $self->per_player;
… …
2136 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2137 2213
2138 () 2214 ()
2139} 2215}
2140 2216
2217# common code, used by both ->save and ->swapout
2141sub save { 2218sub _save {
2142 my ($self) = @_; 2219 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2220
2146 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2147 2222
2148 return unless $self->dirty; 2223 return unless $self->dirty;
2149 2224
… …
2169 } else { 2244 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2246 }
2172} 2247}
2173 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2174sub swap_out { 2257sub swap_out {
2175 my ($self) = @_; 2258 my ($self) = @_;
2176 2259
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2261
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2185 2265
2186 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2187
2188 $self->deactivate; 2267 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2190 $self->clear; 2275 $self->clear;
2191} 2276}
2192 2277
2193sub reset_at { 2278sub reset_at {
2194 my ($self) = @_; 2279 my ($self) = @_;
… …
2213 2298
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2300
2216 return if $self->players; 2301 return if $self->players;
2217 2302
2218 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2219 2304
2220 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2221 2306
2222 # need to save uniques path 2307 # need to save uniques path
2223 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
… …
2314 : normalise $_ 2399 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2401 ]
2317} 2402}
2318 2403
2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2435
2319=back 2436=back
2320 2437
2321=head3 cf::object 2438=head3 cf::object
2322 2439
2323=cut 2440=cut
… …
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2609
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2495 2612
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2614}
2498 2615
2499sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2501 2618
… …
2518 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2520 2637
2521 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2524 2641
2525 $map->load; 2642 $map->load;
2526 $map->load_neighbours; 2643 $map->load_neighbours;
2527 2644
2528 return unless $self->contr->active; 2645 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2646
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2534} 2652}
2535 2653
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2537 2655
2538Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
… …
2726 2844
2727 utf8::encode $text; 2845 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2847}
2730 2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2872}
2873
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2875
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send 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 2877client 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 2878the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2737 2880
2738=cut 2881=cut
2739 2882
2740# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2742 "c/identify" => { 2891 "c/identify" => {
2743 id => "infobox", 2892 id => "infobox",
2744 title => "Identify", 2893 title => "Identify",
2745 reply => undef, 2894 reply => undef,
2746 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2897 "c/examine" => {
2749 id => "infobox", 2898 id => "infobox",
2750 title => "Examine", 2899 title => "Examine",
2751 reply => undef, 2900 reply => undef,
2752 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2908 },
2754 "c/book" => { 2909 "c/book" => {
2755 id => "infobox", 2910 id => "infobox",
2756 title => "Book", 2911 title => "Book",
2757 reply => undef, 2912 reply => undef,
… …
2803 id => "infobox", 2958 id => "infobox",
2804 title => "Pets", 2959 title => "Pets",
2805 reply => undef, 2960 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet", 2961 tooltip => "Shows information abotu your pets/a specific pet",
2807 }, 2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2808 "c/uptime" => { 2969 "c/uptime" => {
2809 id => "infobox", 2970 id => "infobox",
2810 title => "Uptime", 2971 title => "Uptime",
2811 reply => undef, 2972 reply => undef,
2812 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
… …
2867 my $pkt = "msg " 3028 my $pkt = "msg "
2868 . $self->{json_coder}->encode ( 3029 . $self->{json_coder}->encode (
2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2870 ); 3031 );
2871 3032
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); 3033 $self->send_big_packet ($pkt);
2883} 3034}
2884 3035
2885=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2886 3037
2887Sends an ext event to the client. 3038Sends an ext event to the client.
… …
2890 3041
2891sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2892 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2893 3044
2894 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2896 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2897 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2898 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2899 } 3050 }
2900} 3051}
2901 3052
2902=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2903 3054
… …
2907 3058
2908sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2909 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2910 3061
2911 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2912 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2913 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2914 #TODO: version 1, remove 3065 #TODO: version 1, remove
2915 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2916 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2917 } 3068 }
2918} 3069}
2919 3070
2920=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2921 3072
… …
3022 3173
3023 $coro 3174 $coro
3024} 3175}
3025 3176
3026cf::client->attach ( 3177cf::client->attach (
3027 on_destroy => sub { 3178 on_client_destroy => sub {
3028 my ($ns) = @_; 3179 my ($ns) = @_;
3029 3180
3030 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3031 }, 3182 },
3032); 3183);
… …
3048our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3049 3200
3050$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3051 3202
3052$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3053 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3054 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3055 sort time 3206 sort time
3056)); 3207));
3057 3208
3058# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
… …
3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3111 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3112 3263
3113 %vars = (_dummy => 0) unless %vars; 3264 %vars = (_dummy => 0) unless %vars;
3114 3265
3266 my @res;
3115 local $_; 3267 local $_;
3116 local @safe::cf::_safe_eval_args = values %vars;
3117 3268
3118 my $eval = 3269 my $eval =
3119 "do {\n" 3270 "do {\n"
3120 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3121 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3122 . $code 3273 . $code
3123 . "\n}" 3274 . "\n}"
3124 ; 3275 ;
3125 3276
3277 if ($CFG{safe_eval}) {
3126 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3127 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3128 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3129 3286
3130 if ($@) { 3287 if ($@) {
3131 warn "$@"; 3288 warn "$@";
3132 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3133 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
… …
3152=cut 3309=cut
3153 3310
3154sub register_script_function { 3311sub register_script_function {
3155 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3156 3313
3157 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3158 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3159} 3316}
3160 3317
3161=back 3318=back
3162 3319
3163=cut 3320=cut
… …
3184 3341
3185 $facedata->{version} == 2 3342 $facedata->{version} == 2
3186 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3187 3344
3188 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3189 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3190 type => FT_RSRC, 3348 type => FT_RSRC,
3191 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3192 }; 3351 };
3193 cf::cede_to_tick; 3352 cf::cede_to_tick;
3194 3353
3195 { 3354 {
3196 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
… …
3198 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3199 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200 3359
3201 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3202 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3203 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3204 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3205 3364
3206 cf::cede_to_tick; 3365 cf::cede_to_tick;
3207 } 3366 }
3208 3367
3209 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
… …
3233 3392
3234 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3235 } 3394 }
3236 3395
3237 { 3396 {
3238 # TODO: for gcfclient pleasure, we should give resources
3239 # that gcfclient doesn't grok a >10000 face index.
3240 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3241 3398
3242 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3244 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3245 my $data;
3246 3402
3247 if ($info->{type} & 1) { 3403 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}; 3404 cf::face::set_type $idx, $info->{type};
3262 } else { 3405 } else {
3263 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3264 } 3407 }
3265 3408
… …
3349 3492
3350 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3351} 3494}
3352 3495
3353sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3354 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3355 or return; 3500 or return;
3356 3501
3357 local $/; 3502 local $/;
3358 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3359 3504
3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3361 3506
3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $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}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3367 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3368 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3369 }; 3514 };
3370 warn $@ if $@; 3515 warn $@ if $@;
3371 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3372} 3519}
3373 3520
3374sub pidfile() { 3521sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!"; 3523 or die "$PIDFILE: $!";
… …
3388 3535
3389 seek $fh, 0, 0; 3536 seek $fh, 0, 0;
3390 print $fh $$; 3537 print $fh $$;
3391} 3538}
3392 3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3547}
3548
3393sub main { 3549sub main {
3394 cf::init_globals; # initialise logging 3550 cf::init_globals; # initialise logging
3395 3551
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3555 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 3556
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407 3558
3408 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3409 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
… …
3415 }; 3566 };
3416 3567
3417 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3418 3569
3419 cf::sync_job { 3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3420 reload_resources; 3579 reload_resources;
3421 reload_config; 3580 reload_config;
3422 db_init; 3581 db_init;
3423 3582
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid; 3583 cf::init_uuid;
3427 cf::init_signals; 3584 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills; 3585 cf::init_skills;
3430 3586
3431 cf::init_beforeplay; 3587 cf::init_beforeplay;
3432 3588
3433 atomic; 3589 atomic;
… …
3435 load_extensions; 3591 load_extensions;
3436 3592
3437 utime time, time, $RUNTIMEFILE; 3593 utime time, time, $RUNTIMEFILE;
3438 3594
3439 # no (long-running) fork's whatsoever before this point(!) 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441 3598
3442 (pop @POST_INIT)->(0) while @POST_INIT; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3443 }; 3600 };
3444 3601
3445 EV::loop; 3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3446} 3606}
3447 3607
3448############################################################################# 3608#############################################################################
3449# initialisation and cleanup 3609# initialisation and cleanup
3450 3610
3451# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3452BEGIN { 3612BEGIN {
3453 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3454 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3455 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3456 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3457 }; 3617 };
3458 } 3618 }
3459} 3619}
3460 3620
3461sub write_runtime_sync { 3621sub write_runtime_sync {
3622 my $t0 = AE::time;
3623
3462 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3463 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3464 3626
3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3466 3628
3467 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3468 3630
3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3470 or return; 3632 or return;
3471 3633
3472 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3473 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3474 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
… …
3487 or return; 3649 or return;
3488 3650
3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3490 and return; 3652 and return;
3491 3653
3492 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3493 3655
3494 1 3656 1
3495} 3657}
3496 3658
3497our $uuid_lock; 3659our $uuid_lock;
… …
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3786 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3787 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3789 }
3628 warn "cleared package $pkg\n";#d#
3629} 3790}
3630 3791
3631sub do_reload_perl() { 3792sub do_reload_perl() {
3632 # can/must only be called in main 3793 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3794 if ($Coro::current != $Coro::main) {
… …
3635 return; 3796 return;
3636 } 3797 }
3637 3798
3638 return if $RELOAD++; 3799 return if $RELOAD++;
3639 3800
3640 my $t1 = EV::time; 3801 my $t1 = AE::time;
3641 3802
3642 while ($RELOAD) { 3803 while ($RELOAD) {
3643 warn "reloading..."; 3804 warn "reloading...";
3644 3805
3645 warn "entering sync_job"; 3806 warn "entering sync_job";
… …
3716 3877
3717 warn "unload completed, starting to reload now"; 3878 warn "unload completed, starting to reload now";
3718 3879
3719 warn "reloading cf.pm"; 3880 warn "reloading cf.pm";
3720 require cf; 3881 require cf;
3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3882 cf::_connect_to_perl_1;
3722 3883
3723 warn "loading config and database again"; 3884 warn "loading config and database again";
3724 cf::reload_config; 3885 cf::reload_config;
3725 3886
3726 warn "loading extensions"; 3887 warn "loading extensions";
… …
3748 3909
3749 warn "reloaded"; 3910 warn "reloaded";
3750 --$RELOAD; 3911 --$RELOAD;
3751 } 3912 }
3752 3913
3753 $t1 = EV::time - $t1; 3914 $t1 = AE::time - $t1;
3754 warn "reload completed in ${t1}s\n"; 3915 warn "reload completed in ${t1}s\n";
3755}; 3916};
3756 3917
3757our $RELOAD_WATCHER; # used only during reload 3918our $RELOAD_WATCHER; # used only during reload
3758 3919
… …
3761 # coro crashes during coro_state_free->destroy here. 3922 # coro crashes during coro_state_free->destroy here.
3762 3923
3763 $RELOAD_WATCHER ||= cf::async { 3924 $RELOAD_WATCHER ||= cf::async {
3764 Coro::AIO::aio_wait cache_extensions; 3925 Coro::AIO::aio_wait cache_extensions;
3765 3926
3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3927 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3767 do_reload_perl; 3928 do_reload_perl;
3768 undef $RELOAD_WATCHER; 3929 undef $RELOAD_WATCHER;
3769 }; 3930 };
3770 }; 3931 };
3771} 3932}
… …
3788 3949
3789our @WAIT_FOR_TICK; 3950our @WAIT_FOR_TICK;
3790our @WAIT_FOR_TICK_BEGIN; 3951our @WAIT_FOR_TICK_BEGIN;
3791 3952
3792sub wait_for_tick { 3953sub wait_for_tick {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3955
3795 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK, $signal; 3957 push @WAIT_FOR_TICK, $signal;
3797 $signal->wait; 3958 $signal->wait;
3798} 3959}
3799 3960
3800sub wait_for_tick_begin { 3961sub wait_for_tick_begin {
3801 return if tick_inhibit || $Coro::current == $Coro::main; 3962 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3802 3963
3803 my $signal = new Coro::Signal; 3964 my $signal = new Coro::Signal;
3804 push @WAIT_FOR_TICK_BEGIN, $signal; 3965 push @WAIT_FOR_TICK_BEGIN, $signal;
3805 $signal->wait; 3966 $signal->wait;
3806} 3967}
… …
3811 unless ++$bug_warning > 10; 3972 unless ++$bug_warning > 10;
3812 return; 3973 return;
3813 } 3974 }
3814 3975
3815 cf::server_tick; # one server iteration 3976 cf::server_tick; # one server iteration
3977
3978 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3816 3979
3817 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3980 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3981 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3819 Coro::async_pool { 3982 Coro::async_pool {
3820 $Coro::current->{desc} = "runtime saver"; 3983 $Coro::current->{desc} = "runtime saver";
… …
3843} 4006}
3844 4007
3845{ 4008{
3846 # configure BDB 4009 # configure BDB
3847 4010
3848 BDB::min_parallel 8; 4011 BDB::min_parallel 16;
3849 BDB::max_poll_reqs $TICK * 0.1; 4012 BDB::max_poll_reqs $TICK * 0.1;
3850 $AnyEvent::BDB::WATCHER->priority (1); 4013 $AnyEvent::BDB::WATCHER->priority (1);
3851 4014
3852 unless ($DB_ENV) { 4015 unless ($DB_ENV) {
3853 $DB_ENV = BDB::db_env_create; 4016 $DB_ENV = BDB::db_env_create;
… …
3934 } 4097 }
3935} 4098}
3936 4099
3937# load additional modules 4100# load additional modules
3938require "cf/$_.pm" for @EXTRA_MODULES; 4101require "cf/$_.pm" for @EXTRA_MODULES;
4102cf::_connect_to_perl_2;
3939 4103
3940END { cf::emergency_save } 4104END { cf::emergency_save }
3941 4105
39421 41061
3943 4107

Diff Legend

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