Skip to content

Commit

Permalink
Remove exceptions related to the profile code.
Browse files Browse the repository at this point in the history 
Signed-off-by: Ben Greear <greearb@candelatech.com>
  • Loading branch information
@greearb
greearb committed Sep 8, 2017
1 parent de277a7 commit a2bfb54
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 63 deletions.
1 change: 1 addition & 0 deletions xorp/fea/data_plane/control_socket/netlink_socket_utilities.cc
View file
Expand Up @@ -165,6 +165,7 @@ string NlmUtils::nlm_print_msg(vector<uint8_t>& buffer) {
oss << " metric: " << extract_host_int(p);
}
oss << endl;
break;
}

default:
Expand Down
29 changes: 17 additions & 12 deletions xorp/fea/fibconfig.cc
View file
Expand Up @@ -1152,9 +1152,11 @@ FibConfig::add_entry4(const Fte4& fte)
if (_fibconfig_entry_sets.empty())
return (XORP_ERROR);

PROFILE(if (_profile.enabled(profile_route_out))
_profile.log(profile_route_out,
c_format("add %s", fte.net().str().c_str())));
PROFILE(if (_profile.enabled(profile_route_out)) {
string e;
_profile.log(profile_route_out,
c_format("add %s", fte.net().str().c_str()), e);
})

