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.466 by root, Thu Jan 8 03:03:24 2009 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
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
117our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
118 124
119our %CFG; 125our %CFG;
120 126
121our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 128our $RUNTIME;
… …
134our $JITTER; # average jitter 140our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
136 142
137our @POST_INIT; 143our @POST_INIT;
138 144
139our $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 :)
140 147
141binmode STDOUT; 148binmode STDOUT;
142binmode STDERR; 149binmode STDERR;
143 150
144# read virtual server time, if available 151# read virtual server time, if available
… …
146 open my $fh, "<", $RUNTIMEFILE 153 open my $fh, "<", $RUNTIMEFILE
147 or die "unable to read $RUNTIMEFILE file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
148 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
149} 156}
150 157
158eval "sub TICK() { $TICK } 1" or die;
159
151mkdir $_ 160mkdir $_
152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
153 162
154our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
155 164
156sub 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::"} };
157 177
158############################################################################# 178#############################################################################
159 179
160=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
161 181
… …
208returns 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
209per 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.
210 230
211=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
212 232
213This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
214C<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
215that call. 235that call.
216 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
217=back 243=back
218 244
219=cut 245=cut
220 246
221BEGIN { 247$Coro::State::WARNHOOK = sub {
222 *CORE::GLOBAL::warn = sub {
223 my $msg = join "", @_; 248 my $msg = join "", @_;
224 249
225 $msg .= "\n" 250 $msg .= "\n"
226 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
227 252
228 $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;
229 254
230 LOG llevError, $msg; 255 LOG llevError, $msg;
231 }; 256};
232}
233 257
234$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
235 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
236 262
237 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
238 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
239 return;#d# 265 return;#d#
240 }#d# 266 }#d#
241 267
242 # kill coroutine otherwise 268 # kill coroutine otherwise
243 warn Carp::longmess $_[0];
244 Coro::terminate 269 Coro::terminate
245}; 270};
246
247$SIG{__DIE__} = sub { }; #d#?
248 271
249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
266)) { 289)) {
267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
268} 291}
269 292
270$EV::DIED = sub { 293$EV::DIED = sub {
271 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
272}; 295};
273 296
274############################################################################# 297#############################################################################
275 298
276=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
400 423
401=cut 424=cut
402 425
403our @SLOT_QUEUE; 426our @SLOT_QUEUE;
404our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
405 429
406$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
407$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
409 433
410 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
411 436
412 while () { 437 while () {
413 next_job: 438 next_job:
439
414 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
415 if ($avail > 0.01) { 441
416 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
417 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
418 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
419 $job->[2]->send; 446 $job->[2]->send;
420 Coro::cede; 447 Coro::cede;
421 goto next_job; 448 goto next_job;
422 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
423 } 451 }
424 } 452 }
425 453
426 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
427 # 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
428 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
429 $signal->wait; 457 $signal->wait;
430 } else { 458 } else {
459 $busy = 0;
431 Coro::schedule; 460 Coro::schedule;
432 } 461 }
433 } 462 }
434}; 463};
435 464
436sub get_slot($;$$) { 465sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
438 467
439 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
440 469
441 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
442 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
443 473
444 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
445 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
446 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1149 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1150 1180
1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1152 aio_chmod $fh, SAVE_MODE; 1182 aio_chmod $fh, SAVE_MODE;
1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1154 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 }
1155 aio_close $fh; 1188 aio_close $fh;
1156 1189
1157 if (@$objs) { 1190 if (@$objs) {
1158 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) {
1159 aio_chmod $fh, SAVE_MODE; 1192 aio_chmod $fh, SAVE_MODE;
1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1161 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1162 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 }
1163 aio_close $fh; 1199 aio_close $fh;
1164 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1165 } 1201 }
1166 } else { 1202 } else {
1167 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
… …
1274} 1310}
1275 1311
1276use File::Glob (); 1312use File::Glob ();
1277 1313
1278cf::player->attach ( 1314cf::player->attach (
1279 on_command => sub { 1315 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1281 1317
1282 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1283 or return; 1319 or return;
1284 1320
… …
1318 1354
1319# "readahead" all extensions 1355# "readahead" all extensions
1320sub cache_extensions { 1356sub cache_extensions {
1321 my $grp = IO::AIO::aio_group; 1357 my $grp = IO::AIO::aio_group;
1322 1358
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1324 for (grep /\.ext$/, @{$_[0]}) { 1360 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 } 1362 }
1327 }; 1363 };
1328 1364
… …
1363 . "\n};\n1"; 1399 . "\n};\n1";
1364 1400
1365 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1366 } 1402 }
1367 1403
1404 my $pass = 0;
1368 my %done; 1405 my %done;
1369 while (%todo) { 1406 while (%todo) {
1370 my $progress; 1407 my $progress;
1371 1408
1409 ++$pass;
1410
1411 ext:
1372 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1373 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1374 goto skip 1414 next ext
1375 unless exists $done{$_}; 1415 unless exists $done{$_};
1376 } 1416 }
1377 1417
1378 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1379 1419
1380 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1381 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1382 : "$v->{base}: extension inactive.\n";
1383 1424
1384 if (exists $v->{meta}{mandatory}) {
1385 warn $msg;
1386 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1387 } 1426 if exists $v->{meta}{mandatory};
1388 1427 } else {
1389 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;
1390 } 1434 }
1391
1392 $done{$k} = delete $todo{$k};
1393 push @EXTS, $v->{pkg};
1394 $progress = 1;
1395 } 1435 }
1396 1436
1397 skip: 1437 unless ($progress) {
1398 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1399 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 }
1400 } 1445 }
1401 }; 1446 };
1402} 1447}
1403 1448
1404############################################################################# 1449#############################################################################
… …
1488 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1489 } 1534 }
1490 } 1535 }
1491} 1536}
1492 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
1493sub save($) { 1551sub save($) {
1494 my ($pl) = @_; 1552 my ($pl) = @_;
1495 1553
1496 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1497 1555
… …
1502 1560
1503 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1504 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1505 1563
1506 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];
1507 1568
1508 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1509 cf::cede_to_tick; 1570 cf::cede_to_tick;
1510} 1571}
1511 1572
… …
1724 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
1725 1786
1726 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1727 $self->_create_random_map ( 1788 $self->_create_random_map (
1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1731 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1732 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1733 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1734 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1980 2041
1981 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1982 } 2043 }
1983} 2044}
1984 2045
1985sub pre_load { } 2046sub pre_load { }
1986sub post_load { } 2047#sub post_load { } # XS
1987 2048
1988sub load { 2049sub load {
1989 my ($self) = @_; 2050 my ($self) = @_;
1990 2051
1991 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2048 } 2109 }
2049 2110
2050 $self->post_load; 2111 $self->post_load;
2051} 2112}
2052 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
2053sub customise_for { 2117sub customise_for {
2054 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2055 2119
2056 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2057 if $self->per_player; 2121 if $self->per_player;
… …
2211 2275
2212 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2213 2277
2214 return if $self->players; 2278 return if $self->players;
2215 2279
2216 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2217 2281
2218 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2219 2283
2220 # need to save uniques path 2284 # need to save uniques path
2221 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
… …
2312 : normalise $_ 2376 : normalise $_
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2378 ]
2315} 2379}
2316 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
2317=back 2413=back
2318 2414
2319=head3 cf::object 2415=head3 cf::object
2320 2416
2321=cut 2417=cut
… …
2386 2482
2387our $SAY_CHANNEL = { 2483our $SAY_CHANNEL = {
2388 id => "say", 2484 id => "say",
2389 title => "Map", 2485 title => "Map",
2390 reply => "say ", 2486 reply => "say ",
2391 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.",
2392}; 2488};
2393 2489
2394our $CHAT_CHANNEL = { 2490our $CHAT_CHANNEL = {
2395 id => "chat", 2491 id => "chat",
2396 title => "Chat", 2492 title => "Chat",
… …
2516 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2518 2614
2519 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2522 2618
2523 $map->load; 2619 $map->load;
2524 $map->load_neighbours; 2620 $map->load_neighbours;
2525 2621
2526 return unless $self->contr->active; 2622 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2528 $self->activate_recursive;
2529 2623
2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2531 $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;
2532} 2629}
2533 2630
2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2535 2632
2536Moves 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
… …
2724 2821
2725 utf8::encode $text; 2822 utf8::encode $text;
2726 $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);
2727} 2824}
2728 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
2729=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2730 2852
2731Send 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
2732client 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
2733the 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
… …
2735 2857
2736=cut 2858=cut
2737 2859
2738# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2739our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2740 "c/identify" => { 2868 "c/identify" => {
2741 id => "infobox", 2869 id => "infobox",
2742 title => "Identify", 2870 title => "Identify",
2743 reply => undef, 2871 reply => undef,
2744 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2746 "c/examine" => { 2874 "c/examine" => {
2747 id => "infobox", 2875 id => "infobox",
2748 title => "Examine", 2876 title => "Examine",
2749 reply => undef, 2877 reply => undef,
2750 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",
2751 }, 2885 },
2752 "c/book" => { 2886 "c/book" => {
2753 id => "infobox", 2887 id => "infobox",
2754 title => "Book", 2888 title => "Book",
2755 reply => undef, 2889 reply => undef,
… …
2783 id => "infobox", 2917 id => "infobox",
2784 title => "Skills", 2918 title => "Skills",
2785 reply => undef, 2919 reply => undef,
2786 tooltip => "Shows your experience per skill and item power", 2920 tooltip => "Shows your experience per skill and item power",
2787 }, 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 },
2788 "c/resistances" => { 2928 "c/resistances" => {
2789 id => "infobox", 2929 id => "infobox",
2790 title => "Resistances", 2930 title => "Resistances",
2791 reply => undef, 2931 reply => undef,
2792 tooltip => "Shows your resistances", 2932 tooltip => "Shows your resistances",
… …
2794 "c/pets" => { 2934 "c/pets" => {
2795 id => "infobox", 2935 id => "infobox",
2796 title => "Pets", 2936 title => "Pets",
2797 reply => undef, 2937 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet", 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",
2799 }, 2945 },
2800 "c/uptime" => { 2946 "c/uptime" => {
2801 id => "infobox", 2947 id => "infobox",
2802 title => "Uptime", 2948 title => "Uptime",
2803 reply => undef, 2949 reply => undef,
… …
2859 my $pkt = "msg " 3005 my $pkt = "msg "
2860 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2862 ); 3008 );
2863 3009
2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2867
2868 # split very large packets
2869 if (8192 < length $pkt and $self->{can_lzf}) {
2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2871 $pkt = "frag";
2872 }
2873
2874 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2875} 3011}
2876 3012
2877=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2878 3014
2879Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2882 3018
2883sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2884 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2885 3021
2886 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2888 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2889 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 } 3027 }
2892} 3028}
2893 3029
2894=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2895 3031
… …
2899 3035
2900sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2902 3038
2903 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove 3042 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2909 } 3045 }
2910} 3046}
2911 3047
2912=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2913 3049
… …
3014 3150
3015 $coro 3151 $coro
3016} 3152}
3017 3153
3018cf::client->attach ( 3154cf::client->attach (
3019 on_destroy => sub { 3155 on_client_destroy => sub {
3020 my ($ns) = @_; 3156 my ($ns) = @_;
3021 3157
3022 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3023 }, 3159 },
3024); 3160);
… …
3040our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3041 3177
3042$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3043 3179
3044$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3045 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3046 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3047 sort time 3183 sort time
3048)); 3184));
3049 3185
3050# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3103 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3104 3240
3105 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3106 3242
3243 my @res;
3107 local $_; 3244 local $_;
3108 local @safe::cf::_safe_eval_args = values %vars;
3109 3245
3110 my $eval = 3246 my $eval =
3111 "do {\n" 3247 "do {\n"
3112 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3113 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3114 . $code 3250 . $code
3115 . "\n}" 3251 . "\n}"
3116 ; 3252 ;
3117 3253
3254 if ($CFG{safe_eval}) {
3118 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3119 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3120 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 }
3121 3263
3122 if ($@) { 3264 if ($@) {
3123 warn "$@"; 3265 warn "$@";
3124 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3125 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3144=cut 3286=cut
3145 3287
3146sub register_script_function { 3288sub register_script_function {
3147 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3148 3290
3149 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3150 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3151} 3293}
3152 3294
3153=back 3295=back
3154 3296
3155=cut 3297=cut
… …
3176 3318
3177 $facedata->{version} == 2 3319 $facedata->{version} == 2
3178 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3179 3321
3180 # 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]);
3181 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC, 3325 type => FT_RSRC,
3183 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),
3184 }; 3328 };
3185 cf::cede_to_tick; 3329 cf::cede_to_tick;
3186 3330
3187 { 3331 {
3188 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3190 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3191 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192 3336
3193 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3197 3341
3198 cf::cede_to_tick; 3342 cf::cede_to_tick;
3199 } 3343 }
3200 3344
3201 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3225 3369
3226 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3227 } 3371 }
3228 3372
3229 { 3373 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3233 3375
3234 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238 3379
3239 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3254 } else { 3382 } else {
3255 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3256 } 3384 }
3257 3385
… …
3341 3469
3342 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3343} 3471}
3344 3472
3345sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3346 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3347 or return; 3477 or return;
3348 3478
3349 local $/; 3479 local $/;
3350 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3351 3481
3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3353 3483
3354 $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};
3355 $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};
… …
3359 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3360 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3361 }; 3491 };
3362 warn $@ if $@; 3492 warn $@ if $@;
3363 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3364} 3496}
3365 3497
3366sub pidfile() { 3498sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3378 my $pid = <$fh>; 3510 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0; 3511 kill 9, $pid if $pid > 0;
3380 3512
3381 seek $fh, 0, 0; 3513 seek $fh, 0, 0;
3382 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;
3383} 3524}
3384 3525
3385sub main { 3526sub main {
3386 cf::init_globals; # initialise logging 3527 cf::init_globals; # initialise logging
3387 3528
… …
3407 }; 3548 };
3408 3549
3409 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3410 3551
3411 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3412 reload_resources; 3556 reload_resources;
3413 reload_config; 3557 reload_config;
3414 db_init; 3558 db_init;
3415 3559
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid; 3560 cf::init_uuid;
3419 cf::init_signals; 3561 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills; 3562 cf::init_skills;
3422 3563
3423 cf::init_beforeplay; 3564 cf::init_beforeplay;
3424 3565
3425 atomic; 3566 atomic;
… …
3427 load_extensions; 3568 load_extensions;
3428 3569
3429 utime time, time, $RUNTIMEFILE; 3570 utime time, time, $RUNTIMEFILE;
3430 3571
3431 # no (long-running) fork's whatsoever before this point(!) 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3432 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};
3433 3575
3434 (pop @POST_INIT)->(0) while @POST_INIT; 3576 (pop @POST_INIT)->(0) while @POST_INIT;
3435 }; 3577 };
3436 3578
3437 EV::loop; 3579 main_loop;
3438} 3580}
3439 3581
3440############################################################################# 3582#############################################################################
3441# initialisation and cleanup 3583# initialisation and cleanup
3442 3584
… …
3449 }; 3591 };
3450 } 3592 }
3451} 3593}
3452 3594
3453sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3454 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3455 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3456 3600
3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3458 3602
3459 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3460 3604
3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3462 or return; 3606 or return;
3463 3607
3464 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3465 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3466 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3479 or return; 3623 or return;
3480 3624
3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3482 and return; 3626 and return;
3483 3627
3484 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3485 3629
3486 1 3630 1
3487} 3631}
3488 3632
3489our $uuid_lock; 3633our $uuid_lock;
… …
3708 3852
3709 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3710 3854
3711 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3712 require cf; 3856 require cf;
3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3714 3858
3715 warn "loading config and database again"; 3859 warn "loading config and database again";
3716 cf::reload_config; 3860 cf::reload_config;
3717 3861
3718 warn "loading extensions"; 3862 warn "loading extensions";
… …
3780 3924
3781our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3782our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3783 3927
3784sub wait_for_tick { 3928sub wait_for_tick {
3785 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3786 3930
3787 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3788 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3789 $signal->wait; 3933 $signal->wait;
3790} 3934}
3791 3935
3792sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3793 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3794 3938
3795 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3796 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3797 $signal->wait; 3941 $signal->wait;
3798} 3942}
… …
3803 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3804 return; 3948 return;
3805 } 3949 }
3806 3950
3807 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3808 3954
3809 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3810 $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.;
3811 Coro::async_pool { 3957 Coro::async_pool {
3812 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3835} 3981}
3836 3982
3837{ 3983{
3838 # configure BDB 3984 # configure BDB
3839 3985
3840 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3841 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3842 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3843 3989
3844 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3845 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3925 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3926 } 4072 }
3927} 4073}
3928 4074
3929# load additional modules 4075# load additional modules
3930eval "use cf::$_" for @EXTRA_MODULES; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3931 4078
3932END { cf::emergency_save } 4079END { cf::emergency_save }
3933 4080
39341 40811
3935 4082

Diff Legend

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