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

Diff Legend

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