for (fibconfig_entry_set_iter = _fibconfig_entry_sets.begin();
fibconfig_entry_set_iter != _fibconfig_entry_sets.end();
Expand All @@ -1175,9 +1177,10 @@ FibConfig::delete_entry4(const Fte4& fte)
if (_fibconfig_entry_sets.empty())
return (XORP_ERROR);

PROFILE(if (_profile.enabled(profile_route_out))
_profile.log(profile_route_out,
c_format("delete %s", fte.net().str().c_str())));
PROFILE(if (_profile.enabled(profile_route_out)) {
string e;
_profile.log(profile_route_out,
c_format("delete %s", fte.net().str().c_str()), e);})

for (fibconfig_entry_set_iter = _fibconfig_entry_sets.begin();
fibconfig_entry_set_iter != _fibconfig_entry_sets.end();
Expand Down Expand Up @@ -1288,9 +1291,10 @@ FibConfig::add_entry6(const Fte6& fte)
if (_fibconfig_entry_sets.empty())
return (XORP_ERROR);

PROFILE(if (_profile.enabled(profile_route_out))
_profile.log(profile_route_out,
c_format("add %s", fte.net().str().c_str())));
PROFILE(if (_profile.enabled(profile_route_out)) {
string e;
_profile.log(profile_route_out,
c_format("add %s", fte.net().str().c_str()), e);})

for (fibconfig_entry_set_iter = _fibconfig_entry_sets.begin();
fibconfig_entry_set_iter != _fibconfig_entry_sets.end();
Expand All @@ -1311,9 +1315,10 @@ FibConfig::delete_entry6(const Fte6& fte)
if (_fibconfig_entry_sets.empty())
return (XORP_ERROR);

PROFILE(if (_profile.enabled(profile_route_out))
_profile.log(profile_route_out,
c_format("delete %s", fte.net().str().c_str())));
PROFILE(if (_profile.enabled(profile_route_out)) {
string e;
_profile.log(profile_route_out,
c_format("delete %s", fte.net().str().c_str()), e);})

for (fibconfig_entry_set_iter = _fibconfig_entry_sets.begin();
fibconfig_entry_set_iter != _fibconfig_entry_sets.end();
Expand Down
3 changes: 2 additions & 1 deletion xorp/fea/profile_vars.cc
View file
Expand Up @@ -40,7 +40,8 @@ struct profile_vars {
void
initialize_profiling_variables(Profile& p)
{
string e;
for (size_t i = 0; i < sizeof(profile_vars) / sizeof(struct profile_vars);
i++)
p.create(profile_vars[i].var, profile_vars[i].comment);
p.create(profile_vars[i].var, profile_vars[i].comment, e);
}
24 changes: 14 additions & 10 deletions xorp/fea/xrl_fea_target.cc
View file
Expand Up @@ -2120,8 +2120,9 @@ XrlFeaTarget::redist_transaction6_0_1_add_route(
if (protocol_origin == "connected")
is_connected_route = true;

PROFILE(if (_profile.enabled(profile_route_in))
_profile.log(profile_route_in, c_format("add %s", dst.str().c_str())));
PROFILE(if (_profile.enabled(profile_route_in)) {
string e;
_profile.log(profile_route_in, c_format("add %s", dst.str().c_str()), e);});

if (_fibconfig.add_transaction_operation(
tid,
Expand Down Expand Up @@ -2172,9 +2173,10 @@ XrlFeaTarget::redist_transaction6_0_1_delete_route(
if (protocol_origin == "connected")
is_connected_route = true;

PROFILE(if (_profile.enabled(profile_route_in))
_profile.log(profile_route_in,
c_format("delete %s", dst.str().c_str())));
PROFILE(if (_profile.enabled(profile_route_in)) {
string e;
_profile.log(profile_route_in,
c_format("delete %s", dst.str().c_str()), e);});

if (_fibconfig.add_transaction_operation(
tid,
Expand Down Expand Up @@ -3460,8 +3462,9 @@ XrlFeaTarget::redist_transaction4_0_1_add_route(
if (protocol_origin == "connected")
is_connected_route = true;

PROFILE(if (_profile.enabled(profile_route_in))
_profile.log(profile_route_in, c_format("add %s", dst.str().c_str())));
PROFILE(if (_profile.enabled(profile_route_in)) {
string e;
_profile.log(profile_route_in, c_format("add %s", dst.str().c_str()), e);});

if (_fibconfig.add_transaction_operation(
tid,
Expand Down Expand Up @@ -3512,9 +3515,10 @@ XrlFeaTarget::redist_transaction4_0_1_delete_route(
if (protocol_origin == "connected")
is_connected_route = true;

PROFILE(if (_profile.enabled(profile_route_in))
_profile.log(profile_route_in,
c_format("delete %s", dst.str().c_str())));
PROFILE(if (_profile.enabled(profile_route_in)) {
string e;
_profile.log(profile_route_in,
c_format("delete %s", dst.str().c_str()), e);});

if (_fibconfig.add_transaction_operation(
tid,
Expand Down
4 changes: 2 additions & 2 deletions xorp/libxipc/finder_main.cc
View file
Expand Up @@ -105,7 +105,7 @@ finder_main(int argc, char* const argv[])
//
// User is specifying which interface to bind finder to
//
IPv4 bind_addr = IPv4(optarg);
IPv4 bind_addr(optarg);
if (!bind_addr.invalid()) {
in_addr ina;
bind_addr.copy_out(ina);
Expand All @@ -129,7 +129,7 @@ finder_main(int argc, char* const argv[])
// User is specifying a network address to accept finder
// connections from.
//
IPv4 v4(optarg);
IPv4Net v4(optarg);
if (!v4.invalid()) {
add_permitted_net(v4);
} else {
Expand Down
2 changes: 1 addition & 1 deletion xorp/libxipc/finder_xrl_target.cc
View file
Expand Up @@ -336,7 +336,7 @@ FinderXrlTarget::finder_0_2_resolve_xrl(const string& xrl,
finder_trace_result("fail (does not resolve as an xrl).");
XLOG_ERROR("Resolved something that did not look an xrl: \"%s\"\n",
ci->c_str());
return XrlCmdError::COMMAND_FAILED("Xrl format is invalid: " + ci);
return XrlCmdError::COMMAND_FAILED("Xrl format is invalid: " + *ci);
}
else {
s = xx.str();
Expand Down
4 changes: 2 additions & 2 deletions xorp/libxorp/asnum.hh
View file
Expand Up @@ -19,13 +19,13 @@
// XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA;
// http://xorp.net

// $XORP: xorp/libxorp/asnum.hh,v 1.20 2008/10/02 21:57:28 bms Exp $

#ifndef __LIBXORP_ASNUM_HH__
#define __LIBXORP_ASNUM_HH__

#include "libxorp/xorp.h"
#include "libxorp/exceptions.hh"
#include "libxorp/libxorp_module.h"
#include "libxorp/xlog.h"

#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
Expand Down
4 changes: 2 additions & 2 deletions xorp/libxorp/buffer.hh
View file
Expand Up @@ -75,9 +75,9 @@ public:
* @param offset the data offset from the beginning of the buffer.
* @return the data value at @ref offset.
*/
uint8_t data(size_t offset) const throw (InvalidBufferOffset) {
uint8_t data(size_t offset) const {
if (offset >= _max_size)
xorp_throw(InvalidBufferOffset, "invalid get data() offset");
XLOG_ASSERT(0);
return (_data[offset]);
}

Expand Down
7 changes: 0 additions & 7 deletions xorp/libxorp/exceptions.cc
View file
Expand Up @@ -72,13 +72,6 @@ XorpReasonedException::why() const
return ( _why.size() != 0 ) ? _why : string("Not specified");
}

InvalidBufferOffset::InvalidBufferOffset(const char* file,
size_t line,
const string& init_why)
: XorpReasonedException("XorpInvalidBufferOffset", file, line, init_why)
{
}

InvalidPacket::InvalidPacket(const char* file,
size_t line,
const string& init_why)
Expand Down
10 changes: 0 additions & 10 deletions xorp/libxorp/exceptions.hh
View file
Expand Up @@ -134,16 +134,6 @@ protected:
// ----------------------------------------------------------------------------
// Standard XORP exceptions

/**
* @short A standard XORP exception that is thrown if a buffer ofset is
* invalid.
*/
class InvalidBufferOffset : public XorpReasonedException {
public:
InvalidBufferOffset(const char* file, size_t line,
const string& init_why = "");
};

/**
* @short A standard XORP exception that is thrown if the packet is invalid.
*/
Expand Down
32 changes: 19 additions & 13 deletions xorp/libxorp/profile.cc
View file
Expand Up @@ -45,15 +45,18 @@ Profile::~Profile()
}
}

void
Profile::create(const string& pname, const string& comment)
bool
Profile::create(const string& pname, const string& comment, string& e)
{
// Catch initialization problems.
if (_profiles.count(pname) != 0)
return;
if (_profiles.count(pname) != 0) {
e = "Profile already exists: " + pname;
return false;
}

ProfileState *p = new ProfileState(comment, false, false, new logentries);
_profiles[pname] = ref_ptr<ProfileState>(p);
return true;
}

bool
Expand Down Expand Up @@ -104,8 +107,10 @@ Profile::enable(const string& pname, string& e)
return true;

// Don't allow a locked entry to be enabled.
if (i->second->locked())
xorp_throw(PVariableLocked, pname.c_str());
if (i->second->locked()) {
e = "Profile is locked: " + pname;
return false;
}

i->second->set_enabled(true);
_profile_cnt++;
Expand Down Expand Up @@ -150,7 +155,8 @@ Profile::lock_log(const string& pname, string& e)
}

// Disable logging.
disable(pname);
if (!disable(pname, e))
return false;

// Lock the entry
i->second->set_locked(true);
Expand All @@ -166,13 +172,13 @@ Profile::read_log(const string& pname, ProfileLogEntry& entry, string& e)

// Catch any mispelt pnames.
if (i == _profiles.end()) {
e = "Unknown profile: " + name;
e = "Unknown profile: " + pname;
return false;
}

// Verify that the log entry is locked
if (!i->second->locked()) {
e = "Profile is not locked: " + name;
e = "Profile is not locked: " + pname;
return false;
}

Expand All @@ -194,13 +200,13 @@ Profile::release_log(const string& pname, string& e)

// Catch any mispelt pnames.
if (i == _profiles.end()) {
e = "Unknown profile: " + name;
e = "Unknown profile: " + pname;
return false;
}

// Verify that the log entry is locked
if (!i->second->locked()) {
e = "Profile is not locked: " + name;
e = "Profile is not locked: " + pname;
return false;
}

Expand All @@ -216,13 +222,13 @@ Profile::clear(const string& pname, string& e)

// Catch any mispelt pnames.
if (i == _profiles.end()) {
e = "Unknown profile: " + name;
e = "Unknown profile: " + pname;
return false;
}

// Don't allow a locked entry to be cleared.
if (i->second->locked()) {
e = "Profile is locked: " + name;
e = "Profile is locked: " + pname;
return false;
}

Expand Down
8 changes: 5 additions & 3 deletions xorp/libxorp/profile.hh
View file
Expand Up @@ -193,7 +193,8 @@ class ProfileUtils {
Profile *profile)
{
ProfileLogEntry ple;
if (profile->read_log(pname, ple)) {
string e;
if (profile->read_log(pname, ple, e)) {
TimeVal t = ple.time();
XrlProfileClientV0p1Client pc(xrl_router);
pc.send_log(instance_name.c_str(),
Expand All @@ -202,7 +203,7 @@ class ProfileUtils {
pname, xrl_router, instance_name, profile));
} else {
// Unlock the log entry.
profile->release_log(pname);
profile->release_log(pname, e);
ProfileUtils::transmit_finished(pname, xrl_router, instance_name);
}
}
Expand All @@ -217,7 +218,8 @@ class ProfileUtils {
if (XrlError::OKAY() != error) {
XLOG_WARNING("%s", error.error_msg());
// Unlock the log entry.
profile->release_log(pname);
string e;
profile->release_log(pname, e);
return;
}
ProfileUtils::transmit_log(pname, xrl_router, instance_name, profile);
Expand Down

0 comments on commit a2bfb54

Please sign in to comment.