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.493 by root, Mon Oct 26 02:34:37 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.
… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
424 423
425=cut 424=cut
426 425
427our @SLOT_QUEUE; 426our @SLOT_QUEUE;
428our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
429 429
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
433 433
434 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
435 436
436 while () { 437 while () {
437 next_job: 438 next_job:
439
438 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 441
440 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 446 $job->[2]->send;
444 Coro::cede; 447 Coro::cede;
445 goto next_job; 448 goto next_job;
446 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 451 }
448 } 452 }
449 453
450 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 457 $signal->wait;
454 } else { 458 } else {
459 $busy = 0;
455 Coro::schedule; 460 Coro::schedule;
456 } 461 }
457 } 462 }
458}; 463};
459 464
460sub get_slot($;$$) { 465sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
462 467
463 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
464 469
465 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
466 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
467 473
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
497 503
498sub sync_job(&) { 504sub sync_job(&) {
499 my ($job) = @_; 505 my ($job) = @_;
500 506
501 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 508 my $time = AE::time;
503 509
504 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
506 512
507 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
… …
524 } else { 530 } else {
525 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
526 } 532 }
527 } 533 }
528 534
529 my $time = EV::time - $time; 535 my $time = AE::time - $time;
530 536
531 $TICK_START += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
532 538
533 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
534 } else { 540 } else {
… …
1304} 1310}
1305 1311
1306use File::Glob (); 1312use File::Glob ();
1307 1313
1308cf::player->attach ( 1314cf::player->attach (
1309 on_command => sub { 1315 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1311 1317
1312 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1313 or return; 1319 or return;
1314 1320
… …
1393 . "\n};\n1"; 1399 . "\n};\n1";
1394 1400
1395 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1396 } 1402 }
1397 1403
1404 my $pass = 0;
1398 my %done; 1405 my %done;
1399 while (%todo) { 1406 while (%todo) {
1400 my $progress; 1407 my $progress;
1401 1408
1409 ++$pass;
1410
1411 ext:
1402 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1414 next ext
1405 unless exists $done{$_}; 1415 unless exists $done{$_};
1406 } 1416 }
1407 1417
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1419
1410 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1424
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1426 if exists $v->{meta}{mandatory};
1418 1427 } else {
1419 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;
1420 } 1434 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1435 }
1426 1436
1427 skip: 1437 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 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 }
1430 } 1445 }
1431 }; 1446 };
1432} 1447}
1433 1448
1434############################################################################# 1449#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1519 } 1534 }
1520 } 1535 }
1521} 1536}
1522 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
1523sub save($) { 1551sub save($) {
1524 my ($pl) = @_; 1552 my ($pl) = @_;
1525 1553
1526 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1527 1555
… …
1532 1560
1533 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1535 1563
1536 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];
1537 1568
1538 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1570 cf::cede_to_tick;
1540} 1571}
1541 1572
… …
1754 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
1755 1786
1756 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1788 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2010 2041
2011 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
2012 } 2043 }
2013} 2044}
2014 2045
2015sub pre_load { } 2046sub pre_load { }
2016sub post_load { } 2047#sub post_load { } # XS
2017 2048
2018sub load { 2049sub load {
2019 my ($self) = @_; 2050 my ($self) = @_;
2020 2051
2021 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
… …
2078 } 2109 }
2079 2110
2080 $self->post_load; 2111 $self->post_load;
2081} 2112}
2082 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
2083sub customise_for { 2117sub customise_for {
2084 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2085 2119
2086 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2121 if $self->per_player;
… …
2785sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2786 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2787 2821
2788 utf8::encode $text; 2822 utf8::encode $text;
2789 $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);
2824}
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);
2790} 2849}
2791 2850
2792=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2793 2852
2794Send 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
… …
2946 my $pkt = "msg " 3005 my $pkt = "msg "
2947 . $self->{json_coder}->encode ( 3006 . $self->{json_coder}->encode (
2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2949 ); 3008 );
2950 3009
2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2954
2955 # split very large packets
2956 if (8192 < length $pkt and $self->{can_lzf}) {
2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2958 $pkt = "frag";
2959 }
2960
2961 $self->send_packet ($pkt); 3010 $self->send_big_packet ($pkt);
2962} 3011}
2963 3012
2964=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2965 3014
2966Sends an ext event to the client. 3015Sends an ext event to the client.
… …
2969 3018
2970sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2971 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2972 3021
2973 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2974 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2975 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2976 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2977 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2978 } 3027 }
2979} 3028}
2980 3029
2981=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2982 3031
… …
2986 3035
2987sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2988 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2989 3038
2990 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2991 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2992 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2993 #TODO: version 1, remove 3042 #TODO: version 1, remove
2994 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2995 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2996 } 3045 }
2997} 3046}
2998 3047
2999=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
3000 3049
… …
3101 3150
3102 $coro 3151 $coro
3103} 3152}
3104 3153
3105cf::client->attach ( 3154cf::client->attach (
3106 on_destroy => sub { 3155 on_client_destroy => sub {
3107 my ($ns) = @_; 3156 my ($ns) = @_;
3108 3157
3109 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3110 }, 3159 },
3111); 3160);
… …
3127our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3128 3177
3129$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3130 3179
3131$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3132 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3133 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3134 sort time 3183 sort time
3135)); 3184));
3136 3185
3137# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
… …
3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3190 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3191 3240
3192 %vars = (_dummy => 0) unless %vars; 3241 %vars = (_dummy => 0) unless %vars;
3193 3242
3243 my @res;
3194 local $_; 3244 local $_;
3195 local @safe::cf::_safe_eval_args = values %vars;
3196 3245
3197 my $eval = 3246 my $eval =
3198 "do {\n" 3247 "do {\n"
3199 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3200 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3201 . $code 3250 . $code
3202 . "\n}" 3251 . "\n}"
3203 ; 3252 ;
3204 3253
3254 if ($CFG{safe_eval}) {
3205 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3206 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3207 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 }
3208 3263
3209 if ($@) { 3264 if ($@) {
3210 warn "$@"; 3265 warn "$@";
3211 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3212 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
… …
3231=cut 3286=cut
3232 3287
3233sub register_script_function { 3288sub register_script_function {
3234 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3235 3290
3236 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3237 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3238} 3293}
3239 3294
3240=back 3295=back
3241 3296
3242=cut 3297=cut
… …
3263 3318
3264 $facedata->{version} == 2 3319 $facedata->{version} == 2
3265 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3266 3321
3267 # 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]);
3268 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3269 type => FT_RSRC, 3325 type => FT_RSRC,
3270 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),
3271 }; 3328 };
3272 cf::cede_to_tick; 3329 cf::cede_to_tick;
3273 3330
3274 { 3331 {
3275 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
… …
3277 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3278 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279 3336
3280 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3281 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3284 3341
3285 cf::cede_to_tick; 3342 cf::cede_to_tick;
3286 } 3343 }
3287 3344
3288 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
… …
3312 3369
3313 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3314 } 3371 }
3315 3372
3316 { 3373 {
3317 # TODO: for gcfclient pleasure, we should give resources
3318 # that gcfclient doesn't grok a >10000 face index.
3319 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3320 3375
3321 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3323 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3324 my $data;
3325 3379
3326 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3327 # prepend meta info
3328
3329 my $meta = $enc->encode ({
3330 name => $name,
3331 %{ $info->{meta} || {} },
3332 });
3333
3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3341 } else { 3382 } else {
3342 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3343 } 3384 }
3344 3385
… …
3507 }; 3548 };
3508 3549
3509 evthread_start IO::AIO::poll_fileno; 3550 evthread_start IO::AIO::poll_fileno;
3510 3551
3511 cf::sync_job { 3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3512 reload_resources; 3556 reload_resources;
3513 reload_config; 3557 reload_config;
3514 db_init; 3558 db_init;
3515 3559
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid; 3560 cf::init_uuid;
3519 cf::init_signals; 3561 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills; 3562 cf::init_skills;
3522 3563
3523 cf::init_beforeplay; 3564 cf::init_beforeplay;
3524 3565
3525 atomic; 3566 atomic;
… …
3543 3584
3544# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3545BEGIN { 3586BEGIN {
3546 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3547 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3548 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3549 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3550 }; 3591 };
3551 } 3592 }
3552} 3593}
3553 3594
3554sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = AE::time;
3597
3555 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3556 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3557 3600
3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3559 3602
3560 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3561 3604
3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3563 or return; 3606 or return;
3564 3607
3565 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3566 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3567 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3580 or return; 3623 or return;
3581 3624
3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3583 and return; 3626 and return;
3584 3627
3585 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3586 3629
3587 1 3630 1
3588} 3631}
3589 3632
3590our $uuid_lock; 3633our $uuid_lock;
… …
3728 return; 3771 return;
3729 } 3772 }
3730 3773
3731 return if $RELOAD++; 3774 return if $RELOAD++;
3732 3775
3733 my $t1 = EV::time; 3776 my $t1 = AE::time;
3734 3777
3735 while ($RELOAD) { 3778 while ($RELOAD) {
3736 warn "reloading..."; 3779 warn "reloading...";
3737 3780
3738 warn "entering sync_job"; 3781 warn "entering sync_job";
… …
3841 3884
3842 warn "reloaded"; 3885 warn "reloaded";
3843 --$RELOAD; 3886 --$RELOAD;
3844 } 3887 }
3845 3888
3846 $t1 = EV::time - $t1; 3889 $t1 = AE::time - $t1;
3847 warn "reload completed in ${t1}s\n"; 3890 warn "reload completed in ${t1}s\n";
3848}; 3891};
3849 3892
3850our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3851 3894
… …
3854 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3855 3898
3856 $RELOAD_WATCHER ||= cf::async { 3899 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions; 3900 Coro::AIO::aio_wait cache_extensions;
3858 3901
3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl; 3903 do_reload_perl;
3861 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3862 }; 3905 };
3863 }; 3906 };
3864} 3907}
… …
3881 3924
3882our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3883our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3884 3927
3885sub wait_for_tick { 3928sub wait_for_tick {
3886 return if tick_inhibit || $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3887 3930
3888 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3889 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3890 $signal->wait; 3933 $signal->wait;
3891} 3934}
3892 3935
3893sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3894 return if tick_inhibit || $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3895 3938
3896 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3897 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3898 $signal->wait; 3941 $signal->wait;
3899} 3942}
… …
3904 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3905 return; 3948 return;
3906 } 3949 }
3907 3950
3908 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#
3909 3954
3910 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3911 $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.;
3912 Coro::async_pool { 3957 Coro::async_pool {
3913 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
… …
3936} 3981}
3937 3982
3938{ 3983{
3939 # configure BDB 3984 # configure BDB
3940 3985
3941 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3942 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3943 $AnyEvent::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3944 3989
3945 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3946 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;

Diff Legend

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