--- deliantra/server/lib/cf.pm 2012/01/03 11:25:33 1.577
+++ deliantra/server/lib/cf.pm 2012/11/09 02:50:50 1.594
@@ -1,22 +1,22 @@
#
# This file is part of Deliantra, the Roguelike Realtime MMORPG.
-#
+#
# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
-#
+#
# Deliantra is free software: you can redistribute it and/or modify it under
# the terms of the Affero GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the Affero GNU General Public License
# and the GNU General Public License along with this program. If not, see
# .
-#
+#
# The authors can be reached via e-mail to
#
@@ -34,7 +34,10 @@
use Storable ();
use Carp ();
-use Guard ();
+use AnyEvent ();
+use AnyEvent::IO ();
+use AnyEvent::DNS ();
+
use Coro ();
use Coro::State;
use Coro::Handle;
@@ -50,6 +53,7 @@
use Coro::Storable;
use Coro::Util ();
+use Guard ();
use JSON::XS 2.01 ();
use BDB ();
use Data::Dumper;
@@ -85,7 +89,9 @@
our @EXTS = (); # list of extension package names
our %EXTCMD = ();
+our %EXTACMD = ();
our %EXTICMD = ();
+our %EXTIACMD = ();
our %EXT_CORO = (); # coroutines bound to extensions
our %EXT_MAP = (); # pluggable maps
@@ -110,7 +116,7 @@
our $PIDFILE = "$LOCALDIR/pid";
our $RUNTIMEFILE = "$LOCALDIR/runtime";
-our %RESOURCE; # unused
+#our %RESOURCE; # unused
our $OUTPUT_RATE_MIN = 3000;
our $OUTPUT_RATE_MAX = 1000000;
@@ -131,6 +137,7 @@
our @EXTRA_MODULES = qw(pod match mapscript incloader);
our %CFG;
+our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
our $UPTIME; $UPTIME ||= time;
our $RUNTIME = 0;
@@ -221,9 +228,9 @@
The time this server has run, starts at 0 and is increased by $cf::TICK on
every server tick.
-=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
+=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
-$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
+$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
Various directories - "/etc", read-only install directory, perl-library
directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
@@ -337,7 +344,7 @@
}
$EV::DIED = sub {
- Carp::cluck "error in event callback: @_";
+ warn "error in event callback: $@";
};
#############################################################################
@@ -374,7 +381,7 @@
} || "[unable to dump $_[0]: '$@']";
}
-=item $scalar = load_file $path
+=item $scalar = cf::load_file $path
Loads the given file from path and returns its contents. Croaks on error
and can block.
@@ -388,6 +395,44 @@
$data
}
+=item $success = cf::replace_file $path, $data, $sync
+
+Atomically replaces the file at the given $path with new $data, and
+optionally $sync the data to disk before replacing the file.
+
+=cut
+
+sub replace_file($$;$) {
+ my ($path, $data, $sync) = @_;
+
+ my $lock = cf::lock_acquire ("replace_file:$path");
+
+ my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
+ or return;
+
+ $data = $data->() if ref $data;
+
+ length $data == aio_write $fh, 0, (length $data), $data, 0
+ or return;
+
+ !$sync
+ or !aio_fsync $fh
+ or return;
+
+ aio_close $fh
+ and return;
+
+ aio_rename "$path~", $path
+ and return;
+
+ if ($sync) {
+ $path =~ s%/[^/]*$%%;
+ aio_pathsync $path;
+ }
+
+ 1
+}
+
=item $ref = cf::decode_json $json
Converts a JSON string into the corresponding perl data structure.
@@ -1390,7 +1435,7 @@
#############################################################################
# command handling &c
-=item cf::register_command $name => \&callback($ob,$args);
+=item cf::register_command $name => \&callback($ob,$args)
Register a callback for execution when the client sends the user command
$name.
@@ -1406,7 +1451,7 @@
push @{ $COMMAND{$name} }, [$caller, $cb];
}
-=item cf::register_extcmd $name => \&callback($pl,$packet);
+=item cf::register_extcmd $name => \&callback($pl,@args)
Register a callback for execution when the client sends an (synchronous)
extcmd packet. Ext commands will be processed in the order they are
@@ -1414,10 +1459,14 @@
the logged-in player. Ext commands can only be processed after a player
has logged in successfully.
-If the callback returns something, it is sent back as if reply was being
-called.
+The values will be sent back to the client.
+
+=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
+
+Same as C, but instead of returning values, the
+callback needs to clal the C<$reply> function.
-=item cf::register_exticmd $name => \&callback($ns,$packet);
+=item cf::register_exticmd $name => \&callback($ns,@args)
Register a callback for execution when the client sends an (asynchronous)
exticmd packet. Exti commands are processed by the server as soon as they
@@ -1425,23 +1474,39 @@
is a client socket. Exti commands can be received anytime, even before
log-in.
-If the callback returns something, it is sent back as if reply was being
-called.
+The values will be sent back to the client.
+
+=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
+
+Same as C, but instead of returning values, the
+callback needs to clal the C<$reply> function.
=cut
-sub register_extcmd {
+sub register_extcmd($$) {
my ($name, $cb) = @_;
$EXTCMD{$name} = $cb;
}
-sub register_exticmd {
+sub register_async_extcmd($$) {
+ my ($name, $cb) = @_;
+
+ $EXTACMD{$name} = $cb;
+}
+
+sub register_exticmd($$) {
my ($name, $cb) = @_;
$EXTICMD{$name} = $cb;
}
+sub register_async_exticmd($$) {
+ my ($name, $cb) = @_;
+
+ $EXTIACMD{$name} = $cb;
+}
+
use File::Glob ();
cf::player->attach (
@@ -1465,14 +1530,25 @@
if (ref $msg) {
my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
- my @reply;
+ if (my $cb = $EXTACMD{$type}) {
+ $cb->(
+ $pl,
+ sub {
+ $pl->ext_msg ("reply-$reply", @_)
+ if $reply;
+ },
+ @payload
+ );
+ } else {
+ my @reply;
- if (my $cb = $EXTCMD{$type}) {
- @reply = $cb->($pl, @payload);
- }
+ if (my $cb = $EXTCMD{$type}) {
+ @reply = $cb->($pl, @payload);
+ }
- $pl->ext_reply ($reply, @reply)
- if $reply;
+ $pl->ext_msg ("reply-$reply", @reply)
+ if $reply;
+ }
} else {
error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
@@ -1495,9 +1571,22 @@
$grp
}
+sub _ext_cfg_reg($$$$) {
+ my ($rvar, $varname, $cfgname, $default) = @_;
+
+ $cfgname = lc $varname
+ unless length $cfgname;
+
+ $EXT_CFG{$cfgname} = [$rvar, $default];
+
+ $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
+}
+
sub load_extensions {
info "loading extensions...";
+ %EXT_CFG = ();
+
cf::sync_job {
my %todo;
@@ -1549,7 +1638,16 @@
trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
- my $active = eval $v->{source};
+ my $source = $v->{source};
+
+ # support "CONF varname :confname = default" pseudo-statements
+ $source =~ s{
+ ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
+ }{
+ "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
+ }gmxe;
+
+ my $active = eval $source;
if (length $@) {
error "$v->{path}: $@\n";
@@ -1847,18 +1945,6 @@
Expand deliantra pod fragments into protocol xml.
-=item $player->ext_reply ($msgid, @msg)
-
-Sends an ext reply to the player.
-
-=cut
-
-sub ext_reply($$@) {
- my ($self, $id, @msg) = @_;
-
- $self->ns->ext_reply ($id, @msg)
-}
-
=item $player->ext_msg ($type, @msg)
Sends an ext event to the client.
@@ -3172,26 +3258,7 @@
sub cf::client::ext_msg($$@) {
my ($self, $type, @msg) = @_;
- if ($self->extcmd == 2) {
- $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
- } elsif ($self->extcmd == 1) { # TODO: remove
- push @msg, msgtype => "event_$type";
- $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
- }
-}
-
-=item $client->ext_reply ($msgid, @msg)
-
-Sends an ext reply to the client.
-
-=cut
-
-sub cf::client::ext_reply($$@) {
- my ($self, $id, @msg) = @_;
-
- return unless $self->extcmd == 2;
-
- $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
+ $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
}
=item $success = $client->query ($flags, "text", \&cb)
@@ -3258,15 +3325,25 @@
if (ref $msg) {
my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
- my @reply;
-
- if (my $cb = $EXTICMD{$type}) {
- @reply = $cb->($ns, @payload);
- }
+ if (my $cb = $EXTIACMD{$type}) {
+ $cb->(
+ $ns,
+ sub {
+ $ns->ext_msg ("reply-$reply", @_)
+ if $reply;
+ },
+ @payload
+ );
+ } else {
+ my @reply;
- $ns->ext_reply ($reply, @reply)
- if $reply;
+ if (my $cb = $EXTICMD{$type}) {
+ @reply = $cb->($ns, @payload);
+ }
+ $ns->ext_msg ("reply-$reply", @reply)
+ if $reply;
+ }
} else {
error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
}
@@ -3444,6 +3521,30 @@
#############################################################################
# the server's init and main functions
+our %FACEHASH; # hash => idx, #d# HACK for http server
+
+# internal api, not fianlised
+sub add_face {
+ my ($name, $type, $data) = @_;
+
+ my $idx = cf::face::find $name;
+
+ if ($idx) {
+ delete $FACEHASH{cf::face::get_chksum $idx};
+ } else {
+ $idx = cf::face::alloc $name;
+ }
+
+ my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
+
+ cf::face::set_type $idx, $type;
+ cf::face::set_data $idx, 0, $data, $hash;
+ cf::face::set_meta $idx, $type & 1 ? undef : undef;
+ $FACEHASH{$hash} = $idx;#d#
+
+ $idx
+}
+
sub load_facedata($) {
my ($path) = @_;
@@ -3460,19 +3561,13 @@
$facedata->{version} == 2
or cf::cleanup "$path: version mismatch, cannot proceed.";
- # patch in the exptable
- my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
- $facedata->{resource}{"res/exp_table"} = {
- type => FT_RSRC,
- data => $exp_table,
- hash => (Digest::MD5::md5 $exp_table),
- };
cf::cede_to_tick;
{
my $faces = $facedata->{faceinfo};
- while (my ($face, $info) = each %$faces) {
+ for my $face (sort keys %$faces) {
+ my $info = $faces->{$face};
my $idx = (cf::face::find $face) || cf::face::alloc $face;
cf::face::set_visibility $idx, $info->{visibility};
@@ -3480,6 +3575,7 @@
cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
+ $FACEHASH{$info->{hash64}} = $idx;#d#
cf::cede_to_tick;
}
@@ -3516,13 +3612,16 @@
my $res = $facedata->{resource};
while (my ($name, $info) = each %$res) {
- if (defined $info->{type}) {
+ if (defined (my $type = $info->{type})) {
+ # TODO: different hash - must free and use new index, or cache ixface data queue
my $idx = (cf::face::find $name) || cf::face::alloc $name;
+ cf::face::set_type $idx, $type;
cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
- cf::face::set_type $idx, $info->{type};
+ cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
+ $FACEHASH{$info->{hash}} = $idx;#d#
} else {
- $RESOURCE{$name} = $info; # unused
+# $RESOURCE{$name} = $info; # unused
}
cf::cede_to_tick;
@@ -3552,6 +3651,19 @@
$status
}
+sub reload_exp_table {
+ _reload_exp_table;
+
+ add_face "res/exp_table" => FT_RSRC,
+ JSON::XS->new->utf8->canonical->encode (
+ [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
+ );
+}
+
+sub reload_materials {
+ _reload_materials;
+}
+
sub reload_regions {
# HACK to clear player env face cache, we need some signal framework
# for this (global event?)
@@ -3574,6 +3686,15 @@
sub reload_archetypes {
load_resource_file "$DATADIR/archetypes"
or die "unable to load archetypes\n";
+
+ add_face "res/skill_info" => FT_RSRC,
+ JSON::XS->new->utf8->canonical->encode (
+ [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
+ );
+ add_face "res/spell_paths" => FT_RSRC,
+ JSON::XS->new->utf8->canonical->encode (
+ [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
+ );
}
sub reload_treasures {
@@ -3601,16 +3722,79 @@
}
}
+#d# move docstuff to help or so
+our %DOCSTRING;
+
+sub reload_pod {
+ trace "loading pods $PODDIR\n";
+
+ %DOCSTRING = ();
+ my @command_list;
+
+ for (
+ [0, "command_help"],
+ [1, "emote_help"],
+ [2, "dmcommand_help"],
+ ) {
+ my ($type, $path) = @$_;
+
+ my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
+ or die "unable to load $path";
+
+ my $level = 1e9;
+ my $rpar;
+
+ for my $par (@$paragraphs) {
+ if ($par->{type} eq "head2") {
+ # this code taken almost verbatim from DC/Protocol.pm
+
+ if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
+ my $cmd = $1;
+ my @args = split /\|/, $2;
+ @args = (".*") unless @args;
+
+ $_ = $_ eq ".*" ? "" : " $_"
+ for @args;
+
+ my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
+
+ $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
+
+ push @command_list, [$type, \@variants];
+ $level = $par->{level};
+ } else {
+ error "$par->{markup}: unparsable command heading";
+ }
+ } elsif ($par->{level} > $level) {
+ $$rpar .= &cf::pod::as_cfpod ([$par]);
+ }
+
+ cf::cede_to_tick;
+ }
+ }
+
+ @command_list = sort {
+ $a->[0] <=> $b->[0]
+ or $a->[1] cmp $b->[1]
+ } @command_list;
+
+ cf::cede_to_tick;
+
+ add_face "res/command_list" => FT_RSRC,
+ JSON::XS->new->utf8->encode (\@command_list);
+}
+
sub reload_resources {
trace "reloading resource files...\n";
- reload_exp_table;
reload_materials;
reload_facedata;
+ reload_exp_table;
reload_sound;
reload_archetypes;
reload_regions;
reload_treasures;
+ reload_pod;
trace "finished reloading resource files\n";
}
@@ -3675,7 +3859,7 @@
$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
# we must not ever block the main coroutine
- local $Coro::idle = sub {
+ $Coro::idle = sub {
Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
(async {
$Coro::current->{desc} = "IDLE BUG HANDLER";
@@ -3688,6 +3872,8 @@
cf::sync_job {
cf::incloader::init ();
+ db_init;
+
cf::init_anim;
cf::init_attackmess;
cf::init_dynamic;
@@ -3696,7 +3882,6 @@
reload_resources;
reload_config;
- db_init;
cf::init_uuid;
cf::init_signals;
@@ -4131,6 +4316,7 @@
{
# configure BDB
+ info "initialising database";
BDB::min_parallel 16;
BDB::max_poll_reqs $TICK * 0.1;
@@ -4169,14 +4355,18 @@
$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
};
+
+ info "database initialised";
}
{
# configure IO::AIO
+ info "initialising aio";
IO::AIO::min_parallel 8;
IO::AIO::max_poll_time $TICK * 0.1;
undef $AnyEvent::AIO::WATCHER;
+ info "aio initialised";
}
our $_log_backtrace;