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.484 by root, Mon Oct 12 14:00:58 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
32use EV; 32use EV;
33use Opcode; 33use Opcode;
34use Safe; 34use Safe;
35use Safe::Hole; 35use Safe::Hole;
36use Storable (); 36use Storable ();
37use Carp ();
37 38
38use Guard (); 39use Guard ();
39use Coro (); 40use Coro ();
40use Coro::State; 41use Coro::State;
41use Coro::Handle; 42use Coro::Handle;
… …
52use Coro::Util (); 53use Coro::Util ();
53 54
54use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
55use BDB (); 56use BDB ();
56use Data::Dumper; 57use Data::Dumper;
57use Digest::MD5;
58use Fcntl; 58use Fcntl;
59use YAML::XS (); 59use YAML::XS ();
60use IO::AIO (); 60use IO::AIO ();
61use Time::HiRes; 61use Time::HiRes;
62use Compress::LZF; 62use Compress::LZF;
… …
228returns 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
229per 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.
230 230
231=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
232 232
233This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
234C<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
235that call. 235that call.
236 236
237=item %cf::REFLECT 237=item %cf::REFLECT
238 238
… …
289)) { 289)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 291}
292 292
293$EV::DIED = sub { 293$EV::DIED = sub {
294 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
295}; 295};
296 296
297############################################################################# 297#############################################################################
298 298
299=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
423 423
424=cut 424=cut
425 425
426our @SLOT_QUEUE; 426our @SLOT_QUEUE;
427our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
428 429
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
432 433
433 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
434 436
435 while () { 437 while () {
436 next_job: 438 next_job:
439
437 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 441
439 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 446 $job->[2]->send;
443 Coro::cede; 447 Coro::cede;
444 goto next_job; 448 goto next_job;
445 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 451 }
447 } 452 }
448 453
449 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 457 $signal->wait;
453 } else { 458 } else {
459 $busy = 0;
454 Coro::schedule; 460 Coro::schedule;
455 } 461 }
456 } 462 }
457}; 463};
458 464
459sub get_slot($;$$) { 465sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
461 467
462 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
463 469
464 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
465 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
466 473
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
496 503
497sub sync_job(&) { 504sub sync_job(&) {
498 my ($job) = @_; 505 my ($job) = @_;
499 506
500 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 508 my $time = AE::time;
502 509
503 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
505 512
506 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 530 } else {
524 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
525 } 532 }
526 } 533 }
527 534
528 my $time = EV::time - $time; 535 my $time = AE::time - $time;
529 536
530 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
531 538
532 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
533 } else { 540 } else {
… …
1303} 1310}
1304 1311
1305use File::Glob (); 1312use File::Glob ();
1306 1313
1307cf::player->attach ( 1314cf::player->attach (
1308 on_command => sub { 1315 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1310 1317
1311 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1312 or return; 1319 or return;
1313 1320
… …
1392 . "\n};\n1"; 1399 . "\n};\n1";
1393 1400
1394 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1395 } 1402 }
1396 1403
1404 my $pass = 0;
1397 my %done; 1405 my %done;
1398 while (%todo) { 1406 while (%todo) {
1399 my $progress; 1407 my $progress;
1400 1408
1409 ++$pass;
1410
1411 ext:
1401 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1414 next ext
1404 unless exists $done{$_}; 1415 unless exists $done{$_};
1405 } 1416 }
1406 1417
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1419
1409 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1424
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1426 if exists $v->{meta}{mandatory};
1417 1427 } else {
1418 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;
1419 } 1434 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1435 }
1425 1436
1426 skip: 1437 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 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 }
1429 } 1445 }
1430 }; 1446 };
1431} 1447}
1432 1448
1433############################################################################# 1449#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1518 } 1534 }
1519 } 1535 }
1520} 1536}
1521 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
1522sub save($) { 1551sub save($) {
1523 my ($pl) = @_; 1552 my ($pl) = @_;
1524 1553
1525 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1526 1555
… …
1531 1560
1532 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1534 1563
1535 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];
1536 1568
1537 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1570 cf::cede_to_tick;
1539} 1571}
1540 1572
… …
1753 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
1754 1786
1755 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1788 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2009 2041
2010 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2011 } 2043 }
2012} 2044}
2013 2045
2014sub pre_load { } 2046sub pre_load { }
2015sub post_load { } 2047#sub post_load { } # XS
2016 2048
2017sub load { 2049sub load {
2018 my ($self) = @_; 2050 my ($self) = @_;
2019 2051
2020 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2109 }
2078 2110
2079 $self->post_load; 2111 $self->post_load;
2080} 2112}
2081 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
2082sub customise_for { 2117sub customise_for {
2083 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2084 2119
2085 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2121 if $self->per_player;
… …
2341 : normalise $_ 2376 : normalise $_
2342 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2343 ] 2378 ]
2344} 2379}
2345 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
2346=back 2413=back
2347 2414
2348=head3 cf::object 2415=head3 cf::object
2349 2416
2350=cut 2417=cut
… …
2545 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2546 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2547 2614
2548 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2549 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2550 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2551 2618
2552 $map->load; 2619 $map->load;
2553 $map->load_neighbours; 2620 $map->load_neighbours;
2554 2621
2555 return unless $self->contr->active; 2622 return unless $self->contr->active;
… …
2754 2821
2755 utf8::encode $text; 2822 utf8::encode $text;
2756 $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);
2757} 2824}
2758 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
2759=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2760 2852
2761Send 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
2762client 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
2763the 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
… …
2765 2857
2766=cut 2858=cut
2767 2859
2768# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2769our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2770 "c/identify" => { 2868 "c/identify" => {
2771 id => "infobox", 2869 id => "infobox",
2772 title => "Identify", 2870 title => "Identify",
2773 reply => undef, 2871 reply => undef,
2774 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
… …
2776 "c/examine" => { 2874 "c/examine" => {
2777 id => "infobox", 2875 id => "infobox",
2778 title => "Examine", 2876 title => "Examine",
2779 reply => undef, 2877 reply => undef,
2780 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",
2781 }, 2885 },
2782 "c/book" => { 2886 "c/book" => {
2783 id => "infobox", 2887 id => "infobox",
2784 title => "Book", 2888 title => "Book",
2785 reply => undef, 2889 reply => undef,
… …
2901 my $pkt = "msg " 3005 my $pkt = "msg "
2902 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2903 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2904 ); 3008 );
2905 3009
2906 # try lzf for large packets
2907 $pkt = "lzf " . Compress::LZF::compress $pkt
2908 if 1024 <= length $pkt and $self->{can_lzf};
2909
2910 # split very large packets
2911 if (8192 < length $pkt and $self->{can_lzf}) {
2912 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2913 $pkt = "frag";
2914 }
2915
2916 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2917} 3011}
2918 3012
2919=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2920 3014
2921Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2924 3018
2925sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2926 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2927 3021
2928 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2929 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2930 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2931 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3027 }
2934} 3028}
2935 3029
2936=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2937 3031
… …
2941 3035
2942sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2943 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2944 3038
2945 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2947 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2948 #TODO: version 1, remove 3042 #TODO: version 1, remove
2949 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3045 }
2952} 3046}
2953 3047
2954=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2955 3049
… …
3056 3150
3057 $coro 3151 $coro
3058} 3152}
3059 3153
3060cf::client->attach ( 3154cf::client->attach (
3061 on_destroy => sub { 3155 on_client_destroy => sub {
3062 my ($ns) = @_; 3156 my ($ns) = @_;
3063 3157
3064 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3065 }, 3159 },
3066); 3160);
… …
3082our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3083 3177
3084$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3085 3179
3086$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3087 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3088 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3089 sort time 3183 sort time
3090)); 3184));
3091 3185
3092# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3144 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3145 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3146 3240
3147 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3148 3242
3243 my @res;
3149 local $_; 3244 local $_;
3150 local @safe::cf::_safe_eval_args = values %vars;
3151 3245
3152 my $eval = 3246 my $eval =
3153 "do {\n" 3247 "do {\n"
3154 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3155 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3156 . $code 3250 . $code
3157 . "\n}" 3251 . "\n}"
3158 ; 3252 ;
3159 3253
3254 if ($CFG{safe_eval}) {
3160 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3161 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3162 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 }
3163 3263
3164 if ($@) { 3264 if ($@) {
3165 warn "$@"; 3265 warn "$@";
3166 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3167 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3186=cut 3286=cut
3187 3287
3188sub register_script_function { 3288sub register_script_function {
3189 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3190 3290
3191 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3192 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3193} 3293}
3194 3294
3195=back 3295=back
3196 3296
3197=cut 3297=cut
… …
3218 3318
3219 $facedata->{version} == 2 3319 $facedata->{version} == 2
3220 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3221 3321
3222 # 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]);
3223 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3224 type => FT_RSRC, 3325 type => FT_RSRC,
3225 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),
3226 }; 3328 };
3227 cf::cede_to_tick; 3329 cf::cede_to_tick;
3228 3330
3229 { 3331 {
3230 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3232 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3233 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234 3336
3235 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3236 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3237 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3238 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3239 3341
3240 cf::cede_to_tick; 3342 cf::cede_to_tick;
3241 } 3343 }
3242 3344
3243 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3267 3369
3268 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3269 } 3371 }
3270 3372
3271 { 3373 {
3272 # TODO: for gcfclient pleasure, we should give resources
3273 # that gcfclient doesn't grok a >10000 face index.
3274 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3275 3375
3276 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3277 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3278 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3279 my $data;
3280 3379
3281 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3282 # prepend meta info
3283
3284 my $meta = $enc->encode ({
3285 name => $name,
3286 %{ $info->{meta} || {} },
3287 });
3288
3289 $data = pack "(w/a*)*", $meta, $info->{data};
3290 } else {
3291 $data = $info->{data};
3292 }
3293
3294 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3295 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3296 } else { 3382 } else {
3297 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3298 } 3384 }
3299 3385
… …
3383 3469
3384 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3385} 3471}
3386 3472
3387sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3388 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3389 or return; 3477 or return;
3390 3478
3391 local $/; 3479 local $/;
3392 *CFG = YAML::XS::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3393 3481
3394 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3395 3483
3396 $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};
3397 $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};
… …
3401 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3402 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3403 }; 3491 };
3404 warn $@ if $@; 3492 warn $@ if $@;
3405 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3406} 3496}
3407 3497
3408sub pidfile() { 3498sub pidfile() {
3409 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3410 or die "$PIDFILE: $!"; 3500 or die "$PIDFILE: $!";
… …
3458 }; 3548 };
3459 3549
3460 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3461 3551
3462 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3463 reload_resources; 3556 reload_resources;
3464 reload_config; 3557 reload_config;
3465 db_init; 3558 db_init;
3466 3559
3467 cf::load_settings;
3468 cf::load_materials;
3469 cf::init_uuid; 3560 cf::init_uuid;
3470 cf::init_signals; 3561 cf::init_signals;
3471 cf::init_commands;
3472 cf::init_skills; 3562 cf::init_skills;
3473 3563
3474 cf::init_beforeplay; 3564 cf::init_beforeplay;
3475 3565
3476 atomic; 3566 atomic;
… …
3494 3584
3495# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3496BEGIN { 3586BEGIN {
3497 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3498 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3499 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3500 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3501 }; 3591 };
3502 } 3592 }
3503} 3593}
3504 3594
3505sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3506 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3507 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3508 3600
3509 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3510 3602
3511 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3512 3604
3513 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3514 or return; 3606 or return;
3515 3607
3516 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3517 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3518 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3531 or return; 3623 or return;
3532 3624
3533 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3534 and return; 3626 and return;
3535 3627
3536 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3537 3629
3538 1 3630 1
3539} 3631}
3540 3632
3541our $uuid_lock; 3633our $uuid_lock;
… …
3679 return; 3771 return;
3680 } 3772 }
3681 3773
3682 return if $RELOAD++; 3774 return if $RELOAD++;
3683 3775
3684 my $t1 = EV::time; 3776 my $t1 = AE::time;
3685 3777
3686 while ($RELOAD) { 3778 while ($RELOAD) {
3687 warn "reloading..."; 3779 warn "reloading...";
3688 3780
3689 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3792 3884
3793 warn "reloaded"; 3885 warn "reloaded";
3794 --$RELOAD; 3886 --$RELOAD;
3795 } 3887 }
3796 3888
3797 $t1 = EV::time - $t1; 3889 $t1 = AE::time - $t1;
3798 warn "reload completed in ${t1}s\n"; 3890 warn "reload completed in ${t1}s\n";
3799}; 3891};
3800 3892
3801our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3802 3894
… …
3805 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3806 3898
3807 $RELOAD_WATCHER ||= cf::async { 3899 $RELOAD_WATCHER ||= cf::async {
3808 Coro::AIO::aio_wait cache_extensions; 3900 Coro::AIO::aio_wait cache_extensions;
3809 3901
3810 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3811 do_reload_perl; 3903 do_reload_perl;
3812 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3813 }; 3905 };
3814 }; 3906 };
3815} 3907}
… …
3832 3924
3833our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3834our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3835 3927
3836sub wait_for_tick { 3928sub wait_for_tick {
3837 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3838 3930
3839 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3840 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3841 $signal->wait; 3933 $signal->wait;
3842} 3934}
3843 3935
3844sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3845 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3846 3938
3847 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3848 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3849 $signal->wait; 3941 $signal->wait;
3850} 3942}
… …
3855 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3856 return; 3948 return;
3857 } 3949 }
3858 3950
3859 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#
3860 3954
3861 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3862 $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.;
3863 Coro::async_pool { 3957 Coro::async_pool {
3864 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3887} 3981}
3888 3982
3889{ 3983{
3890 # configure BDB 3984 # configure BDB
3891 3985
3892 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3893 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3894 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3895 3989
3896 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3897 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;

Diff Legend

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