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.469 by root, Mon Mar 2 22:25:19 2009 UTC vs.
Revision 1.515 by root, Thu Apr 15 04:56:47 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
117our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
118 127
119our %CFG; 128our %CFG;
120 129
121our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 131our $RUNTIME;
… …
134our $JITTER; # average jitter 143our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
136 145
137our @POST_INIT; 146our @POST_INIT;
138 147
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
140 150
141binmode STDOUT; 151binmode STDOUT;
142binmode STDERR; 152binmode STDERR;
143 153
144# read virtual server time, if available 154# read virtual server time, if available
… …
157 167
158sub cf::map::normalise; 168sub cf::map::normalise;
159 169
160############################################################################# 170#############################################################################
161 171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
180
181#############################################################################
182
162=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
163 184
164=over 4 185=over 4
165 186
166=item $cf::UPTIME 187=item $cf::UPTIME
… …
210returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 233
213=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
214 235
215This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 238that call.
218 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
219=back 246=back
220 247
221=cut 248=cut
222 249
223BEGIN { 250$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 251 my $msg = join "", @_;
226 252
227 $msg .= "\n" 253 $msg .= "\n"
228 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
229 255
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 257
232 LOG llevError, $msg; 258 LOG llevError, $msg;
233 }; 259};
234}
235 260
236$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
238 265
239 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 268 return;#d#
242 }#d# 269 }#d#
243 270
244 # kill coroutine otherwise 271 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 272 Coro::terminate
247}; 273};
248
249$SIG{__DIE__} = sub { }; #d#?
250 274
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 292)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 294}
271 295
272$EV::DIED = sub { 296$EV::DIED = sub {
273 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
274}; 298};
275 299
276############################################################################# 300#############################################################################
277 301
278=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
375} 399}
376 400
377=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
378 402
379Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 404get spread over time.
381 405
382=cut 406=cut
383 407
384sub periodic($$) { 408sub periodic($$) {
385 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
402 426
403=cut 427=cut
404 428
405our @SLOT_QUEUE; 429our @SLOT_QUEUE;
406our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
407 432
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
411 436
412 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
413 439
414 while () { 440 while () {
415 next_job: 441 next_job:
442
416 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 444
418 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 449 $job->[2]->send;
422 Coro::cede; 450 Coro::cede;
423 goto next_job; 451 goto next_job;
424 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 454 }
426 } 455 }
427 456
428 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 460 $signal->wait;
432 } else { 461 } else {
462 $busy = 0;
433 Coro::schedule; 463 Coro::schedule;
434 } 464 }
435 } 465 }
436}; 466};
437 467
438sub get_slot($;$$) { 468sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
440 470
441 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
442 472
443 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
444 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
445 476
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
475 506
476sub sync_job(&) { 507sub sync_job(&) {
477 my ($job) = @_; 508 my ($job) = @_;
478 509
479 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 511 my $time = AE::time;
481 512
482 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
484 515
485 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
502 } else { 533 } else {
503 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
504 } 535 }
505 } 536 }
506 537
507 my $time = EV::time - $time; 538 my $time = AE::time - $time;
508 539
509 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
510 541
511 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
512 } else { 543 } else {
… …
556 reset_signals; 587 reset_signals;
557 &$cb 588 &$cb
558 }, @args; 589 }, @args;
559 590
560 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
561} 603}
562 604
563=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
564 606
565=cut 607=cut
… …
1151 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1152 1194
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1200 aio_fsync $fh;
1201 }
1157 aio_close $fh; 1202 aio_close $fh;
1158 1203
1159 if (@$objs) { 1204 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1211 aio_fsync $fh;
1212 }
1165 aio_close $fh; 1213 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1215 }
1168 } else { 1216 } else {
1169 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
… …
1276} 1324}
1277 1325
1278use File::Glob (); 1326use File::Glob ();
1279 1327
1280cf::player->attach ( 1328cf::player->attach (
1281 on_command => sub { 1329 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1283 1331
1284 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1285 or return; 1333 or return;
1286 1334
… …
1320 1368
1321# "readahead" all extensions 1369# "readahead" all extensions
1322sub cache_extensions { 1370sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1371 my $grp = IO::AIO::aio_group;
1324 1372
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1374 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1376 }
1329 }; 1377 };
1330 1378
… …
1365 . "\n};\n1"; 1413 . "\n};\n1";
1366 1414
1367 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1368 } 1416 }
1369 1417
1418 my $pass = 0;
1370 my %done; 1419 my %done;
1371 while (%todo) { 1420 while (%todo) {
1372 my $progress; 1421 my $progress;
1373 1422
1423 ++$pass;
1424
1425 ext:
1374 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1428 next ext
1377 unless exists $done{$_}; 1429 unless exists $done{$_};
1378 } 1430 }
1379 1431
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1433
1382 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1438
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1440 if exists $v->{meta}{mandatory};
1390 1441 } else {
1391 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1392 } 1448 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1449 }
1398 1450
1399 skip: 1451 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1402 } 1459 }
1403 }; 1460 };
1404} 1461}
1405 1462
1406############################################################################# 1463#############################################################################
… …
1490 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1491 } 1548 }
1492 } 1549 }
1493} 1550}
1494 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1495sub save($) { 1565sub save($) {
1496 my ($pl) = @_; 1566 my ($pl) = @_;
1497 1567
1498 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1499 1569
… …
1504 1574
1505 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1507 1577
1508 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1582
1510 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1584 cf::cede_to_tick;
1512} 1585}
1513 1586
… …
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1800
1728 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1802 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1982 2055
1983 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1984 } 2057 }
1985} 2058}
1986 2059
1987sub pre_load { } 2060sub pre_load { }
1988sub post_load { } 2061#sub post_load { } # XS
1989 2062
1990sub load { 2063sub load {
1991 my ($self) = @_; 2064 my ($self) = @_;
1992 2065
1993 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2050 } 2123 }
2051 2124
2052 $self->post_load; 2125 $self->post_load;
2053} 2126}
2054 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2055sub customise_for { 2131sub customise_for {
2056 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2057 2133
2058 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2135 if $self->per_player;
… …
2213 2289
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2291
2216 return if $self->players; 2292 return if $self->players;
2217 2293
2218 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2219 2295
2220 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2221 2297
2222 # need to save uniques path 2298 # need to save uniques path
2223 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
… …
2314 : normalise $_ 2390 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2392 ]
2317} 2393}
2318 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2319=back 2427=back
2320 2428
2321=head3 cf::object 2429=head3 cf::object
2322 2430
2323=cut 2431=cut
… …
2518 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2520 2628
2521 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2524 2632
2525 $map->load; 2633 $map->load;
2526 $map->load_neighbours; 2634 $map->load_neighbours;
2527 2635
2528 return unless $self->contr->active; 2636 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2637
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2534} 2643}
2535 2644
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2537 2646
2538Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
… …
2726 2835
2727 utf8::encode $text; 2836 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2729} 2838}
2730 2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2863}
2864
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2866
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2734client if neccessary. C<$type> should be a string identifying the type of 2868client if neccessary. C<$type> should be a string identifying the type of
2735the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2737 2871
2738=cut 2872=cut
2739 2873
2740# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2742 "c/identify" => { 2882 "c/identify" => {
2743 id => "infobox", 2883 id => "infobox",
2744 title => "Identify", 2884 title => "Identify",
2745 reply => undef, 2885 reply => undef,
2746 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
… …
2748 "c/examine" => { 2888 "c/examine" => {
2749 id => "infobox", 2889 id => "infobox",
2750 title => "Examine", 2890 title => "Examine",
2751 reply => undef, 2891 reply => undef,
2752 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2899 },
2754 "c/book" => { 2900 "c/book" => {
2755 id => "infobox", 2901 id => "infobox",
2756 title => "Book", 2902 title => "Book",
2757 reply => undef, 2903 reply => undef,
… …
2785 id => "infobox", 2931 id => "infobox",
2786 title => "Skills", 2932 title => "Skills",
2787 reply => undef, 2933 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2934 tooltip => "Shows your experience per skill and item power",
2789 }, 2935 },
2936 "c/shopitems" => {
2937 id => "infobox",
2938 title => "Shop Items",
2939 reply => undef,
2940 tooltip => "Shows the items currently for sale in this shop",
2941 },
2790 "c/resistances" => { 2942 "c/resistances" => {
2791 id => "infobox", 2943 id => "infobox",
2792 title => "Resistances", 2944 title => "Resistances",
2793 reply => undef, 2945 reply => undef,
2794 tooltip => "Shows your resistances", 2946 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2948 "c/pets" => {
2797 id => "infobox", 2949 id => "infobox",
2798 title => "Pets", 2950 title => "Pets",
2799 reply => undef, 2951 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2952 tooltip => "Shows information abotu your pets/a specific pet",
2953 },
2954 "c/perceiveself" => {
2955 id => "infobox",
2956 title => "Perceive Self",
2957 reply => undef,
2958 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2959 },
2802 "c/uptime" => { 2960 "c/uptime" => {
2803 id => "infobox", 2961 id => "infobox",
2804 title => "Uptime", 2962 title => "Uptime",
2805 reply => undef, 2963 reply => undef,
… …
2861 my $pkt = "msg " 3019 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3022 );
2865 3023
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2877} 3025}
2878 3026
2879=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2880 3028
2881Sends an ext event to the client. 3029Sends an ext event to the client.
… …
2884 3032
2885sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2887 3035
2888 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3041 }
2894} 3042}
2895 3043
2896=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2897 3045
… …
2901 3049
2902sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2904 3052
2905 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3056 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3059 }
2912} 3060}
2913 3061
2914=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2915 3063
… …
3016 3164
3017 $coro 3165 $coro
3018} 3166}
3019 3167
3020cf::client->attach ( 3168cf::client->attach (
3021 on_destroy => sub { 3169 on_client_destroy => sub {
3022 my ($ns) = @_; 3170 my ($ns) = @_;
3023 3171
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3173 },
3026); 3174);
… …
3042our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3043 3191
3044$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3045 3193
3046$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3049 sort time 3197 sort time
3050)); 3198));
3051 3199
3052# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
… …
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3106 3254
3107 %vars = (_dummy => 0) unless %vars; 3255 %vars = (_dummy => 0) unless %vars;
3108 3256
3257 my @res;
3109 local $_; 3258 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3259
3112 my $eval = 3260 my $eval =
3113 "do {\n" 3261 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3264 . $code
3117 . "\n}" 3265 . "\n}"
3118 ; 3266 ;
3119 3267
3268 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3123 3277
3124 if ($@) { 3278 if ($@) {
3125 warn "$@"; 3279 warn "$@";
3126 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
… …
3146=cut 3300=cut
3147 3301
3148sub register_script_function { 3302sub register_script_function {
3149 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3150 3304
3151 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3153} 3307}
3154 3308
3155=back 3309=back
3156 3310
3157=cut 3311=cut
… …
3178 3332
3179 $facedata->{version} == 2 3333 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3335
3182 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3339 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3342 };
3187 cf::cede_to_tick; 3343 cf::cede_to_tick;
3188 3344
3189 { 3345 {
3190 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
… …
3192 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3350
3195 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3355
3200 cf::cede_to_tick; 3356 cf::cede_to_tick;
3201 } 3357 }
3202 3358
3203 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
… …
3227 3383
3228 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3229 } 3385 }
3230 3386
3231 { 3387 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3235 3389
3236 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3393
3241 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3256 } else { 3396 } else {
3257 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3258 } 3398 }
3259 3399
… …
3343 3483
3344 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3345} 3485}
3346 3486
3347sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3491 or return;
3350 3492
3351 local $/; 3493 local $/;
3352 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3353 3495
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3355 3497
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3505 };
3364 warn $@ if $@; 3506 warn $@ if $@;
3365 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3366} 3510}
3367 3511
3368sub pidfile() { 3512sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
… …
3382 3526
3383 seek $fh, 0, 0; 3527 seek $fh, 0, 0;
3384 print $fh $$; 3528 print $fh $$;
3385} 3529}
3386 3530
3531sub main_loop {
3532 warn "EV::loop starting\n";
3533 if (1) {
3534 EV::loop;
3535 }
3536 warn "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP;
3538}
3539
3387sub main { 3540sub main {
3388 cf::init_globals; # initialise logging 3541 cf::init_globals; # initialise logging
3389 3542
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3547
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3549
3402 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
… …
3409 }; 3557 };
3410 3558
3411 evthread_start IO::AIO::poll_fileno; 3559 evthread_start IO::AIO::poll_fileno;
3412 3560
3413 cf::sync_job { 3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3414 reload_resources; 3570 reload_resources;
3415 reload_config; 3571 reload_config;
3416 db_init; 3572 db_init;
3417 3573
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3574 cf::init_uuid;
3421 cf::init_signals; 3575 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3576 cf::init_skills;
3424 3577
3425 cf::init_beforeplay; 3578 cf::init_beforeplay;
3426 3579
3427 atomic; 3580 atomic;
… …
3429 load_extensions; 3582 load_extensions;
3430 3583
3431 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3432 3585
3433 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3589
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3591 };
3438 3592
3439 EV::loop; 3593 main_loop;
3440} 3594}
3441 3595
3442############################################################################# 3596#############################################################################
3443# initialisation and cleanup 3597# initialisation and cleanup
3444 3598
3445# install some emergency cleanup handlers 3599# install some emergency cleanup handlers
3446BEGIN { 3600BEGIN {
3447 our %SIGWATCHER = (); 3601 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3602 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3603 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3604 cf::cleanup "SIG$signal";
3451 }; 3605 };
3452 } 3606 }
3453} 3607}
3454 3608
3455sub write_runtime_sync { 3609sub write_runtime_sync {
3610 my $t0 = AE::time;
3611
3456 # first touch the runtime file to show we are still running: 3612 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3613 # the fsync below can take a very very long time.
3458 3614
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3615 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3616
3461 my $guard = cf::lock_acquire "write_runtime"; 3617 my $guard = cf::lock_acquire "write_runtime";
3462 3618
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3619 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3620 or return;
3465 3621
3466 my $value = $cf::RUNTIME + 90 + 10; 3622 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3623 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3624 # 60 allows for the watchdog to kill the server.
… …
3481 or return; 3637 or return;
3482 3638
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3640 and return;
3485 3641
3486 warn "runtime file written.\n"; 3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3643
3488 1 3644 1
3489} 3645}
3490 3646
3491our $uuid_lock; 3647our $uuid_lock;
… …
3629 return; 3785 return;
3630 } 3786 }
3631 3787
3632 return if $RELOAD++; 3788 return if $RELOAD++;
3633 3789
3634 my $t1 = EV::time; 3790 my $t1 = AE::time;
3635 3791
3636 while ($RELOAD) { 3792 while ($RELOAD) {
3637 warn "reloading..."; 3793 warn "reloading...";
3638 3794
3639 warn "entering sync_job"; 3795 warn "entering sync_job";
… …
3710 3866
3711 warn "unload completed, starting to reload now"; 3867 warn "unload completed, starting to reload now";
3712 3868
3713 warn "reloading cf.pm"; 3869 warn "reloading cf.pm";
3714 require cf; 3870 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3871 cf::_connect_to_perl_1;
3716 3872
3717 warn "loading config and database again"; 3873 warn "loading config and database again";
3718 cf::reload_config; 3874 cf::reload_config;
3719 3875
3720 warn "loading extensions"; 3876 warn "loading extensions";
… …
3742 3898
3743 warn "reloaded"; 3899 warn "reloaded";
3744 --$RELOAD; 3900 --$RELOAD;
3745 } 3901 }
3746 3902
3747 $t1 = EV::time - $t1; 3903 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3904 warn "reload completed in ${t1}s\n";
3749}; 3905};
3750 3906
3751our $RELOAD_WATCHER; # used only during reload 3907our $RELOAD_WATCHER; # used only during reload
3752 3908
… …
3755 # coro crashes during coro_state_free->destroy here. 3911 # coro crashes during coro_state_free->destroy here.
3756 3912
3757 $RELOAD_WATCHER ||= cf::async { 3913 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3914 Coro::AIO::aio_wait cache_extensions;
3759 3915
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3916 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3917 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3918 undef $RELOAD_WATCHER;
3763 }; 3919 };
3764 }; 3920 };
3765} 3921}
… …
3782 3938
3783our @WAIT_FOR_TICK; 3939our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 3940our @WAIT_FOR_TICK_BEGIN;
3785 3941
3786sub wait_for_tick { 3942sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 3944
3789 my $signal = new Coro::Signal; 3945 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 3946 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 3947 $signal->wait;
3792} 3948}
3793 3949
3794sub wait_for_tick_begin { 3950sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 3952
3797 my $signal = new Coro::Signal; 3953 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 3954 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 3955 $signal->wait;
3800} 3956}
… …
3805 unless ++$bug_warning > 10; 3961 unless ++$bug_warning > 10;
3806 return; 3962 return;
3807 } 3963 }
3808 3964
3809 cf::server_tick; # one server iteration 3965 cf::server_tick; # one server iteration
3966
3967 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3810 3968
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 3971 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 3972 $Coro::current->{desc} = "runtime saver";
… …
3837} 3995}
3838 3996
3839{ 3997{
3840 # configure BDB 3998 # configure BDB
3841 3999
3842 BDB::min_parallel 8; 4000 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4001 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4002 $AnyEvent::BDB::WATCHER->priority (1);
3845 4003
3846 unless ($DB_ENV) { 4004 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4005 $DB_ENV = BDB::db_env_create;
… …
3928 } 4086 }
3929} 4087}
3930 4088
3931# load additional modules 4089# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4090require "cf/$_.pm" for @EXTRA_MODULES;
4091cf::_connect_to_perl_2;
3933 4092
3934END { cf::emergency_save } 4093END { cf::emergency_save }
3935 4094
39361 40951
3937 4096

Diff Legend

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