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.464 by root, Thu Jan 1 18:35:48 2009 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
117our %CFG; 128our %CFG;
118 129
119our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 131our $RUNTIME;
121our $NOW; 132our $NOW;
… …
132our $JITTER; # average jitter 143our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
134 145
135our @POST_INIT; 146our @POST_INIT;
136 147
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
138 150
139binmode STDOUT; 151binmode STDOUT;
140binmode STDERR; 152binmode STDERR;
141 153
142# read virtual server time, if available 154# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
147} 159}
148 160
161eval "sub TICK() { $TICK } 1" or die;
162
149mkdir $_ 163mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 165
152our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
153 167
154sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 180
156############################################################################# 181#############################################################################
157 182
158=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
159 184
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 233
209=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
210 235
211This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 238that call.
214 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
215=back 246=back
216 247
217=cut 248=cut
218 249
219BEGIN { 250$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 251 my $msg = join "", @_;
222 252
223 $msg .= "\n" 253 $msg .= "\n"
224 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
225 255
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 257
228 LOG llevError, $msg; 258 LOG llevError, $msg;
229 }; 259};
230}
231 260
232$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
234 265
235 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 268 return;#d#
238 }#d# 269 }#d#
239 270
240 # kill coroutine otherwise 271 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 272 Coro::terminate
243}; 273};
244
245$SIG{__DIE__} = sub { }; #d#?
246 274
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 292)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 294}
267 295
268$EV::DIED = sub { 296$EV::DIED = sub {
269 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
270}; 298};
271 299
272############################################################################# 300#############################################################################
273 301
274=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
398 426
399=cut 427=cut
400 428
401our @SLOT_QUEUE; 429our @SLOT_QUEUE;
402our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
403 432
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
407 436
408 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
409 439
410 while () { 440 while () {
411 next_job: 441 next_job:
442
412 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 444
414 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 449 $job->[2]->send;
418 Coro::cede; 450 Coro::cede;
419 goto next_job; 451 goto next_job;
420 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 454 }
422 } 455 }
423 456
424 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 460 $signal->wait;
428 } else { 461 } else {
462 $busy = 0;
429 Coro::schedule; 463 Coro::schedule;
430 } 464 }
431 } 465 }
432}; 466};
433 467
434sub get_slot($;$$) { 468sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
436 470
437 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
438 472
439 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
440 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
441 476
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
471 506
472sub sync_job(&) { 507sub sync_job(&) {
473 my ($job) = @_; 508 my ($job) = @_;
474 509
475 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 511 my $time = AE::time;
477 512
478 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
480 515
481 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
498 } else { 533 } else {
499 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
500 } 535 }
501 } 536 }
502 537
503 my $time = EV::time - $time; 538 my $time = AE::time - $time;
504 539
505 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
506 541
507 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
508 } else { 543 } else {
… …
1147 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1148 1183
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1153 aio_close $fh; 1191 aio_close $fh;
1154 1192
1155 if (@$objs) { 1193 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1195 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1202 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1204 }
1164 } else { 1205 } else {
1165 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
… …
1272} 1313}
1273 1314
1274use File::Glob (); 1315use File::Glob ();
1275 1316
1276cf::player->attach ( 1317cf::player->attach (
1277 on_command => sub { 1318 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1279 1320
1280 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1281 or return; 1322 or return;
1282 1323
… …
1316 1357
1317# "readahead" all extensions 1358# "readahead" all extensions
1318sub cache_extensions { 1359sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1360 my $grp = IO::AIO::aio_group;
1320 1361
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1363 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1365 }
1325 }; 1366 };
1326 1367
… …
1361 . "\n};\n1"; 1402 . "\n};\n1";
1362 1403
1363 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1364 } 1405 }
1365 1406
1407 my $pass = 0;
1366 my %done; 1408 my %done;
1367 while (%todo) { 1409 while (%todo) {
1368 my $progress; 1410 my $progress;
1369 1411
1412 ++$pass;
1413
1414 ext:
1370 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1417 next ext
1373 unless exists $done{$_}; 1418 unless exists $done{$_};
1374 } 1419 }
1375 1420
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1422
1378 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1427
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1429 if exists $v->{meta}{mandatory};
1386 1430 } else {
1387 warn $msg; 1431 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg};
1433 $progress = 1;
1434
1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1388 } 1437 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1438 }
1394 1439
1395 skip: 1440 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1398 } 1448 }
1399 }; 1449 };
1400} 1450}
1401 1451
1402############################################################################# 1452#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1487 } 1537 }
1488 } 1538 }
1489} 1539}
1490 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1491sub save($) { 1554sub save($) {
1492 my ($pl) = @_; 1555 my ($pl) = @_;
1493 1556
1494 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1495 1558
… …
1500 1563
1501 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1503 1566
1504 cf::get_slot 0.01; 1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1571
1506 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1573 cf::cede_to_tick;
1508} 1574}
1509 1575
… …
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1789
1724 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1791 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1978 2044
1979 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
1980 } 2046 }
1981} 2047}
1982 2048
1983sub pre_load { } 2049sub pre_load { }
1984sub post_load { } 2050#sub post_load { } # XS
1985 2051
1986sub load { 2052sub load {
1987 my ($self) = @_; 2053 my ($self) = @_;
1988 2054
1989 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
… …
2046 } 2112 }
2047 2113
2048 $self->post_load; 2114 $self->post_load;
2049} 2115}
2050 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
2051sub customise_for { 2120sub customise_for {
2052 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
2053 2122
2054 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2124 if $self->per_player;
… …
2209 2278
2210 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2280
2212 return if $self->players; 2281 return if $self->players;
2213 2282
2214 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2215 2284
2216 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2217 2286
2218 # need to save uniques path 2287 # need to save uniques path
2219 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
… …
2310 : normalise $_ 2379 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2381 ]
2313} 2382}
2314 2383
2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2415
2315=back 2416=back
2316 2417
2317=head3 cf::object 2418=head3 cf::object
2318 2419
2319=cut 2420=cut
… …
2384 2485
2385our $SAY_CHANNEL = { 2486our $SAY_CHANNEL = {
2386 id => "say", 2487 id => "say",
2387 title => "Map", 2488 title => "Map",
2388 reply => "say ", 2489 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2491};
2391 2492
2392our $CHAT_CHANNEL = { 2493our $CHAT_CHANNEL = {
2393 id => "chat", 2494 id => "chat",
2394 title => "Chat", 2495 title => "Chat",
… …
2514 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2516 2617
2517 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2520 2621
2521 $map->load; 2622 $map->load;
2522 $map->load_neighbours; 2623 $map->load_neighbours;
2523 2624
2524 return unless $self->contr->active; 2625 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2626
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2530} 2632}
2531 2633
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2635
2534Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
… …
2722 2824
2723 utf8::encode $text; 2825 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2725} 2827}
2726 2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2852}
2853
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2855
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2730client if neccessary. C<$type> should be a string identifying the type of 2857client if neccessary. C<$type> should be a string identifying the type of
2731the message, with C<log> being the default. If C<$color> is negative, suppress 2858the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2733 2860
2734=cut 2861=cut
2735 2862
2736# non-persistent channels (usually the info channel) 2863# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2738 "c/identify" => { 2871 "c/identify" => {
2739 id => "infobox", 2872 id => "infobox",
2740 title => "Identify", 2873 title => "Identify",
2741 reply => undef, 2874 reply => undef,
2742 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2877 "c/examine" => {
2745 id => "infobox", 2878 id => "infobox",
2746 title => "Examine", 2879 title => "Examine",
2747 reply => undef, 2880 reply => undef,
2748 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2888 },
2750 "c/book" => { 2889 "c/book" => {
2751 id => "infobox", 2890 id => "infobox",
2752 title => "Book", 2891 title => "Book",
2753 reply => undef, 2892 reply => undef,
… …
2769 id => "infobox", 2908 id => "infobox",
2770 title => "Body Parts", 2909 title => "Body Parts",
2771 reply => undef, 2910 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available", 2911 tooltip => "Shows which body parts you posess and are available",
2773 }, 2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2774 "c/skills" => { 2919 "c/skills" => {
2775 id => "infobox", 2920 id => "infobox",
2776 title => "Skills", 2921 title => "Skills",
2777 reply => undef, 2922 reply => undef,
2778 tooltip => "Shows your experience per skill and item power", 2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2779 }, 2948 },
2780 "c/uptime" => { 2949 "c/uptime" => {
2781 id => "infobox", 2950 id => "infobox",
2782 title => "Uptime", 2951 title => "Uptime",
2783 reply => undef, 2952 reply => undef,
… …
2839 my $pkt = "msg " 3008 my $pkt = "msg "
2840 . $self->{json_coder}->encode ( 3009 . $self->{json_coder}->encode (
2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2842 ); 3011 );
2843 3012
2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2847
2848 # split very large packets
2849 if (8192 < length $pkt and $self->{can_lzf}) {
2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2851 $pkt = "frag";
2852 }
2853
2854 $self->send_packet ($pkt); 3013 $self->send_big_packet ($pkt);
2855} 3014}
2856 3015
2857=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2858 3017
2859Sends an ext event to the client. 3018Sends an ext event to the client.
… …
2862 3021
2863sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2864 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2865 3024
2866 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2867 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2868 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2869 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2870 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2871 } 3030 }
2872} 3031}
2873 3032
2874=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2875 3034
… …
2879 3038
2880sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2881 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2882 3041
2883 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2885 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2886 #TODO: version 1, remove 3045 #TODO: version 1, remove
2887 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3048 }
2890} 3049}
2891 3050
2892=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2893 3052
… …
2994 3153
2995 $coro 3154 $coro
2996} 3155}
2997 3156
2998cf::client->attach ( 3157cf::client->attach (
2999 on_destroy => sub { 3158 on_client_destroy => sub {
3000 my ($ns) = @_; 3159 my ($ns) = @_;
3001 3160
3002 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3003 }, 3162 },
3004); 3163);
… …
3020our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
3021 3180
3022$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
3023 3182
3024$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
3025 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
3026 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
3027 sort time 3186 sort time
3028)); 3187));
3029 3188
3030# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
… …
3034The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
3035 3194
3036 cf::object 3195 cf::object
3037 contr pay_amount pay_player map x y force_find force_add destroy 3196 contr pay_amount pay_player map x y force_find force_add destroy
3038 insert remove name archname title slaying race decrease split 3197 insert remove name archname title slaying race decrease split
3198 value
3039 3199
3040 cf::object::player 3200 cf::object::player
3041 player 3201 player
3042 3202
3043 cf::player 3203 cf::player
… …
3049=cut 3209=cut
3050 3210
3051for ( 3211for (
3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3053 insert remove inv nrof name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
3054 decrease split destroy change_exp)], 3214 decrease split destroy change_exp value msg lore send_msg)],
3055 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
3056 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
3057 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
3058) { 3218) {
3059 no strict 'refs'; 3219 no strict 'refs';
3060 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
3061 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3079 3239
3080 my $qcode = $code; 3240 my $qcode = $code;
3081 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3082 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
3083 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
3084 local $_; 3247 local $_;
3085 local @safe::cf::_safe_eval_args = values %vars;
3086 3248
3087 my $eval = 3249 my $eval =
3088 "do {\n" 3250 "do {\n"
3089 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3090 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
3091 . $code 3253 . $code
3092 . "\n}" 3254 . "\n}"
3093 ; 3255 ;
3094 3256
3257 if ($CFG{safe_eval}) {
3095 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
3096 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3097 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
3098 3266
3099 if ($@) { 3267 if ($@) {
3100 warn "$@"; 3268 warn "$@";
3101 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
3102 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
… …
3121=cut 3289=cut
3122 3290
3123sub register_script_function { 3291sub register_script_function {
3124 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
3125 3293
3126 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
3127 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
3128} 3296}
3129 3297
3130=back 3298=back
3131 3299
3132=cut 3300=cut
… …
3153 3321
3154 $facedata->{version} == 2 3322 $facedata->{version} == 2
3155 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3156 3324
3157 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3158 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3159 type => FT_RSRC, 3328 type => FT_RSRC,
3160 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3161 }; 3331 };
3162 cf::cede_to_tick; 3332 cf::cede_to_tick;
3163 3333
3164 { 3334 {
3165 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
… …
3167 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3168 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169 3339
3170 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3171 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3174 3344
3175 cf::cede_to_tick; 3345 cf::cede_to_tick;
3176 } 3346 }
3177 3347
3178 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
… …
3202 3372
3203 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3204 } 3374 }
3205 3375
3206 { 3376 {
3207 # TODO: for gcfclient pleasure, we should give resources
3208 # that gcfclient doesn't grok a >10000 face index.
3209 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3210 3378
3211 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3212 if (defined $info->{type}) { 3380 if (defined $info->{type}) {
3213 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3214 my $data;
3215 3382
3216 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3217 # prepend meta info
3218
3219 my $meta = $enc->encode ({
3220 name => $name,
3221 %{ $info->{meta} || {} },
3222 });
3223
3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type}; 3384 cf::face::set_type $idx, $info->{type};
3231 } else { 3385 } else {
3232 $RESOURCE{$name} = $info; 3386 $RESOURCE{$name} = $info;
3233 } 3387 }
3234 3388
… …
3318 3472
3319 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3320} 3474}
3321 3475
3322sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3323 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3324 or return; 3480 or return;
3325 3481
3326 local $/; 3482 local $/;
3327 *CFG = YAML::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3328 3484
3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3330 3486
3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3336 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3337 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3338 }; 3494 };
3339 warn $@ if $@; 3495 warn $@ if $@;
3340 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3341} 3499}
3342 3500
3343sub pidfile() { 3501sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!"; 3503 or die "$PIDFILE: $!";
… …
3355 my $pid = <$fh>; 3513 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0; 3514 kill 9, $pid if $pid > 0;
3357 3515
3358 seek $fh, 0, 0; 3516 seek $fh, 0, 0;
3359 print $fh $$; 3517 print $fh $$;
3518}
3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3360} 3527}
3361 3528
3362sub main { 3529sub main {
3363 cf::init_globals; # initialise logging 3530 cf::init_globals; # initialise logging
3364 3531
… …
3384 }; 3551 };
3385 3552
3386 evthread_start IO::AIO::poll_fileno; 3553 evthread_start IO::AIO::poll_fileno;
3387 3554
3388 cf::sync_job { 3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3389 reload_resources; 3559 reload_resources;
3390 reload_config; 3560 reload_config;
3391 db_init; 3561 db_init;
3392 3562
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid; 3563 cf::init_uuid;
3396 cf::init_signals; 3564 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills; 3565 cf::init_skills;
3399 3566
3400 cf::init_beforeplay; 3567 cf::init_beforeplay;
3401 3568
3402 atomic; 3569 atomic;
… …
3404 load_extensions; 3571 load_extensions;
3405 3572
3406 utime time, time, $RUNTIMEFILE; 3573 utime time, time, $RUNTIMEFILE;
3407 3574
3408 # no (long-running) fork's whatsoever before this point(!) 3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410 3578
3411 (pop @POST_INIT)->(0) while @POST_INIT; 3579 (pop @POST_INIT)->(0) while @POST_INIT;
3412 }; 3580 };
3413 3581
3414 EV::loop; 3582 main_loop;
3415} 3583}
3416 3584
3417############################################################################# 3585#############################################################################
3418# initialisation and cleanup 3586# initialisation and cleanup
3419 3587
3420# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3421BEGIN { 3589BEGIN {
3422 our %SIGWATCHER = (); 3590 our %SIGWATCHER = ();
3423 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3424 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3425 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3426 }; 3594 };
3427 } 3595 }
3428} 3596}
3429 3597
3430sub write_runtime_sync { 3598sub write_runtime_sync {
3599 my $t0 = AE::time;
3600
3431 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3432 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3433 3603
3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3435 3605
3436 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3437 3607
3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3439 or return; 3609 or return;
3440 3610
3441 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3442 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3443 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
… …
3456 or return; 3626 or return;
3457 3627
3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3459 and return; 3629 and return;
3460 3630
3461 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3462 3632
3463 1 3633 1
3464} 3634}
3465 3635
3466our $uuid_lock; 3636our $uuid_lock;
… …
3604 return; 3774 return;
3605 } 3775 }
3606 3776
3607 return if $RELOAD++; 3777 return if $RELOAD++;
3608 3778
3609 my $t1 = EV::time; 3779 my $t1 = AE::time;
3610 3780
3611 while ($RELOAD) { 3781 while ($RELOAD) {
3612 warn "reloading..."; 3782 warn "reloading...";
3613 3783
3614 warn "entering sync_job"; 3784 warn "entering sync_job";
… …
3675 clear_package "safe::$_" 3845 clear_package "safe::$_"
3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3677 3847
3678 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3679 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3680 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3681 3851
3682 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3683 # and global variables created in xs 3853 # and global variables created in xs
3684 #clear_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3685 3855
3686 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3687 3857
3688 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3689 require cf; 3859 require cf;
3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3691 3861
3692 warn "loading config and database again"; 3862 warn "loading config and database again";
3693 cf::reload_config; 3863 cf::reload_config;
3694 3864
3695 warn "loading extensions"; 3865 warn "loading extensions";
… …
3717 3887
3718 warn "reloaded"; 3888 warn "reloaded";
3719 --$RELOAD; 3889 --$RELOAD;
3720 } 3890 }
3721 3891
3722 $t1 = EV::time - $t1; 3892 $t1 = AE::time - $t1;
3723 warn "reload completed in ${t1}s\n"; 3893 warn "reload completed in ${t1}s\n";
3724}; 3894};
3725 3895
3726our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3727 3897
… …
3730 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3731 3901
3732 $RELOAD_WATCHER ||= cf::async { 3902 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions; 3903 Coro::AIO::aio_wait cache_extensions;
3734 3904
3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3736 do_reload_perl; 3906 do_reload_perl;
3737 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3738 }; 3908 };
3739 }; 3909 };
3740} 3910}
… …
3757 3927
3758our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3759our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3760 3930
3761sub wait_for_tick { 3931sub wait_for_tick {
3762 return if tick_inhibit || $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3763 3933
3764 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3765 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3766 $signal->wait; 3936 $signal->wait;
3767} 3937}
3768 3938
3769sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3770 return if tick_inhibit || $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3771 3941
3772 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3774 $signal->wait; 3944 $signal->wait;
3775} 3945}
… …
3780 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3781 return; 3951 return;
3782 } 3952 }
3783 3953
3784 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3955
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3785 3957
3786 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3787 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3788 Coro::async_pool { 3960 Coro::async_pool {
3789 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
… …
3812} 3984}
3813 3985
3814{ 3986{
3815 # configure BDB 3987 # configure BDB
3816 3988
3817 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3818 BDB::max_poll_reqs $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3819 $AnyEvent::BDB::WATCHER->priority (1); 3991 $AnyEvent::BDB::WATCHER->priority (1);
3820 3992
3821 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3822 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
… …
3902 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3903 } 4075 }
3904} 4076}
3905 4077
3906# load additional modules 4078# load additional modules
3907use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3908 4081
3909END { cf::emergency_save } 4082END { cf::emergency_save }
3910 4083
39111 40841
3912 4085

Diff Legend

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