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.460 by root, Mon Dec 15 17:04:53 2008 UTC vs.
Revision 1.525 by root, Wed Apr 21 03:34:26 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE;
106 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 118our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
111 120
112our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 124our $DB_ENV;
116 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
117our %CFG; 128our %CFG;
118 129
119our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 131our $RUNTIME;
121our $NOW; 132our $NOW;
… …
132our $JITTER; # average jitter 143our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
134 145
135our @POST_INIT; 146our @POST_INIT;
136 147
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
138 150
139binmode STDOUT; 151binmode STDOUT;
140binmode STDERR; 152binmode STDERR;
141 153
142# read virtual server time, if available 154# read virtual server time, if available
… …
144 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
147} 159}
148 160
161eval "sub TICK() { $TICK } 1" or die;
162
149mkdir $_ 163mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 165
152our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
153 167
154sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 184
156############################################################################# 185#############################################################################
157 186
158=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
159 188
… …
206returns directly I<after> the tick processing (and consequently, can only wake one process 235returns 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. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 237
209=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
210 239
211This array contains the results of the last C<invoke ()> call. When 240This 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 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 242that call.
214 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
215=back 250=back
216 251
217=cut 252=cut
218 253
219BEGIN { 254$Coro::State::WARNHOOK = sub {
220 *CORE::GLOBAL::warn = sub {
221 my $msg = join "", @_; 255 my $msg = join "", @_;
222 256
223 $msg .= "\n" 257 $msg .= "\n"
224 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
225 259
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 261
228 LOG llevError, $msg; 262 LOG llevError, $msg;
229 }; 263};
230}
231 264
232$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
234 267
235 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 272 return;#d#
238 }#d# 273 }#d#
239 274
240 # kill coroutine otherwise 275 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 276 Coro::terminate
243}; 277};
244
245$SIG{__DIE__} = sub { }; #d#?
246 278
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
264)) { 296)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 298}
267 299
268$EV::DIED = sub { 300$EV::DIED = sub {
269 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
270}; 302};
271 303
272############################################################################# 304#############################################################################
273 305
274=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
371} 403}
372 404
373=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
374 406
375Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 408get spread over time.
377 409
378=cut 410=cut
379 411
380sub periodic($$) { 412sub periodic($$) {
381 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
398 430
399=cut 431=cut
400 432
401our @SLOT_QUEUE; 433our @SLOT_QUEUE;
402our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
403 436
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
407 440
408 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
409 443
410 while () { 444 while () {
411 next_job: 445 next_job:
446
412 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 448
414 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 453 $job->[2]->send;
418 Coro::cede; 454 Coro::cede;
419 goto next_job; 455 goto next_job;
420 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 458 }
422 } 459 }
423 460
424 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 464 $signal->wait;
428 } else { 465 } else {
466 $busy = 0;
429 Coro::schedule; 467 Coro::schedule;
430 } 468 }
431 } 469 }
432}; 470};
433 471
434sub get_slot($;$$) { 472sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
436 474
437 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
438 476
439 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
440 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
441 480
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
471 510
472sub sync_job(&) { 511sub sync_job(&) {
473 my ($job) = @_; 512 my ($job) = @_;
474 513
475 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 515 my $time = AE::time;
477 516
478 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
480 519
481 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
498 } else { 537 } else {
499 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
500 } 539 }
501 } 540 }
502 541
503 my $time = EV::time - $time; 542 my $time = AE::time - $time;
504 543
505 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
506 545
507 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
508 } else { 547 } else {
… …
552 reset_signals; 591 reset_signals;
553 &$cb 592 &$cb
554 }, @args; 593 }, @args;
555 594
556 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
557} 607}
558 608
559=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
560 610
561=cut 611=cut
… …
1147 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1148 1198
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1153 aio_close $fh; 1206 aio_close $fh;
1154 1207
1155 if (@$objs) { 1208 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1161 aio_close $fh; 1217 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1219 }
1164 } else { 1220 } else {
1165 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
… …
1272} 1328}
1273 1329
1274use File::Glob (); 1330use File::Glob ();
1275 1331
1276cf::player->attach ( 1332cf::player->attach (
1277 on_command => sub { 1333 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1279 1335
1280 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1281 or return; 1337 or return;
1282 1338
… …
1316 1372
1317# "readahead" all extensions 1373# "readahead" all extensions
1318sub cache_extensions { 1374sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1375 my $grp = IO::AIO::aio_group;
1320 1376
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1378 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1380 }
1325 }; 1381 };
1326 1382
… …
1361 . "\n};\n1"; 1417 . "\n};\n1";
1362 1418
1363 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1364 } 1420 }
1365 1421
1422 my $pass = 0;
1366 my %done; 1423 my %done;
1367 while (%todo) { 1424 while (%todo) {
1368 my $progress; 1425 my $progress;
1369 1426
1427 ++$pass;
1428
1429 ext:
1370 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1432 next ext
1373 unless exists $done{$_}; 1433 unless exists $done{$_};
1374 } 1434 }
1375 1435
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1437
1378 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1442
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1444 if exists $v->{meta}{mandatory};
1386 1445
1387 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1388 } 1455 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1456 }
1394 1457
1395 skip: 1458 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1398 } 1466 }
1399 }; 1467 };
1400} 1468}
1401 1469
1402############################################################################# 1470#############################################################################
… …
1486 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1487 } 1555 }
1488 } 1556 }
1489} 1557}
1490 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1491sub save($) { 1572sub save($) {
1492 my ($pl) = @_; 1573 my ($pl) = @_;
1493 1574
1494 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1495 1576
… …
1500 1581
1501 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1503 1584
1504 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1589
1506 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1591 cf::cede_to_tick;
1508} 1592}
1509 1593
… …
1611 \@logins 1695 \@logins
1612} 1696}
1613 1697
1614=item $player->maps 1698=item $player->maps
1615 1699
1700=item cf::player::maps $login
1701
1616Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1617player. May block. 1703player. May block.
1618 1704
1619=cut 1705=cut
1620 1706
… …
1682=cut 1768=cut
1683 1769
1684sub find_by_path($) { 1770sub find_by_path($) {
1685 my ($path) = @_; 1771 my ($path) = @_;
1686 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1687 my ($match, $specificity); 1775 my ($match, $specificity);
1688 1776
1689 for my $region (list) { 1777 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1811
1724 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1813 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1754 1842
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1844}
1757 1845
1758# also paths starting with '/' 1846# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1848
1761sub thawer_merge { 1849sub thawer_merge {
1762 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1763 1851
1764 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
1862 1950
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1865} 1953}
1866 1954
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874}
1875
1876sub decay_objects { 1955sub decay_objects {
1877 my ($self) = @_; 1956 my ($self) = @_;
1878 1957
1879 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1880 1959
… …
1987 2066
1988 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1989 } 2068 }
1990} 2069}
1991 2070
1992sub pre_load { } 2071sub pre_load { }
1993sub post_load { } 2072#sub post_load { } # XS
1994 2073
1995sub load { 2074sub load {
1996 my ($self) = @_; 2075 my ($self) = @_;
1997 2076
1998 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2043 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2123 $self->decay_objects;
2045 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2046 $self->update_buttons; 2125 $self->update_buttons;
2047 cf::cede_to_tick; 2126 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2127 $self->activate;
2051 } 2128 }
2052 2129
2053 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
… …
2057 } 2134 }
2058 2135
2059 $self->post_load; 2136 $self->post_load;
2060} 2137}
2061 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2062sub customise_for { 2142sub customise_for {
2063 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2064 2144
2065 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2146 if $self->per_player;
… …
2143 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2144 2224
2145 () 2225 ()
2146} 2226}
2147 2227
2228# common code, used by both ->save and ->swapout
2148sub save { 2229sub _save {
2149 my ($self) = @_; 2230 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2231
2153 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2154 2233
2155 return unless $self->dirty; 2234 return unless $self->dirty;
2156 2235
… …
2176 } else { 2255 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2257 }
2179} 2258}
2180 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2181sub swap_out { 2268sub swap_out {
2182 my ($self) = @_; 2269 my ($self) = @_;
2183 2270
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2272
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2192 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2194 2327
2195 $self->deactivate; 2328 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2330 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2331
2243 $self->unlink_save; 2332 $self->unlink_save;
2244 $self->destroy; 2333 $self->destroy;
2245} 2334}
2246 2335
… …
2254 2343
2255 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2256 2345
2257 $self->unlink_save; 2346 $self->unlink_save;
2258 2347
2259 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2353
… …
2321 : normalise $_ 2410 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2412 ]
2324} 2413}
2325 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2326=back 2447=back
2327 2448
2328=head3 cf::object 2449=head3 cf::object
2329 2450
2330=cut 2451=cut
… …
2395 2516
2396our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2397 id => "say", 2518 id => "say",
2398 title => "Map", 2519 title => "Map",
2399 reply => "say ", 2520 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2522};
2402 2523
2403our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2404 id => "chat", 2525 id => "chat",
2405 title => "Chat", 2526 title => "Chat",
… …
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2620
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2502 2623
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2625}
2505 2626
2506sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2508 2629
… …
2525 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2527 2648
2528 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2531 2652
2532 $map->load; 2653 $map->load;
2533 $map->load_neighbours; 2654 $map->load_neighbours;
2534 2655
2535 return unless $self->contr->active; 2656 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2657
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive
2663 unless exists $self->{_link_pos}; # maybe we re in-flight again
2541} 2664}
2542 2665
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2544 2667
2545Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
… …
2733 2856
2734 utf8::encode $text; 2857 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2736} 2859}
2737 2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2884}
2885
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 2887
2740Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2741client if neccessary. C<$type> should be a string identifying the type of 2889client if neccessary. C<$type> should be a string identifying the type of
2742the message, with C<log> being the default. If C<$color> is negative, suppress 2890the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2744 2892
2745=cut 2893=cut
2746 2894
2747# non-persistent channels (usually the info channel) 2895# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2749 "c/identify" => { 2903 "c/identify" => {
2750 id => "infobox", 2904 id => "infobox",
2751 title => "Identify", 2905 title => "Identify",
2752 reply => undef, 2906 reply => undef,
2753 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
… …
2755 "c/examine" => { 2909 "c/examine" => {
2756 id => "infobox", 2910 id => "infobox",
2757 title => "Examine", 2911 title => "Examine",
2758 reply => undef, 2912 reply => undef,
2759 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 2920 },
2761 "c/book" => { 2921 "c/book" => {
2762 id => "infobox", 2922 id => "infobox",
2763 title => "Book", 2923 title => "Book",
2764 reply => undef, 2924 reply => undef,
… …
2780 id => "infobox", 2940 id => "infobox",
2781 title => "Body Parts", 2941 title => "Body Parts",
2782 reply => undef, 2942 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 2943 tooltip => "Shows which body parts you posess and are available",
2784 }, 2944 },
2945 "c/statistics" => {
2946 id => "infobox",
2947 title => "Statistics",
2948 reply => undef,
2949 tooltip => "Shows your primary statistics",
2950 },
2785 "c/skills" => { 2951 "c/skills" => {
2786 id => "infobox", 2952 id => "infobox",
2787 title => "Skills", 2953 title => "Skills",
2788 reply => undef, 2954 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 2955 tooltip => "Shows your experience per skill and item power",
2956 },
2957 "c/shopitems" => {
2958 id => "infobox",
2959 title => "Shop Items",
2960 reply => undef,
2961 tooltip => "Shows the items currently for sale in this shop",
2962 },
2963 "c/resistances" => {
2964 id => "infobox",
2965 title => "Resistances",
2966 reply => undef,
2967 tooltip => "Shows your resistances",
2968 },
2969 "c/pets" => {
2970 id => "infobox",
2971 title => "Pets",
2972 reply => undef,
2973 tooltip => "Shows information abotu your pets/a specific pet",
2974 },
2975 "c/perceiveself" => {
2976 id => "infobox",
2977 title => "Perceive Self",
2978 reply => undef,
2979 tooltip => "You gained detailed knowledge about yourself",
2790 }, 2980 },
2791 "c/uptime" => { 2981 "c/uptime" => {
2792 id => "infobox", 2982 id => "infobox",
2793 title => "Uptime", 2983 title => "Uptime",
2794 reply => undef, 2984 reply => undef,
… …
2804 id => "party", 2994 id => "party",
2805 title => "Party", 2995 title => "Party",
2806 reply => "gsay ", 2996 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 2997 tooltip => "Messages and chat related to your party",
2808 }, 2998 },
2999 "c/death" => {
3000 id => "death",
3001 title => "Death",
3002 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death",
3004 },
3005 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL,
2809); 3007);
2810 3008
2811sub cf::client::send_msg { 3009sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3011
… …
2818 3016
2819 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3018 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3019 $channel = $CHANNEL{$channel};
2822 3020
2823 $self->ext_msg (channel_info => $channel) 3021 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2827 3023
2828 } elsif (ref $channel) { 3024 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3029 }
2835 3030
2836 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2837 } 3032 }
2838 3033
2839 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2840 3035
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3036 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2845 3039
2846 my $pkt = "msg " 3040 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3041 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3043 );
2850 3044
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3045 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3046}
2888 3047
2889=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2890 3049
2891Sends an ext event to the client. 3050Sends an ext event to the client.
… …
2894 3053
2895sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2897 3056
2898 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3062 }
2904} 3063}
2905 3064
2906=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2907 3066
… …
2911 3070
2912sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2914 3073
2915 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3077 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3080 }
2922} 3081}
2923 3082
2924=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2925 3084
… …
3026 3185
3027 $coro 3186 $coro
3028} 3187}
3029 3188
3030cf::client->attach ( 3189cf::client->attach (
3031 on_destroy => sub { 3190 on_client_destroy => sub {
3032 my ($ns) = @_; 3191 my ($ns) = @_;
3033 3192
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3194 },
3036); 3195);
… …
3052our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3053 3212
3054$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3055 3214
3056$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3059 sort time 3218 sort time
3060)); 3219));
3061 3220
3062# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
… …
3066The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
3067 3226
3068 cf::object 3227 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3228 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3229 insert remove name archname title slaying race decrease split
3230 value
3071 3231
3072 cf::object::player 3232 cf::object::player
3073 player 3233 player
3074 3234
3075 cf::player 3235 cf::player
… …
3081=cut 3241=cut
3082 3242
3083for ( 3243for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3244 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3246 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
3090) { 3250) {
3091 no strict 'refs'; 3251 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3111 3271
3112 my $qcode = $code; 3272 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3115 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
3116 local $_; 3279 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3280
3119 my $eval = 3281 my $eval =
3120 "do {\n" 3282 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3285 . $code
3124 . "\n}" 3286 . "\n}"
3125 ; 3287 ;
3126 3288
3289 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
3130 3298
3131 if ($@) { 3299 if ($@) {
3132 warn "$@"; 3300 warn "$@";
3133 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
… …
3153=cut 3321=cut
3154 3322
3155sub register_script_function { 3323sub register_script_function {
3156 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3157 3325
3158 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3160} 3328}
3161 3329
3162=back 3330=back
3163 3331
3164=cut 3332=cut
… …
3185 3353
3186 $facedata->{version} == 2 3354 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3356
3189 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3360 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3363 };
3194 cf::cede_to_tick; 3364 cf::cede_to_tick;
3195 3365
3196 { 3366 {
3197 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
… …
3199 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3371
3202 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3206 3376
3207 cf::cede_to_tick; 3377 cf::cede_to_tick;
3208 } 3378 }
3209 3379
3210 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
… …
3234 3404
3235 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3236 } 3406 }
3237 3407
3238 { 3408 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3242 3410
3243 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3412 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3414
3248 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3416 cf::face::set_type $idx, $info->{type};
3263 } else { 3417 } else {
3264 $RESOURCE{$name} = $info; 3418 $RESOURCE{$name} = $info;
3265 } 3419 }
3266 3420
… …
3350 3504
3351 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3352} 3506}
3353 3507
3354sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3356 or return; 3512 or return;
3357 3513
3358 local $/; 3514 local $/;
3359 *CFG = YAML::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3360 3516
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3362 3518
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3368 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3369 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3370 }; 3526 };
3371 warn $@ if $@; 3527 warn $@ if $@;
3372 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3373} 3531}
3374 3532
3375sub pidfile() { 3533sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!"; 3535 or die "$PIDFILE: $!";
… …
3389 3547
3390 seek $fh, 0, 0; 3548 seek $fh, 0, 0;
3391 print $fh $$; 3549 print $fh $$;
3392} 3550}
3393 3551
3552sub main_loop {
3553 warn "EV::loop starting\n";
3554 if (1) {
3555 EV::loop;
3556 }
3557 warn "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP;
3559}
3560
3394sub main { 3561sub main {
3395 cf::init_globals; # initialise logging 3562 cf::init_globals; # initialise logging
3396 3563
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407 3568
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3570
3410 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
… …
3417 }; 3578 };
3418 3579
3419 evthread_start IO::AIO::poll_fileno; 3580 evthread_start IO::AIO::poll_fileno;
3420 3581
3421 cf::sync_job { 3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3422 reload_resources; 3591 reload_resources;
3423 reload_config; 3592 reload_config;
3424 db_init; 3593 db_init;
3425 3594
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3595 cf::init_uuid;
3429 cf::init_signals; 3596 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3597 cf::init_skills;
3432 3598
3433 cf::init_beforeplay; 3599 cf::init_beforeplay;
3434 3600
3435 atomic; 3601 atomic;
… …
3437 load_extensions; 3603 load_extensions;
3438 3604
3439 utime time, time, $RUNTIMEFILE; 3605 utime time, time, $RUNTIMEFILE;
3440 3606
3441 # no (long-running) fork's whatsoever before this point(!) 3607 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3610
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3611 (pop @POST_INIT)->(0) while @POST_INIT;
3445 }; 3612 };
3446 3613
3447 EV::loop; 3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3616
3617 main_loop;
3448} 3618}
3449 3619
3450############################################################################# 3620#############################################################################
3451# initialisation and cleanup 3621# initialisation and cleanup
3452 3622
3453# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3454BEGIN { 3624BEGIN {
3455 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3459 }; 3629 };
3460 } 3630 }
3461} 3631}
3462 3632
3463sub write_runtime_sync { 3633sub write_runtime_sync {
3634 my $t0 = AE::time;
3635
3464 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3466 3638
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3640
3469 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3470 3642
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3644 or return;
3473 3645
3474 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
… …
3489 or return; 3661 or return;
3490 3662
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3664 and return;
3493 3665
3494 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3667
3496 1 3668 1
3497} 3669}
3498 3670
3499our $uuid_lock; 3671our $uuid_lock;
… …
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 3798 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 3799 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 3801 }
3630 warn "cleared package $pkg\n";#d#
3631} 3802}
3632 3803
3633sub do_reload_perl() { 3804sub do_reload_perl() {
3634 # can/must only be called in main 3805 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3636 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3637 return; 3808 return;
3638 } 3809 }
3639 3810
3640 return if $RELOAD++; 3811 return if $RELOAD++;
3641 3812
3642 my $t1 = EV::time; 3813 my $t1 = AE::time;
3643 3814
3644 while ($RELOAD) { 3815 while ($RELOAD) {
3645 warn "reloading..."; 3816 warn "reloading...";
3646 3817
3647 warn "entering sync_job"; 3818 warn "entering sync_job";
… …
3708 clear_package "safe::$_" 3879 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3881
3711 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3885
3715 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3887 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3718 3889
3719 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3720 3891
3721 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3722 require cf; 3893 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3724 3895
3725 warn "loading config and database again"; 3896 warn "loading config and database again";
3726 cf::reload_config; 3897 cf::reload_config;
3727 3898
3728 warn "loading extensions"; 3899 warn "loading extensions";
… …
3750 3921
3751 warn "reloaded"; 3922 warn "reloaded";
3752 --$RELOAD; 3923 --$RELOAD;
3753 } 3924 }
3754 3925
3755 $t1 = EV::time - $t1; 3926 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 3927 warn "reload completed in ${t1}s\n";
3757}; 3928};
3758 3929
3759our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3760 3931
… …
3763 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3764 3935
3765 $RELOAD_WATCHER ||= cf::async { 3936 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 3937 Coro::AIO::aio_wait cache_extensions;
3767 3938
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 3940 do_reload_perl;
3770 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3771 }; 3942 };
3772 }; 3943 };
3773} 3944}
… …
3790 3961
3791our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3793 3964
3794sub wait_for_tick { 3965sub wait_for_tick {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 3967
3797 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait; 3970 $signal->wait;
3800} 3971}
3801 3972
3802sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3804 3975
3805 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 3978 $signal->wait;
3808} 3979}
… …
3813 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3814 return; 3985 return;
3815 } 3986 }
3816 3987
3817 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3989
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3818 3991
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 3994 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
… …
3845} 4018}
3846 4019
3847{ 4020{
3848 # configure BDB 4021 # configure BDB
3849 4022
3850 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3853 4026
3854 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
… …
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3936 } 4109 }
3937} 4110}
3938 4111
3939# load additional modules 4112# load additional modules
3940use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3941 4115
3942END { cf::emergency_save } 4116END { cf::emergency_save }
3943 4117
39441 41181
3945 4119

Diff Legend

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