[ViewVC] Diff of: cvs/AnyEvent-MP/bin/aemp

Comparing AnyEvent-MP/bin/aemp (file contents):
Revision 1.24 by root, Sun Aug 30 18:51:49 2009 UTC vs.
Revision 1.25 by root, Sun Aug 30 19:49:47 2009 UTC

    aemp delservice <initfunc>    # delete one instance of a service
    # profile-specific configuration
    aemp profile <name> <command>... # apply command to profile only
    aemp parent <name>            # specify a parent profile
+   aemp delparent                # clear parent again
    aemp delprofile <name>        # eradicate the named profile
    aemp showprofile <name>       # display given profile
-   aemp showconfig <name>        # display effective config
+   aemp showconfig <name> ...    # display effective config
 =head1 DESCRIPTION
 With aemp you can configure various aspects of AnyEvent::MP and its
 protocol, send various messages and even run a node.
 =back
 =head2 PROTOCOL COMMANDS
 These commands actually communicate with other nodes. They all use a node
-profile name of L<anon/> currently.
+profile name of C<aemp> (specifying a dfeault node ID of C<anon/> and a
+binds list containing C<*:*> only).
 They all use a timeout of five seconds, after which they give up.
 =over 4
 Sets the list of bind addresses explicitly - see the F<aemp setseeds>
 command for the exact syntax. In addition, a value of C<0> for the port
 means to use a dynamically-assigned port.
-Note that the C<*>, C<*:0> or C<*:port> values are very useful here.
+Note that the C<*>, C<*:*> or C<*:port> values are very useful here.
 Example: bind on the default port (4040) on all local interfaces.
    aemp setbinds "*"
 Example: bind on a random port on all local interfaces.
-   aemp setbinds "*:0"
+   aemp setbinds "*:*"
 Example: resolve "doomed.mydomain" and try to bind on port C<4040> of all
 IP addressess returned.
    aep setbinds doomed.mydomain
 Example: create a C<server> profile, give it a random node name, some seed
 nodes and bind it on an unspecified port on all local interfaces. You
 should add some services then and run the node...
-   aemp server setnodeid anon/ setseeds doomed,10.0.0.2:5000 setbinds "*:0"
+   aemp server setnodeid anon/ setseeds doomed,10.0.0.2:5000 setbinds "*:*"
 =item delprofile <name>
 Deletes the profile of the given name.
 =item showprofile <name>
 Shows the values of the given profile, and only those, no inherited
 values.
-=item showconfig <name>
+=item showconfig <name> <key value...>
 Shows the I<effective> config, i.e. the values as used by a node started
-with the given profile name.
+with the given profile name. Any additional key-value pairs specified
+augment the configuration, just as with C<initialise_node>.
-If the name is omitted, show the global default config.
+If all arguments are omitted, show the global default config.
 =back
 =cut
       AnyEvent::Watchdog::autorestart (1);
       AnyEvent::Watchdog::heartbeat (300);
       require AnyEvent;
-      require AnyEvent::MP;
+      require AnyEvent::MP::Kernel;
-      AnyEvent::MP::initialise_node (@ARGV);
+      AnyEvent::MP::Kernel::initialise_node (@ARGV);
       AnyEvent::detect () eq "AnyEvent::Impl::EV"
          ? EV::loop ()
          : AE::cv ()->recv;
    }
       "2>", "/dev/null";
    "$cert$key"
 }
+sub init {
+   initialise_node aemp => nodeid => "anon/", binds => ["*:*"];
+}
 our $cfg     = AnyEvent::MP::Config::config;
 our $profile = $cfg;
 sub trace {
    my ($node) = @_;
    my $to = AE::timer 15, 0, sub {
       warn "timeout\n";
       $cv->();
    };
-   initialise_node "anon/";
+   init;
    my $reply = port {
       my ($node, @neigh) = @_;
       @neigh = grep $_ ne $NODE, @neigh;
 sub docmd;
 our %CMD = (
    snd => sub {
       my $port = shift @ARGV;
-      initialise_node "anon/";
+      init;
       snd $port, @ARGV; @ARGV = ();
       my $cv = AE::cv;
       my $to = AE::timer 5, 0, sub { $cv->("timeout") };
       print join " ", $cv->recv, "\n";
    },
    rpc => sub {
       my $port = shift @ARGV;
-      initialise_node "anon/";
+      init;
       my $cv = AE::cv;
       my $to = AE::timer 5, 0, sub { $cv->("timeout") };
       snd $port, @ARGV, port { &$cv }; @ARGV = ();
       mon $port, $cv;
       print +(substr JSON::XS->new->encode ([$cv->recv]), 1, -1), "\n";
    },
    mon => sub {
       my $port = shift @ARGV;
-      initialise_node "anon/";
+      init;
       mon $port, my $cv = AE::cv;
       print join " ", $cv->recv, "\n";
    },
    eval => sub {
       my $node = node_of shift @ARGV;
       my $expr = join " ", @ARGV; @ARGV = ();
-      initialise_node "anon/";
+      init;
       my $cv = AE::cv;
       my $to = AE::timer 5, 0, sub { $cv->("timeout") };
       AnyEvent::MP::Kernel::eval_on $node, $expr, port { &$cv };
       mon $node, $cv;
       print JSON::XS->new->pretty->encode ($cfg->{profile}{$name} || {});
    },
    showconfig => sub {
       my $name = @ARGV ? shift @ARGV : AnyEvent::MP::Kernel::_nodename;
-      my $profile = AnyEvent::MP::Config::find_profile $name;
+      my $profile = AnyEvent::MP::Config::find_profile $name, @ARGV;
+      @ARGV = ();
       # make it look nicer:
       delete $profile->{profile};
       delete $profile->{parent};
       print JSON::XS->new->pretty->encode ($profile);
    },
+   # undocumented
+   _resolve => sub {
+      print +(join ",", (AnyEvent::MP::Kernel::_resolve shift @ARGV)->recv), "\n";
+   },
 );
 sub docmd {
    my $cmd = shift @ARGV;

Diff Legend

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

Comparing AnyEvent-MP/bin/aemp (file contents): Revision 1.24 by root, Sun Aug 30 18:51:49 2009 UTC vs. Revision 1.25 by root, Sun Aug 30 19:49:47 2009 UTC

Diff Legend

Comparing AnyEvent-MP/bin/aemp (file contents):
Revision 1.24 by root, Sun Aug 30 18:51:49 2009 UTC vs.
Revision 1.25 by root, Sun Aug 30 19:49:47 2009 UTC