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.589 by root, Sun Nov 4 01:01:13 2012 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 2012 UTC

… …
224=item $cf::RUNTIME 224=item $cf::RUNTIME
225 225
226The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
227every server tick. 227every server tick.
228 228
229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
232 232
233Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
234directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
235unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
236database environment. 236database environment.
… …
3235=cut 3235=cut
3236 3236
3237sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3238 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3239 3239
3240 if ($self->extcmd == 2) {
3241 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3242 } elsif ($self->extcmd == 1) { # TODO: remove
3243 push @msg, msgtype => "event_$type";
3244 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3245 }
3246} 3241}
3247 3242
3248=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3249 3244
3250Sends an ext reply to the client. 3245Sends an ext reply to the client.
3251 3246
3252=cut 3247=cut
3253 3248
3254sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3255 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3256
3257 return unless $self->extcmd == 2;
3258 3251
3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3260} 3253}
3261 3254
3262=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
… …
3708 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3709 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3710 } 3703 }
3711} 3704}
3712 3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3713sub reload_resources { 3761sub reload_resources {
3714 trace "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3715 3763
3716 reload_materials; 3764 reload_materials;
3717 reload_facedata; 3765 reload_facedata;
3718 reload_exp_table; 3766 reload_exp_table;
3719 reload_sound; 3767 reload_sound;
3720 reload_archetypes; 3768 reload_archetypes;
3721 reload_regions; 3769 reload_regions;
3722 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3723 3772
3724 trace "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3725} 3774}
3726 3775
3727sub reload_config { 3776sub reload_config {
… …
3795 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3796 3845
3797 cf::sync_job { 3846 cf::sync_job {
3798 cf::incloader::init (); 3847 cf::incloader::init ();
3799 3848
3849 db_init;
3850
3800 cf::init_anim; 3851 cf::init_anim;
3801 cf::init_attackmess; 3852 cf::init_attackmess;
3802 cf::init_dynamic; 3853 cf::init_dynamic;
3803 3854
3804 cf::load_settings; 3855 cf::load_settings;
3805 3856
3806 reload_resources; 3857 reload_resources;
3807 reload_config; 3858 reload_config;
3808 db_init;
3809 3859
3810 cf::init_uuid; 3860 cf::init_uuid;
3811 cf::init_signals; 3861 cf::init_signals;
3812 cf::init_skills; 3862 cf::init_skills;
3813 3863
… …
4238 } 4288 }
4239} 4289}
4240 4290
4241{ 4291{
4242 # configure BDB 4292 # configure BDB
4293 info "initialising database";
4243 4294
4244 BDB::min_parallel 16; 4295 BDB::min_parallel 16;
4245 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
4246 #$AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
4247 4298
… …
4276 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4277 }; 4328 };
4278 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4279 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4280 }; 4331 };
4332
4333 info "database initialised";
4281} 4334}
4282 4335
4283{ 4336{
4284 # configure IO::AIO 4337 # configure IO::AIO
4285 4338
4339 info "initialising aio";
4286 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
4287 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
4288 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
4289} 4344}
4290 4345
4291our $_log_backtrace; 4346our $_log_backtrace;
4292our $_log_backtrace_last; 4347our $_log_backtrace_last;
4293 4348

Diff Legend

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