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.473 by root, Fri Jun 26 16:32:10 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;
… …
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 on 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
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
… …
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $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 :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
… …
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 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::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
… …
210returns 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
211per 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.
212 240
213=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
214 242
215This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 245that call.
218 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
219=back 253=back
220 254
221=cut 255=cut
222 256
223BEGIN { 257$Coro::State::WARNHOOK = sub {
224 *CORE::GLOBAL::warn = sub {
225 my $msg = join "", @_; 258 my $msg = join "", @_;
226 259
227 $msg .= "\n" 260 $msg .= "\n"
228 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
229 262
230 $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;
231 264
232 LOG llevError, $msg; 265 LOG llevError, $msg;
233 }; 266};
234}
235 267
236$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
238 270
239 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 275 return;#d#
242 }#d# 276 }#d#
243 277
244 # kill coroutine otherwise 278 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 279 Coro::terminate
247}; 280};
248
249$SIG{__DIE__} = sub { }; #d#?
250 281
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
268)) { 299)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 301}
271 302
272$EV::DIED = sub { 303$EV::DIED = sub {
273 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
274}; 305};
275 306
276############################################################################# 307#############################################################################
277 308
278=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
… …
375} 406}
376 407
377=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
378 409
379Like 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
380get spread over timer. 411get spread over time.
381 412
382=cut 413=cut
383 414
384sub periodic($$) { 415sub periodic($$) {
385 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
… …
402 433
403=cut 434=cut
404 435
405our @SLOT_QUEUE; 436our @SLOT_QUEUE;
406our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
407 439
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
411 443
412 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
413 446
414 while () { 447 while () {
415 next_job: 448 next_job:
449
416 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 451
418 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 456 $job->[2]->send;
422 Coro::cede; 457 Coro::cede;
423 goto next_job; 458 goto next_job;
424 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 461 }
426 } 462 }
427 463
428 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 467 $signal->wait;
432 } else { 468 } else {
469 $busy = 0;
433 Coro::schedule; 470 Coro::schedule;
434 } 471 }
435 } 472 }
436}; 473};
437 474
438sub get_slot($;$$) { 475sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
440 477
441 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
442 479
443 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
444 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
445 483
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
… …
475 513
476sub sync_job(&) { 514sub sync_job(&) {
477 my ($job) = @_; 515 my ($job) = @_;
478 516
479 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 518 my $time = AE::time;
481 519
482 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
484 522
485 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
… …
502 } else { 540 } else {
503 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
504 } 542 }
505 } 543 }
506 544
507 my $time = EV::time - $time; 545 my $time = AE::time - $time;
508 546
509 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
510 548
511 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
512 } else { 550 } else {
… …
556 reset_signals; 594 reset_signals;
557 &$cb 595 &$cb
558 }, @args; 596 }, @args;
559 597
560 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 )
561} 610}
562 611
563=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
564 613
565=cut 614=cut
… …
1146 1195
1147 sync_job { 1196 sync_job {
1148 if (length $$rdata) { 1197 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1152 1202
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 if ($cf::USE_FSYNC) { 1206 if ($cf::USE_FSYNC) {
… …
1213 $av = $st->{objs}; 1263 $av = $st->{objs};
1214 } 1264 }
1215 1265
1216 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1219 1270
1220 ($data, $av) 1271 ($data, $av)
1221} 1272}
1222 1273
1223=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
… …
1282} 1333}
1283 1334
1284use File::Glob (); 1335use File::Glob ();
1285 1336
1286cf::player->attach ( 1337cf::player->attach (
1287 on_command => sub { 1338 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1289 1340
1290 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1291 or return; 1342 or return;
1292 1343
… …
1371 . "\n};\n1"; 1422 . "\n};\n1";
1372 1423
1373 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1374 } 1425 }
1375 1426
1427 my $pass = 0;
1376 my %done; 1428 my %done;
1377 while (%todo) { 1429 while (%todo) {
1378 my $progress; 1430 my $progress;
1379 1431
1432 ++$pass;
1433
1434 ext:
1380 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1437 next ext
1383 unless exists $done{$_}; 1438 unless exists $done{$_};
1384 } 1439 }
1385 1440
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1442
1388 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1447
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1449 if exists $v->{meta}{mandatory};
1396 1450
1397 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;
1398 } 1460 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1461 }
1404 1462
1405 skip: 1463 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 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 }
1408 } 1471 }
1409 }; 1472 };
1410} 1473}
1411 1474
1412############################################################################# 1475#############################################################################
… …
1496 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1497 } 1560 }
1498 } 1561 }
1499} 1562}
1500 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
1501sub save($) { 1577sub save($) {
1502 my ($pl) = @_; 1578 my ($pl) = @_;
1503 1579
1504 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1505 1581
… …
1510 1586
1511 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1513 1589
1514 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];
1515 1594
1516 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1596 cf::cede_to_tick;
1518} 1597}
1519 1598
… …
1556 $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
1557 1636
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1559 $pl->deactivate; 1638 $pl->deactivate;
1560 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;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1563 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1564 1642
1565 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1621 \@logins 1699 \@logins
1622} 1700}
1623 1701
1624=item $player->maps 1702=item $player->maps
1625 1703
1704=item cf::player::maps $login
1705
1626Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1627player. May block. 1707player. May block.
1628 1708
1629=cut 1709=cut
1630 1710
… …
1692=cut 1772=cut
1693 1773
1694sub find_by_path($) { 1774sub find_by_path($) {
1695 my ($path) = @_; 1775 my ($path) = @_;
1696 1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1778
1697 my ($match, $specificity); 1779 my ($match, $specificity);
1698 1780
1699 for my $region (list) { 1781 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1783 ($match, $specificity) = ($region, $region->specificity)
… …
1732 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
1733 1815
1734 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1817 $self->_create_random_map (
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1764 1846
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 1848}
1767 1849
1768# also paths starting with '/' 1850# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 1852
1771sub thawer_merge { 1853sub thawer_merge {
1772 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1773 1855
1774 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
1988 2070
1989 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
1990 } 2072 }
1991} 2073}
1992 2074
1993sub pre_load { } 2075sub pre_load { }
1994sub post_load { } 2076#sub post_load { } # XS
1995 2077
1996sub load { 2078sub load {
1997 my ($self) = @_; 2079 my ($self) = @_;
1998 2080
1999 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
… …
2056 } 2138 }
2057 2139
2058 $self->post_load; 2140 $self->post_load;
2059} 2141}
2060 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
2061sub customise_for { 2146sub customise_for {
2062 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2063 2148
2064 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2150 if $self->per_player;
… …
2081 or next; 2166 or next;
2082 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2083 or next; 2168 or next;
2084 $neigh->load; 2169 $neigh->load;
2085 2170
2171 # now find the diagonal neighbours
2086 push @neigh, 2172 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 } 2175 }
2090 2176
… …
2142 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2143 2229
2144 () 2230 ()
2145} 2231}
2146 2232
2233# common code, used by both ->save and ->swapout
2147sub save { 2234sub _save {
2148 my ($self) = @_; 2235 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2236
2152 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2153 2238
2154 return unless $self->dirty; 2239 return unless $self->dirty;
2155 2240
… …
2175 } else { 2260 } else {
2176 $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);
2177 } 2262 }
2178} 2263}
2179 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2180sub swap_out { 2273sub swap_out {
2181 my ($self) = @_; 2274 my ($self) = @_;
2182 2275
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2277
2188 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2190 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2191 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2192 $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};
2193 2332
2194 $self->deactivate; 2333 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2335 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2336
2242 $self->unlink_save; 2337 $self->unlink_save;
2243 $self->destroy; 2338 $self->destroy;
2244} 2339}
2245 2340
… …
2253 2348
2254 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2255 2350
2256 $self->unlink_save; 2351 $self->unlink_save;
2257 2352
2258 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2358
… …
2320 : normalise $_ 2415 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2417 ]
2323} 2418}
2324 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
2325=back 2452=back
2326 2453
2327=head3 cf::object 2454=head3 cf::object
2328 2455
2329=cut 2456=cut
… …
2461 2588
2462Freezes 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}>).
2463 2590
2464The 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.
2465for 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,
2466though, 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
2467map. 2594map.
2468 2595
2469Will never block. 2596Will never block.
2470 2597
2471=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
… …
2492sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2493 my ($self) = @_; 2620 my ($self) = @_;
2494 2621
2495 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2496 2623
2624 ++$self->{_link_recursion};
2625
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2627
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2501 2630
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2632}
2504 2633
2505sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2507 2636
… …
2524 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2526 2655
2527 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2530 2659
2531 $map->load; 2660 $map->load;
2532 $map->load_neighbours; 2661 $map->load_neighbours;
2533 2662
2534 return unless $self->contr->active; 2663 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2664
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2540} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2541 2672
2673}
2674
2542=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)]])
2543 2676
2544Moves 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
2545her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2546that 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
2547the 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
… …
2554 2687
2555our $GOTOGEN; 2688our $GOTOGEN;
2556 2689
2557sub cf::object::player::goto { 2690sub cf::object::player::goto {
2558 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 }
2559 2698
2560 # 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
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2701
2563 $self->enter_link; 2702 $self->enter_link;
… …
2587 my $map = eval { 2726 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2589 2728
2590 if ($map) { 2729 if ($map) {
2591 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2732 } else {
2594 $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);
2595 } 2734 }
2596 2735
2597 $map 2736 $map
… …
2605 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2608 } 2747 }
2609 2748
2610 $done->() if $done; 2749 $done->($self) if $done;
2611 })->prio (1); 2750 })->prio (1);
2612} 2751}
2613 2752
2614=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2615 2754
… …
2732 2871
2733 utf8::encode $text; 2872 utf8::encode $text;
2734 $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);
2735} 2874}
2736 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
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 2902
2739Send 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
2740client 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
2741the 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
… …
2743 2907
2744=cut 2908=cut
2745 2909
2746# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2748 "c/identify" => { 2918 "c/identify" => {
2749 id => "infobox", 2919 id => "infobox",
2750 title => "Identify", 2920 title => "Identify",
2751 reply => undef, 2921 reply => undef,
2752 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
… …
2754 "c/examine" => { 2924 "c/examine" => {
2755 id => "infobox", 2925 id => "infobox",
2756 title => "Examine", 2926 title => "Examine",
2757 reply => undef, 2927 reply => undef,
2758 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",
2759 }, 2935 },
2760 "c/book" => { 2936 "c/book" => {
2761 id => "infobox", 2937 id => "infobox",
2762 title => "Book", 2938 title => "Book",
2763 reply => undef, 2939 reply => undef,
… …
2879 my $pkt = "msg " 3055 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3056 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3058 );
2883 3059
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3060 $self->send_big_packet ($pkt);
2895} 3061}
2896 3062
2897=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2898 3064
2899Sends an ext event to the client. 3065Sends an ext event to the client.
… …
2902 3068
2903sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2905 3071
2906 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3077 }
2912} 3078}
2913 3079
2914=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2915 3081
… …
2919 3085
2920sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2922 3088
2923 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3092 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3095 }
2930} 3096}
2931 3097
2932=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2933 3099
… …
3034 3200
3035 $coro 3201 $coro
3036} 3202}
3037 3203
3038cf::client->attach ( 3204cf::client->attach (
3039 on_destroy => sub { 3205 on_client_destroy => sub {
3040 my ($ns) = @_; 3206 my ($ns) = @_;
3041 3207
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3209 },
3044); 3210);
… …
3060our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3061 3227
3062$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3063 3229
3064$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3067 sort time 3233 sort time
3068)); 3234));
3069 3235
3070# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
… …
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3124 3290
3125 %vars = (_dummy => 0) unless %vars; 3291 %vars = (_dummy => 0) unless %vars;
3126 3292
3293 my @res;
3127 local $_; 3294 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3295
3130 my $eval = 3296 my $eval =
3131 "do {\n" 3297 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3300 . $code
3135 . "\n}" 3301 . "\n}"
3136 ; 3302 ;
3137 3303
3304 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3313
3142 if ($@) { 3314 if ($@) {
3143 warn "$@"; 3315 warn "$@";
3144 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
… …
3164=cut 3336=cut
3165 3337
3166sub register_script_function { 3338sub register_script_function {
3167 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3168 3340
3169 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3171} 3343}
3172 3344
3173=back 3345=back
3174 3346
3175=cut 3347=cut
… …
3196 3368
3197 $facedata->{version} == 2 3369 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3371
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3375 type => FT_RSRC,
3203 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),
3204 }; 3378 };
3205 cf::cede_to_tick; 3379 cf::cede_to_tick;
3206 3380
3207 { 3381 {
3208 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
… …
3210 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3386
3213 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3217 3391
3218 cf::cede_to_tick; 3392 cf::cede_to_tick;
3219 } 3393 }
3220 3394
3221 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
… …
3245 3419
3246 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3247 } 3421 }
3248 3422
3249 { 3423 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3253 3425
3254 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3429
3259 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3274 } else { 3432 } else {
3275 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3276 } 3434 }
3277 3435
… …
3361 3519
3362 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3363} 3521}
3364 3522
3365sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3367 or return; 3527 or return;
3368 3528
3369 local $/; 3529 local $/;
3370 *CFG = YAML::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3371 3531
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3533
3374 $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};
3375 $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};
3376 3536
3377 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
… …
3379 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3380 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3381 }; 3541 };
3382 warn $@ if $@; 3542 warn $@ if $@;
3383 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3384} 3546}
3385 3547
3386sub pidfile() { 3548sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!"; 3550 or die "$PIDFILE: $!";
… …
3400 3562
3401 seek $fh, 0, 0; 3563 seek $fh, 0, 0;
3402 print $fh $$; 3564 print $fh $$;
3403} 3565}
3404 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
3405sub main { 3576sub main {
3406 cf::init_globals; # initialise logging 3577 cf::init_globals; # initialise logging
3407 3578
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 3583
3418 $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
3419 3585
3420 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
… …
3427 }; 3593 };
3428 3594
3429 evthread_start IO::AIO::poll_fileno; 3595 evthread_start IO::AIO::poll_fileno;
3430 3596
3431 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
3432 reload_resources; 3606 reload_resources;
3433 reload_config; 3607 reload_config;
3434 db_init; 3608 db_init;
3435 3609
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3610 cf::init_uuid;
3439 cf::init_signals; 3611 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3612 cf::init_skills;
3442 3613
3443 cf::init_beforeplay; 3614 cf::init_beforeplay;
3444 3615
3445 atomic; 3616 atomic;
… …
3447 load_extensions; 3618 load_extensions;
3448 3619
3449 utime time, time, $RUNTIMEFILE; 3620 utime time, time, $RUNTIMEFILE;
3450 3621
3451 # no (long-running) fork's whatsoever before this point(!) 3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3452 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};
3453 3625
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3626 (pop @POST_INIT)->(0) while @POST_INIT;
3455 }; 3627 };
3456 3628
3457 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;
3458} 3633}
3459 3634
3460############################################################################# 3635#############################################################################
3461# initialisation and cleanup 3636# initialisation and cleanup
3462 3637
3463# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3464BEGIN { 3639BEGIN {
3465 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3469 }; 3644 };
3470 } 3645 }
3471} 3646}
3472 3647
3473sub write_runtime_sync { 3648sub write_runtime_sync {
3649 my $t0 = AE::time;
3650
3474 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3476 3653
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3655
3479 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3480 3657
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3659 or return;
3483 3660
3484 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
… …
3499 or return; 3676 or return;
3500 3677
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3679 and return;
3503 3680
3504 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3682
3506 1 3683 1
3507} 3684}
3508 3685
3509our $uuid_lock; 3686our $uuid_lock;
… …
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 3813 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 3814 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 3816 }
3640 warn "cleared package $pkg\n";#d#
3641} 3817}
3642 3818
3643sub do_reload_perl() { 3819sub do_reload_perl() {
3644 # can/must only be called in main 3820 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3646 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3647 return; 3823 return;
3648 } 3824 }
3649 3825
3650 return if $RELOAD++; 3826 return if $RELOAD++;
3651 3827
3652 my $t1 = EV::time; 3828 my $t1 = AE::time;
3653 3829
3654 while ($RELOAD) { 3830 while ($RELOAD) {
3655 warn "reloading..."; 3831 warn "reloading...";
3656 3832
3657 warn "entering sync_job"; 3833 warn "entering sync_job";
… …
3728 3904
3729 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3730 3906
3731 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3732 require cf; 3908 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3734 3910
3735 warn "loading config and database again"; 3911 warn "loading config and database again";
3736 cf::reload_config; 3912 cf::reload_config;
3737 3913
3738 warn "loading extensions"; 3914 warn "loading extensions";
… …
3760 3936
3761 warn "reloaded"; 3937 warn "reloaded";
3762 --$RELOAD; 3938 --$RELOAD;
3763 } 3939 }
3764 3940
3765 $t1 = EV::time - $t1; 3941 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 3942 warn "reload completed in ${t1}s\n";
3767}; 3943};
3768 3944
3769our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3770 3946
… …
3773 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3774 3950
3775 $RELOAD_WATCHER ||= cf::async { 3951 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 3952 Coro::AIO::aio_wait cache_extensions;
3777 3953
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 3955 do_reload_perl;
3780 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3781 }; 3957 };
3782 }; 3958 };
3783} 3959}
… …
3800 3976
3801our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3803 3979
3804sub wait_for_tick { 3980sub wait_for_tick {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3806 3982
3807 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3808 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait; 3985 $signal->wait;
3810} 3986}
3811 3987
3812sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3814 3990
3815 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 3993 $signal->wait;
3818} 3994}
… …
3823 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3824 return; 4000 return;
3825 } 4001 }
3826 4002
3827 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#
3828 4006
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $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.;
3831 Coro::async_pool { 4009 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
… …
3855} 4033}
3856 4034
3857{ 4035{
3858 # configure BDB 4036 # configure BDB
3859 4037
3860 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3863 4041
3864 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
… …
3946 } 4124 }
3947} 4125}
3948 4126
3949# load additional modules 4127# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3951 4130
3952END { cf::emergency_save } 4131END { cf::emergency_save }
3953 4132
39541 41331
3955 4134

Diff Legend

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