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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
117our %CFG; 131our %CFG;
118 132
119our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 134our $RUNTIME;
121our $NOW; 135our $NOW;
… …
132our $JITTER; # average jitter 146our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
134 148
135our @POST_INIT; 149our @POST_INIT;
136 150
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
138 153
139binmode STDOUT; 154binmode STDOUT;
140binmode STDERR; 155binmode STDERR;
141 156
142# read virtual server time, if available 157# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
147} 162}
148 163
164eval "sub TICK() { $TICK } 1" or die;
165
149mkdir $_ 166mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 168
152our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
153 170
154sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 187
156############################################################################# 188#############################################################################
157 189
158=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
159 191
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 240
209=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
210 242
211This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 245that call.
214 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
215=back 253=back
216 254
217=cut 255=cut
218 256
219BEGIN { 257$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 258 my $msg = join "", @_;
222 259
223 $msg .= "\n" 260 $msg .= "\n"
224 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
225 262
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 264
228 LOG llevError, $msg; 265 LOG llevError, $msg;
229 }; 266};
230}
231 267
232$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
234 270
235 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 275 return;#d#
238 }#d# 276 }#d#
239 277
240 # kill coroutine otherwise 278 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 279 Coro::terminate
243}; 280};
244
245$SIG{__DIE__} = sub { }; #d#?
246 281
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 299)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 301}
267 302
268$EV::DIED = sub { 303$EV::DIED = sub {
269 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
270}; 305};
271 306
272############################################################################# 307#############################################################################
273 308
274=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
371} 406}
372 407
373=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
374 409
375Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 411get spread over time.
377 412
378=cut 413=cut
379 414
380sub periodic($$) { 415sub periodic($$) {
381 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
398 433
399=cut 434=cut
400 435
401our @SLOT_QUEUE; 436our @SLOT_QUEUE;
402our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
403 439
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
407 443
408 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
409 446
410 while () { 447 while () {
411 next_job: 448 next_job:
449
412 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 451
414 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 456 $job->[2]->send;
418 Coro::cede; 457 Coro::cede;
419 goto next_job; 458 goto next_job;
420 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 461 }
422 } 462 }
423 463
424 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 467 $signal->wait;
428 } else { 468 } else {
469 $busy = 0;
429 Coro::schedule; 470 Coro::schedule;
430 } 471 }
431 } 472 }
432}; 473};
433 474
434sub get_slot($;$$) { 475sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
436 477
437 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
438 479
439 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
440 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
441 483
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
471 513
472sub sync_job(&) { 514sub sync_job(&) {
473 my ($job) = @_; 515 my ($job) = @_;
474 516
475 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 518 my $time = AE::time;
477 519
478 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
480 522
481 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
498 } else { 540 } else {
499 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
500 } 542 }
501 } 543 }
502 544
503 my $time = EV::time - $time; 545 my $time = AE::time - $time;
504 546
505 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
506 548
507 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
508 } else { 550 } else {
… …
552 reset_signals; 594 reset_signals;
553 &$cb 595 &$cb
554 }, @args; 596 }, @args;
555 597
556 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
557} 610}
558 611
559=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
560 613
561=cut 614=cut
… …
1142 1195
1143 sync_job { 1196 sync_job {
1144 if (length $$rdata) { 1197 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1148 1202
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1153 aio_close $fh; 1210 aio_close $fh;
1154 1211
1155 if (@$objs) { 1212 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1161 aio_close $fh; 1221 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1223 }
1164 } else { 1224 } else {
1165 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
… …
1203 $av = $st->{objs}; 1263 $av = $st->{objs};
1204 } 1264 }
1205 1265
1206 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1209 1270
1210 ($data, $av) 1271 ($data, $av)
1211} 1272}
1212 1273
1213=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1272} 1333}
1273 1334
1274use File::Glob (); 1335use File::Glob ();
1275 1336
1276cf::player->attach ( 1337cf::player->attach (
1277 on_command => sub { 1338 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1279 1340
1280 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1281 or return; 1342 or return;
1282 1343
… …
1316 1377
1317# "readahead" all extensions 1378# "readahead" all extensions
1318sub cache_extensions { 1379sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1380 my $grp = IO::AIO::aio_group;
1320 1381
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1383 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1385 }
1325 }; 1386 };
1326 1387
… …
1361 . "\n};\n1"; 1422 . "\n};\n1";
1362 1423
1363 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1364 } 1425 }
1365 1426
1427 my $pass = 0;
1366 my %done; 1428 my %done;
1367 while (%todo) { 1429 while (%todo) {
1368 my $progress; 1430 my $progress;
1369 1431
1432 ++$pass;
1433
1434 ext:
1370 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1437 next ext
1373 unless exists $done{$_}; 1438 unless exists $done{$_};
1374 } 1439 }
1375 1440
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1442
1378 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1447
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1449 if exists $v->{meta}{mandatory};
1386 1450
1387 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1388 } 1460 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1461 }
1394 1462
1395 skip: 1463 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1398 } 1471 }
1399 }; 1472 };
1400} 1473}
1401 1474
1402############################################################################# 1475#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1487 } 1560 }
1488 } 1561 }
1489} 1562}
1490 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1491sub save($) { 1577sub save($) {
1492 my ($pl) = @_; 1578 my ($pl) = @_;
1493 1579
1494 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1495 1581
… …
1500 1586
1501 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1503 1589
1504 cf::get_slot 0.01; 1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1594
1506 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1596 cf::cede_to_tick;
1508} 1597}
1509 1598
… …
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1636
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1549 $pl->deactivate; 1638 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1553 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1554 1642
1555 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1611 \@logins 1699 \@logins
1612} 1700}
1613 1701
1614=item $player->maps 1702=item $player->maps
1615 1703
1704=item cf::player::maps $login
1705
1616Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1617player. May block. 1707player. May block.
1618 1708
1619=cut 1709=cut
1620 1710
… …
1682=cut 1772=cut
1683 1773
1684sub find_by_path($) { 1774sub find_by_path($) {
1685 my ($path) = @_; 1775 my ($path) = @_;
1686 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1687 my ($match, $specificity); 1779 my ($match, $specificity);
1688 1780
1689 for my $region (list) { 1781 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1815
1724 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1817 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1754 1846
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1848}
1757 1849
1758# also paths starting with '/' 1850# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1852
1761sub thawer_merge { 1853sub thawer_merge {
1762 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1763 1855
1764 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
1978 2070
1979 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1980 } 2072 }
1981} 2073}
1982 2074
1983sub pre_load { } 2075sub pre_load { }
1984sub post_load { } 2076#sub post_load { } # XS
1985 2077
1986sub load { 2078sub load {
1987 my ($self) = @_; 2079 my ($self) = @_;
1988 2080
1989 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
… …
2046 } 2138 }
2047 2139
2048 $self->post_load; 2140 $self->post_load;
2049} 2141}
2050 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2051sub customise_for { 2146sub customise_for {
2052 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2053 2148
2054 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2150 if $self->per_player;
… …
2071 or next; 2166 or next;
2072 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2073 or next; 2168 or next;
2074 $neigh->load; 2169 $neigh->load;
2075 2170
2171 # now find the diagonal neighbours
2076 push @neigh, 2172 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2175 }
2080 2176
… …
2132 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2133 2229
2134 () 2230 ()
2135} 2231}
2136 2232
2233# common code, used by both ->save and ->swapout
2137sub save { 2234sub _save {
2138 my ($self) = @_; 2235 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2236
2142 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2143 2238
2144 return unless $self->dirty; 2239 return unless $self->dirty;
2145 2240
… …
2165 } else { 2260 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2262 }
2168} 2263}
2169 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2170sub swap_out { 2273sub swap_out {
2171 my ($self) = @_; 2274 my ($self) = @_;
2172 2275
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2277
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2181 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2183 2332
2184 $self->deactivate; 2333 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2335 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2336
2232 $self->unlink_save; 2337 $self->unlink_save;
2233 $self->destroy; 2338 $self->destroy;
2234} 2339}
2235 2340
… …
2243 2348
2244 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2245 2350
2246 $self->unlink_save; 2351 $self->unlink_save;
2247 2352
2248 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2358
… …
2310 : normalise $_ 2415 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2417 ]
2313} 2418}
2314 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2315=back 2452=back
2316 2453
2317=head3 cf::object 2454=head3 cf::object
2318 2455
2319=cut 2456=cut
… …
2384 2521
2385our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2386 id => "say", 2523 id => "say",
2387 title => "Map", 2524 title => "Map",
2388 reply => "say ", 2525 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2527};
2391 2528
2392our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2393 id => "chat", 2530 id => "chat",
2394 title => "Chat", 2531 title => "Chat",
… …
2451 2588
2452Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2453 2590
2454The player should be reasonably safe there for short amounts of time (e.g. 2591The player should be reasonably safe there for short amounts of time (e.g.
2455for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link 2593though, as the player cannot control the character while it is on the link
2457map. 2594map.
2458 2595
2459Will never block. 2596Will never block.
2460 2597
2461=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2482sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2483 my ($self) = @_; 2620 my ($self) = @_;
2484 2621
2485 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2486 2623
2624 ++$self->{_link_recursion};
2625
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2627
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2491 2630
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2632}
2494 2633
2495sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2497 2636
… …
2514 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2516 2655
2517 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2520 2659
2521 $map->load; 2660 $map->load;
2522 $map->load_neighbours; 2661 $map->load_neighbours;
2523 2662
2524 return unless $self->contr->active; 2663 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2664
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2530} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2531 2672
2673}
2674
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2676
2534Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
… …
2544 2687
2545our $GOTOGEN; 2688our $GOTOGEN;
2546 2689
2547sub cf::object::player::goto { 2690sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2549 2698
2550 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2701
2553 $self->enter_link; 2702 $self->enter_link;
… …
2577 my $map = eval { 2726 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2579 2728
2580 if ($map) { 2729 if ($map) {
2581 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2732 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2734 }
2586 2735
2587 $map 2736 $map
… …
2595 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2598 } 2747 }
2599 2748
2600 $done->() if $done; 2749 $done->($self) if $done;
2601 })->prio (1); 2750 })->prio (1);
2602} 2751}
2603 2752
2604=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2605 2754
… …
2722 2871
2723 utf8::encode $text; 2872 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2725} 2874}
2726 2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2899}
2900
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2902
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2730client if neccessary. C<$type> should be a string identifying the type of 2904client if neccessary. C<$type> should be a string identifying the type of
2731the message, with C<log> being the default. If C<$color> is negative, suppress 2905the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2733 2907
2734=cut 2908=cut
2735 2909
2736# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2738 "c/identify" => { 2918 "c/identify" => {
2739 id => "infobox", 2919 id => "infobox",
2740 title => "Identify", 2920 title => "Identify",
2741 reply => undef, 2921 reply => undef,
2742 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
… …
2744 "c/examine" => { 2924 "c/examine" => {
2745 id => "infobox", 2925 id => "infobox",
2746 title => "Examine", 2926 title => "Examine",
2747 reply => undef, 2927 reply => undef,
2748 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 2935 },
2750 "c/book" => { 2936 "c/book" => {
2751 id => "infobox", 2937 id => "infobox",
2752 title => "Book", 2938 title => "Book",
2753 reply => undef, 2939 reply => undef,
… …
2781 id => "infobox", 2967 id => "infobox",
2782 title => "Skills", 2968 title => "Skills",
2783 reply => undef, 2969 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 2970 tooltip => "Shows your experience per skill and item power",
2785 }, 2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2786 "c/resistances" => { 2978 "c/resistances" => {
2787 id => "infobox", 2979 id => "infobox",
2788 title => "Resistances", 2980 title => "Resistances",
2789 reply => undef, 2981 reply => undef,
2790 tooltip => "Shows your resistances", 2982 tooltip => "Shows your resistances",
… …
2792 "c/pets" => { 2984 "c/pets" => {
2793 id => "infobox", 2985 id => "infobox",
2794 title => "Pets", 2986 title => "Pets",
2795 reply => undef, 2987 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet", 2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2797 }, 2995 },
2798 "c/uptime" => { 2996 "c/uptime" => {
2799 id => "infobox", 2997 id => "infobox",
2800 title => "Uptime", 2998 title => "Uptime",
2801 reply => undef, 2999 reply => undef,
… …
2857 my $pkt = "msg " 3055 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3058 );
2861 3059
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2873} 3061}
2874 3062
2875=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2876 3064
2877Sends an ext event to the client. 3065Sends an ext event to the client.
… …
2880 3068
2881sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2883 3071
2884 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3077 }
2890} 3078}
2891 3079
2892=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2893 3081
… …
2897 3085
2898sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2900 3088
2901 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3092 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3095 }
2908} 3096}
2909 3097
2910=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2911 3099
… …
3012 3200
3013 $coro 3201 $coro
3014} 3202}
3015 3203
3016cf::client->attach ( 3204cf::client->attach (
3017 on_destroy => sub { 3205 on_client_destroy => sub {
3018 my ($ns) = @_; 3206 my ($ns) = @_;
3019 3207
3020 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3021 }, 3209 },
3022); 3210);
… …
3038our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3039 3227
3040$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3041 3229
3042$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3045 sort time 3233 sort time
3046)); 3234));
3047 3235
3048# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
… …
3052The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3053 3241
3054 cf::object 3242 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3057 3246
3058 cf::object::player 3247 cf::object::player
3059 player 3248 player
3060 3249
3061 cf::player 3250 cf::player
… …
3067=cut 3256=cut
3068 3257
3069for ( 3258for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3076) { 3265) {
3077 no strict 'refs'; 3266 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3097 3286
3098 my $qcode = $code; 3287 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3101 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3102 local $_; 3294 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3295
3105 my $eval = 3296 my $eval =
3106 "do {\n" 3297 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3300 . $code
3110 . "\n}" 3301 . "\n}"
3111 ; 3302 ;
3112 3303
3304 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3116 3313
3117 if ($@) { 3314 if ($@) {
3118 warn "$@"; 3315 warn "$@";
3119 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
… …
3139=cut 3336=cut
3140 3337
3141sub register_script_function { 3338sub register_script_function {
3142 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3143 3340
3144 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3146} 3343}
3147 3344
3148=back 3345=back
3149 3346
3150=cut 3347=cut
… …
3171 3368
3172 $facedata->{version} == 2 3369 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3371
3175 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3176 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3375 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3179 }; 3378 };
3180 cf::cede_to_tick; 3379 cf::cede_to_tick;
3181 3380
3182 { 3381 {
3183 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
… …
3185 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3386
3188 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3192 3391
3193 cf::cede_to_tick; 3392 cf::cede_to_tick;
3194 } 3393 }
3195 3394
3196 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
… …
3220 3419
3221 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3222 } 3421 }
3223 3422
3224 { 3423 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3228 3425
3229 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3429
3234 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3249 } else { 3432 } else {
3250 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3251 } 3434 }
3252 3435
… …
3336 3519
3337 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3338} 3521}
3339 3522
3340sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3342 or return; 3527 or return;
3343 3528
3344 local $/; 3529 local $/;
3345 *CFG = YAML::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3346 3531
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3533
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3536
3352 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
… …
3354 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3355 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3356 }; 3541 };
3357 warn $@ if $@; 3542 warn $@ if $@;
3358 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3359} 3546}
3360 3547
3361sub pidfile() { 3548sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!"; 3550 or die "$PIDFILE: $!";
… …
3375 3562
3376 seek $fh, 0, 0; 3563 seek $fh, 0, 0;
3377 print $fh $$; 3564 print $fh $$;
3378} 3565}
3379 3566
3567sub main_loop {
3568 warn "EV::loop starting\n";
3569 if (1) {
3570 EV::loop;
3571 }
3572 warn "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP;
3574}
3575
3380sub main { 3576sub main {
3381 cf::init_globals; # initialise logging 3577 cf::init_globals; # initialise logging
3382 3578
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392 3583
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394 3585
3395 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
… …
3402 }; 3593 };
3403 3594
3404 evthread_start IO::AIO::poll_fileno; 3595 evthread_start IO::AIO::poll_fileno;
3405 3596
3406 cf::sync_job { 3597 cf::sync_job {
3598 cf::init_experience;
3599 cf::init_anim;
3600 cf::init_attackmess;
3601 cf::init_dynamic;
3602
3603 cf::load_settings;
3604 cf::load_materials;
3605
3407 reload_resources; 3606 reload_resources;
3408 reload_config; 3607 reload_config;
3409 db_init; 3608 db_init;
3410 3609
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3610 cf::init_uuid;
3414 cf::init_signals; 3611 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills; 3612 cf::init_skills;
3417 3613
3418 cf::init_beforeplay; 3614 cf::init_beforeplay;
3419 3615
3420 atomic; 3616 atomic;
… …
3422 load_extensions; 3618 load_extensions;
3423 3619
3424 utime time, time, $RUNTIMEFILE; 3620 utime time, time, $RUNTIMEFILE;
3425 3621
3426 # no (long-running) fork's whatsoever before this point(!) 3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428 3625
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3626 (pop @POST_INIT)->(0) while @POST_INIT;
3430 }; 3627 };
3431 3628
3432 EV::loop; 3629 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n";
3631
3632 main_loop;
3433} 3633}
3434 3634
3435############################################################################# 3635#############################################################################
3436# initialisation and cleanup 3636# initialisation and cleanup
3437 3637
3438# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3439BEGIN { 3639BEGIN {
3440 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3441 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3442 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3443 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3444 }; 3644 };
3445 } 3645 }
3446} 3646}
3447 3647
3448sub write_runtime_sync { 3648sub write_runtime_sync {
3649 my $t0 = AE::time;
3650
3449 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3451 3653
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3655
3454 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3455 3657
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3659 or return;
3458 3660
3459 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
… …
3474 or return; 3676 or return;
3475 3677
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3679 and return;
3478 3680
3479 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3480 3682
3481 1 3683 1
3482} 3684}
3483 3685
3484our $uuid_lock; 3686our $uuid_lock;
… …
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) { 3813 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"}; 3814 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 } 3816 }
3615 warn "cleared package $pkg\n";#d#
3616} 3817}
3617 3818
3618sub do_reload_perl() { 3819sub do_reload_perl() {
3619 # can/must only be called in main 3820 # can/must only be called in main
3620 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3621 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3622 return; 3823 return;
3623 } 3824 }
3624 3825
3625 return if $RELOAD++; 3826 return if $RELOAD++;
3626 3827
3627 my $t1 = EV::time; 3828 my $t1 = AE::time;
3628 3829
3629 while ($RELOAD) { 3830 while ($RELOAD) {
3630 warn "reloading..."; 3831 warn "reloading...";
3631 3832
3632 warn "entering sync_job"; 3833 warn "entering sync_job";
… …
3693 clear_package "safe::$_" 3894 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3896
3696 warn "unloading cf.pm \"a bit\""; 3897 warn "unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3898 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 3900
3700 # don't, removes xs symbols, too, 3901 # don't, removes xs symbols, too,
3701 # and global variables created in xs 3902 # and global variables created in xs
3702 #clear_package __PACKAGE__; 3903 #clear_package __PACKAGE__;
3703 3904
3704 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3705 3906
3706 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3707 require cf; 3908 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3709 3910
3710 warn "loading config and database again"; 3911 warn "loading config and database again";
3711 cf::reload_config; 3912 cf::reload_config;
3712 3913
3713 warn "loading extensions"; 3914 warn "loading extensions";
… …
3735 3936
3736 warn "reloaded"; 3937 warn "reloaded";
3737 --$RELOAD; 3938 --$RELOAD;
3738 } 3939 }
3739 3940
3740 $t1 = EV::time - $t1; 3941 $t1 = AE::time - $t1;
3741 warn "reload completed in ${t1}s\n"; 3942 warn "reload completed in ${t1}s\n";
3742}; 3943};
3743 3944
3744our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3745 3946
… …
3748 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3749 3950
3750 $RELOAD_WATCHER ||= cf::async { 3951 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions; 3952 Coro::AIO::aio_wait cache_extensions;
3752 3953
3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl; 3955 do_reload_perl;
3755 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3756 }; 3957 };
3757 }; 3958 };
3758} 3959}
… …
3775 3976
3776our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3778 3979
3779sub wait_for_tick { 3980sub wait_for_tick {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 3982
3782 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 3985 $signal->wait;
3785} 3986}
3786 3987
3787sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 3990
3790 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 3993 $signal->wait;
3793} 3994}
… …
3798 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3799 return; 4000 return;
3800 } 4001 }
3801 4002
3802 cf::server_tick; # one server iteration 4003 cf::server_tick; # one server iteration
4004
4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3803 4006
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3806 Coro::async_pool { 4009 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
… …
3830} 4033}
3831 4034
3832{ 4035{
3833 # configure BDB 4036 # configure BDB
3834 4037
3835 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3838 4041
3839 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
… …
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4123 LOG llevInfo, "[ABT] [suppressed]\n";
3921 } 4124 }
3922} 4125}
3923 4126
3924# load additional modules 4127# load additional modules
3925use cf::pod; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3926 4130
3927END { cf::emergency_save } 4131END { cf::emergency_save }
3928 4132
39291 41331
3930 4134

Diff Legend

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