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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 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
… …
117our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 121our $DB_ENV;
121 122
122our @EXTRA_MODULES = qw(pod mapscript); 123our @EXTRA_MODULES = qw(pod match mapscript);
123 124
124our %CFG; 125our %CFG;
125 126
126our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 128our $RUNTIME;
… …
169for (@REFLECT) { 170for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 171 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 172 $REFLECT{$reflect->{class}} = $reflect;
172} 173}
173 174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
177
174############################################################################# 178#############################################################################
175 179
176=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
177 181
178=over 4 182=over 4
… …
224returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
225per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
226 230
227=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
228 232
229This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
231that call. 235that call.
232 236
233=item %cf::REFLECT 237=item %cf::REFLECT
234 238
235Contains, for each (C++) class name, a hash reference with information 239Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 240about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 241metadata, which is useful for introspection.
238 242
239=back 243=back
240 244
241=cut 245=cut
242 246
… …
285)) { 289)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 291}
288 292
289$EV::DIED = sub { 293$EV::DIED = sub {
290 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
291}; 295};
292 296
293############################################################################# 297#############################################################################
294 298
295=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
419 423
420=cut 424=cut
421 425
422our @SLOT_QUEUE; 426our @SLOT_QUEUE;
423our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
424 429
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
428 433
429 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
430 436
431 while () { 437 while () {
432 next_job: 438 next_job:
439
433 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 441
435 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 446 $job->[2]->send;
439 Coro::cede; 447 Coro::cede;
440 goto next_job; 448 goto next_job;
441 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 451 }
443 } 452 }
444 453
445 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
446 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
447 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait; 457 $signal->wait;
449 } else { 458 } else {
459 $busy = 0;
450 Coro::schedule; 460 Coro::schedule;
451 } 461 }
452 } 462 }
453}; 463};
454 464
455sub get_slot($;$$) { 465sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
457 467
458 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
459 469
460 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
461 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
462 473
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
492 503
493sub sync_job(&) { 504sub sync_job(&) {
494 my ($job) = @_; 505 my ($job) = @_;
495 506
496 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
497 my $time = EV::time; 508 my $time = AE::time;
498 509
499 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
501 512
502 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
… …
519 } else { 530 } else {
520 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
521 } 532 }
522 } 533 }
523 534
524 my $time = EV::time - $time; 535 my $time = AE::time - $time;
525 536
526 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
527 538
528 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
529 } else { 540 } else {
… …
1299} 1310}
1300 1311
1301use File::Glob (); 1312use File::Glob ();
1302 1313
1303cf::player->attach ( 1314cf::player->attach (
1304 on_command => sub { 1315 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1306 1317
1307 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1308 or return; 1319 or return;
1309 1320
… …
1388 . "\n};\n1"; 1399 . "\n};\n1";
1389 1400
1390 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1391 } 1402 }
1392 1403
1404 my $pass = 0;
1393 my %done; 1405 my %done;
1394 while (%todo) { 1406 while (%todo) {
1395 my $progress; 1407 my $progress;
1396 1408
1409 ++$pass;
1410
1411 ext:
1397 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1414 next ext
1400 unless exists $done{$_}; 1415 unless exists $done{$_};
1401 } 1416 }
1402 1417
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1419
1405 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1424
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1426 if exists $v->{meta}{mandatory};
1413 1427 } else {
1414 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1415 } 1434 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1435 }
1421 1436
1422 skip: 1437 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1425 } 1445 }
1426 }; 1446 };
1427} 1447}
1428 1448
1429############################################################################# 1449#############################################################################
… …
1513 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1514 } 1534 }
1515 } 1535 }
1516} 1536}
1517 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1518sub save($) { 1551sub save($) {
1519 my ($pl) = @_; 1552 my ($pl) = @_;
1520 1553
1521 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1522 1555
… …
1527 1560
1528 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1530 1563
1531 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1532 1568
1533 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1570 cf::cede_to_tick;
1535} 1571}
1536 1572
… …
1749 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1750 1786
1751 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 1788 $self->_create_random_map (
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2005 2041
2006 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2007 } 2043 }
2008} 2044}
2009 2045
2010sub pre_load { } 2046sub pre_load { }
2011sub post_load { } 2047#sub post_load { } # XS
2012 2048
2013sub load { 2049sub load {
2014 my ($self) = @_; 2050 my ($self) = @_;
2015 2051
2016 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2073 } 2109 }
2074 2110
2075 $self->post_load; 2111 $self->post_load;
2076} 2112}
2077 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2078sub customise_for { 2117sub customise_for {
2079 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2080 2119
2081 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2121 if $self->per_player;
… …
2337 : normalise $_ 2376 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2378 ]
2340} 2379}
2341 2380
2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2412
2342=back 2413=back
2343 2414
2344=head3 cf::object 2415=head3 cf::object
2345 2416
2346=cut 2417=cut
… …
2541 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2543 2614
2544 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2547 2618
2548 $map->load; 2619 $map->load;
2549 $map->load_neighbours; 2620 $map->load_neighbours;
2550 2621
2551 return unless $self->contr->active; 2622 return unless $self->contr->active;
… …
2750 2821
2751 utf8::encode $text; 2822 utf8::encode $text;
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2753} 2824}
2754 2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2849}
2850
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 2852
2757Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2758client if neccessary. C<$type> should be a string identifying the type of 2854client if neccessary. C<$type> should be a string identifying the type of
2759the message, with C<log> being the default. If C<$color> is negative, suppress 2855the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2761 2857
2762=cut 2858=cut
2763 2859
2764# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2766 "c/identify" => { 2868 "c/identify" => {
2767 id => "infobox", 2869 id => "infobox",
2768 title => "Identify", 2870 title => "Identify",
2769 reply => undef, 2871 reply => undef,
2770 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2772 "c/examine" => { 2874 "c/examine" => {
2773 id => "infobox", 2875 id => "infobox",
2774 title => "Examine", 2876 title => "Examine",
2775 reply => undef, 2877 reply => undef,
2776 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 2885 },
2778 "c/book" => { 2886 "c/book" => {
2779 id => "infobox", 2887 id => "infobox",
2780 title => "Book", 2888 title => "Book",
2781 reply => undef, 2889 reply => undef,
… …
2897 my $pkt = "msg " 3005 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3008 );
2901 3009
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2913} 3011}
2914 3012
2915=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2916 3014
2917Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2920 3018
2921sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2923 3021
2924 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3027 }
2930} 3028}
2931 3029
2932=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2933 3031
… …
2937 3035
2938sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2940 3038
2941 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove 3042 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3045 }
2948} 3046}
2949 3047
2950=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2951 3049
… …
3052 3150
3053 $coro 3151 $coro
3054} 3152}
3055 3153
3056cf::client->attach ( 3154cf::client->attach (
3057 on_destroy => sub { 3155 on_client_destroy => sub {
3058 my ($ns) = @_; 3156 my ($ns) = @_;
3059 3157
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3159 },
3062); 3160);
… …
3078our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3079 3177
3080$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3081 3179
3082$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3085 sort time 3183 sort time
3086)); 3184));
3087 3185
3088# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3142 3240
3143 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3144 3242
3243 my @res;
3145 local $_; 3244 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3245
3148 my $eval = 3246 my $eval =
3149 "do {\n" 3247 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3250 . $code
3153 . "\n}" 3251 . "\n}"
3154 ; 3252 ;
3155 3253
3254 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3159 3263
3160 if ($@) { 3264 if ($@) {
3161 warn "$@"; 3265 warn "$@";
3162 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3182=cut 3286=cut
3183 3287
3184sub register_script_function { 3288sub register_script_function {
3185 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3186 3290
3187 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3189} 3293}
3190 3294
3191=back 3295=back
3192 3296
3193=cut 3297=cut
… …
3214 3318
3215 $facedata->{version} == 2 3319 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3321
3218 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3325 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3328 };
3223 cf::cede_to_tick; 3329 cf::cede_to_tick;
3224 3330
3225 { 3331 {
3226 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3228 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3336
3231 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3341
3236 cf::cede_to_tick; 3342 cf::cede_to_tick;
3237 } 3343 }
3238 3344
3239 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3263 3369
3264 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3265 } 3371 }
3266 3372
3267 { 3373 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3271 3375
3272 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3379
3277 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3292 } else { 3382 } else {
3293 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3294 } 3384 }
3295 3385
… …
3379 3469
3380 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3381} 3471}
3382 3472
3383sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3477 or return;
3386 3478
3387 local $/; 3479 local $/;
3388 *CFG = YAML::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3389 3481
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3391 3483
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3491 };
3400 warn $@ if $@; 3492 warn $@ if $@;
3401 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3402} 3496}
3403 3497
3404sub pidfile() { 3498sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3454 }; 3548 };
3455 3549
3456 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3457 3551
3458 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3459 reload_resources; 3556 reload_resources;
3460 reload_config; 3557 reload_config;
3461 db_init; 3558 db_init;
3462 3559
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3560 cf::init_uuid;
3466 cf::init_signals; 3561 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3562 cf::init_skills;
3469 3563
3470 cf::init_beforeplay; 3564 cf::init_beforeplay;
3471 3565
3472 atomic; 3566 atomic;
… …
3490 3584
3491# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3492BEGIN { 3586BEGIN {
3493 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3497 }; 3591 };
3498 } 3592 }
3499} 3593}
3500 3594
3501sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3502 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3504 3600
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 3602
3507 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3508 3604
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 3606 or return;
3511 3607
3512 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3527 or return; 3623 or return;
3528 3624
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 3626 and return;
3531 3627
3532 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 3629
3534 1 3630 1
3535} 3631}
3536 3632
3537our $uuid_lock; 3633our $uuid_lock;
… …
3675 return; 3771 return;
3676 } 3772 }
3677 3773
3678 return if $RELOAD++; 3774 return if $RELOAD++;
3679 3775
3680 my $t1 = EV::time; 3776 my $t1 = AE::time;
3681 3777
3682 while ($RELOAD) { 3778 while ($RELOAD) {
3683 warn "reloading..."; 3779 warn "reloading...";
3684 3780
3685 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3756 3852
3757 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3758 3854
3759 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3760 require cf; 3856 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3762 3858
3763 warn "loading config and database again"; 3859 warn "loading config and database again";
3764 cf::reload_config; 3860 cf::reload_config;
3765 3861
3766 warn "loading extensions"; 3862 warn "loading extensions";
… …
3788 3884
3789 warn "reloaded"; 3885 warn "reloaded";
3790 --$RELOAD; 3886 --$RELOAD;
3791 } 3887 }
3792 3888
3793 $t1 = EV::time - $t1; 3889 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 3890 warn "reload completed in ${t1}s\n";
3795}; 3891};
3796 3892
3797our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3798 3894
… …
3801 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3802 3898
3803 $RELOAD_WATCHER ||= cf::async { 3899 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 3900 Coro::AIO::aio_wait cache_extensions;
3805 3901
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 3903 do_reload_perl;
3808 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3809 }; 3905 };
3810 }; 3906 };
3811} 3907}
… …
3828 3924
3829our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3831 3927
3832sub wait_for_tick { 3928sub wait_for_tick {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3834 3930
3835 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3836 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait; 3933 $signal->wait;
3838} 3934}
3839 3935
3840sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3842 3938
3843 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 3941 $signal->wait;
3846} 3942}
… …
3851 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3852 return; 3948 return;
3853 } 3949 }
3854 3950
3855 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3952
3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3856 3954
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 3957 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3883} 3981}
3884 3982
3885{ 3983{
3886 # configure BDB 3984 # configure BDB
3887 3985
3888 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3891 3989
3892 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
… …
3974 } 4072 }
3975} 4073}
3976 4074
3977# load additional modules 4075# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3979 4078
3980END { cf::emergency_save } 4079END { cf::emergency_save }
3981 4080
39821 40811
3983 4082

Diff Legend

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