Permalink
Browse files

fixed more typos

  • Loading branch information...
DFritzsche committed Jul 6, 2017
1 parent 7d90fdd commit 464bdb00fb8dc528dd6d99ab0ba3f0c16c616898
@@ -238,7 +238,7 @@ void controller::handle_conn_terminated(rofl::crofdpt &dpt,
void controller::handle_conn_congestion_occurred(rofl::crofdpt &dpt,
const rofl::cauxid &auxid) {
std::cerr << "EVENT: congestion occured, auxid:" << (int)auxid.get_id()
std::cerr << "EVENT: congestion occurred, auxid:" << (int)auxid.get_id()
<< std::endl;
/* An OpenFlow control connection may suffer from insufficient
@@ -250,7 +250,7 @@ void controller::handle_conn_congestion_occurred(rofl::crofdpt &dpt,
* Each connection's transmission buffer size adapts automatically to
* the bandwidth offered by the underlying TCP connection. If the
* TCP socket indicates a blocking condition, rofl-common will call
* method rofl::crofbase::handle_conn_congestion_occured(). The
* method rofl::crofbase::handle_conn_congestion_occurred(). The
* application should stop sending further control messages via this
* connection until a congestion resolution indication is received
* from the library (see below). If an application persists on sending
@@ -479,7 +479,7 @@ void controller::handle_port_desc_stats_reply(
void controller::handle_port_desc_stats_reply_timeout(rofl::crofdpt &dpt,
uint32_t xid) {
std::cerr << "Port-Desc-Stats timeout occured, xid: " << (unsigned int)xid
std::cerr << "Port-Desc-Stats timeout occurred, xid: " << (unsigned int)xid
<< std::endl;
}
@@ -492,7 +492,7 @@ void controller::handle_table_features_stats_reply(
void controller::handle_table_features_stats_reply_timeout(rofl::crofdpt &dpt,
uint32_t xid) {
std::cerr << "Table-Features-Stats timeout occured, xid: "
std::cerr << "Table-Features-Stats timeout occurred, xid: "
<< (unsigned int)xid << std::endl;
}
@@ -504,6 +504,6 @@ void controller::handle_table_stats_reply(
void controller::handle_table_stats_reply_timeout(rofl::crofdpt &dpt,
uint32_t xid) {
std::cerr << "Table-Stats timeout occured, xid: " << (unsigned int)xid
std::cerr << "Table-Stats timeout occurred, xid: " << (unsigned int)xid
<< std::endl;
}
@@ -94,7 +94,7 @@ void datapath::handle_conn_negotiation_failed(rofl::crofctl &ctl,
void datapath::handle_conn_congestion_occurred(rofl::crofctl &ctl,
const rofl::cauxid &auxid) {
std::cerr << "channel congestion occured, ctlid=" << ctlid << std::endl;
std::cerr << "channel congestion occurred, ctlid=" << ctlid << std::endl;
}
void datapath::handle_conn_congestion_solved(rofl::crofctl &ctl,
@@ -150,7 +150,7 @@ class cfibentry : public rofl::cthread_env {
* @brief Handle timeout events generated by class rofl::ciosrv.
*
* This method is overwritten from class rofl::ciosrv and is
* called whenever a previously registered timer event has occured.
* called whenever a previously registered timer event has occurred.
* The 'opaque' and 'data' values are the ones used when calling method
* rofl::ciosrv::register_timer().
*
@@ -200,7 +200,7 @@ class tcpclient : public rofl::crofbase {
*/
virtual void handle_conn_congestion_occurred(rofl::crofctl &ctl,
const rofl::cauxid &auxid) {
std::cerr << "channel congestion occured, ctlid=" << ctlid << std::endl;
std::cerr << "channel congestion occurred, ctlid=" << ctlid << std::endl;
};
/**
@@ -146,7 +146,7 @@ class tcpserver : public rofl::crofbase {
*/
virtual void handle_port_desc_stats_reply_timeout(rofl::crofdpt &dpt,
uint32_t xid) {
std::cerr << "Port-Desc-Stats timeout occured, xid: " << (unsigned int)xid
std::cerr << "Port-Desc-Stats timeout occurred, xid: " << (unsigned int)xid
<< std::endl;
};
@@ -177,7 +177,7 @@ class tcpserver : public rofl::crofbase {
*/
virtual void handle_table_features_stats_reply_timeout(rofl::crofdpt &dpt,
uint32_t xid) {
std::cerr << "Table-Features-Stats timeout occured, xid: "
std::cerr << "Table-Features-Stats timeout occurred, xid: "
<< (unsigned int)xid << std::endl;
};
@@ -206,7 +206,7 @@ class tcpserver : public rofl::crofbase {
*/
virtual void handle_table_stats_reply_timeout(rofl::crofdpt &dpt,
uint32_t xid) {
std::cerr << "Table-Stats timeout occured, xid: " << (unsigned int)xid
std::cerr << "Table-Stats timeout occurred, xid: " << (unsigned int)xid
<< std::endl;
};
@@ -596,7 +596,7 @@ void crofbase::handle_negotiation_failed(crofdpt &dpt, crofconn &conn) {
void crofbase::congestion_occured_indication(crofdpt &dpt, crofconn &conn) {
VLOG(2) << __FUNCTION__
<< " connection congestion occured: dptid=" << dpt.get_dptid()
<< " connection congestion occurred: dptid=" << dpt.get_dptid()
<< ", auxid=" << conn.get_auxid().str().c_str()
<< ", raddr=" << conn.get_raddr().str().c_str();
handle_conn_congestion_occurred(dpt, conn.get_auxid());
@@ -830,9 +830,8 @@ void crofconn::congestion_solved_indication(crofsock &rofsock) {
};
void crofconn::congestion_occured_indication(crofsock &rofsock) {
VLOG(2)
<< __FUNCTION__
<< " congestion occured indication; action: message transmission blocked";
VLOG(2) << __FUNCTION__ << " congestion occurred indication; action: message "
"transmission blocked";
crofconn_env::call_env(env).congestion_occured_indication(*this);
};
@@ -41,7 +41,7 @@ crofsock::crofsock(crofsock_env *env)
"!EXP !PSK !SRP !DSS"),
rx_fragment_pending(false), rxbuffer((size_t)65536), msg_bytes_read(0),
max_pkts_rcvd_per_round(0), rx_disabled(false), tx_disabled(false),
txqueue_pending_pkts(0), txqueue_size_congestion_occured(0),
txqueue_pending_pkts(0), txqueue_size_congestion_occurred(0),
txqueue_size_tx_threshold(0), txqueues(QUEUE_MAX), txweights(QUEUE_MAX),
tx_is_running(false), tx_fragment_pending(false), txbuffer((size_t)65536),
msg_bytes_sent(0), txlen(0) {
@@ -1492,7 +1492,7 @@ void crofsock::send_from_queue() {
::send(sd, txbuffer.somem() + msg_bytes_sent,
txlen - msg_bytes_sent, MSG_DONTWAIT | MSG_NOSIGNAL);
/* error occured */
/* error occurred */
if (nbytes < 0) {
switch (errno) {
case EAGAIN: /* socket would block */ {
@@ -1504,15 +1504,15 @@ void crofsock::send_from_queue() {
if (not flag_test(FLAG_TX_BLOCK_QUEUEING)) {
/* block transmission of further packets */
flag_set(FLAG_TX_BLOCK_QUEUEING, true);
/* remember queue size, when congestion occured */
txqueue_size_congestion_occured = txqueue_pending_pkts;
/* remember queue size, when congestion occurred */
txqueue_size_congestion_occurred = txqueue_pending_pkts;
/* threshold for re-enabling acceptance of packets */
txqueue_size_tx_threshold = txqueue_pending_pkts / 2;
VLOG(3) << __FUNCTION__ << " congestion occured"
VLOG(3) << __FUNCTION__ << " congestion occurred"
<< " txqueue_pending_pkts: " << txqueue_pending_pkts
<< " txqueue_size_congestion_occured: "
<< txqueue_size_congestion_occured
<< " txqueue_size_congestion_occurred: "
<< txqueue_size_congestion_occurred
<< " txqueue_size_tx_threshold: "
<< txqueue_size_tx_threshold << " laddr=" << laddr.str()
<< " raddr=" << raddr.str();
@@ -1563,8 +1563,8 @@ void crofsock::send_from_queue() {
flag_set(FLAG_TX_BLOCK_QUEUEING, false);
VLOG(3) << __FUNCTION__ << " congestion solved"
<< " txqueue_pending_pkts" << txqueue_pending_pkts
<< " txqueue_size_congestion_occured"
<< txqueue_size_congestion_occured
<< " txqueue_size_congestion_occurred"
<< txqueue_size_congestion_occurred
<< " txqueue_size_tx_threshold" << txqueue_size_tx_threshold
<< " laddr=" << laddr.str() << " raddr=" << raddr.str();
@@ -383,14 +383,14 @@ class crofsock : public cthread_env {
* @brief Returns capacity of transmission queues in messages
*/
size_t get_txqueue_max_size() const {
return txqueue_size_congestion_occured;
return txqueue_size_congestion_occurred;
};
/**
* @brief Sets capacity of transmission queues in messages
*/
crofsock &set_txqueue_max_size(size_t txqueue_max_size) {
this->txqueue_size_congestion_occured = txqueue_max_size;
this->txqueue_size_congestion_occurred = txqueue_max_size;
for (unsigned int queue_id = 0; queue_id < QUEUE_MAX; queue_id++) {
txqueues[queue_id].set_queue_max_size(txqueue_max_size);
}
@@ -772,8 +772,8 @@ class crofsock : public cthread_env {
// number of packets waiting for transmission
std::atomic_uint txqueue_pending_pkts;
// size of tx queue when congestion occured
unsigned int txqueue_size_congestion_occured;
// size of tx queue when congestion occurred
unsigned int txqueue_size_congestion_occurred;
// size of tx queue for reallowing transmissions
unsigned int txqueue_size_tx_threshold;
@@ -469,7 +469,7 @@ void crofchantest::congestion_solved_indication(rofl::crofchan &chan,
void crofchantest::congestion_occured_indication(rofl::crofchan &chan,
rofl::crofconn &conn) {
congested = true;
std::cerr << "crofchan::congestion_occured_indication: ";
std::cerr << "crofchan::congestion_occurred_indication: ";
std::cerr << "num_of_pkts_sent=" << num_of_pkts_sent
<< " num_of_pkts_rcvd=" << num_of_pkts_rcvd
<< " max_congestion_rounds=" << max_congestion_rounds << std::endl;
@@ -186,7 +186,7 @@ class crofchantest : public CppUnit::TestFixture,
};
virtual void congestion_occured_indication(rofl::crofconn &conn) {
std::cerr << "crofconn::congestion_occured_indication" << std::endl;
std::cerr << "crofconn::congestion_occurred_indication" << std::endl;
};
virtual void congestion_solved_indication(rofl::crofconn &conn) {
@@ -255,7 +255,7 @@ class crofchantest : public CppUnit::TestFixture,
};
virtual void congestion_occured_indication(rofl::crofsock &socket) {
std::cerr << "crofsock::congestion_occured_indication" << std::endl;
std::cerr << "crofsock::congestion_occurred_indication" << std::endl;
};
};

0 comments on commit 464bdb0

Please sign in to comment.