#include "exec_req.h"
#include <errno.h>
#include "peer.h"
+#include "discovery.h"
/** Version of the protocol */
#define VER_MAJOR 0
CORBA_boolean
forb_iop_prepare_request(forb_request_t *req,
- char *iface,
- unsigned method_ind,
+ unsigned *index,
CORBA_Environment *env)
{
CORBA_boolean ret;
forb_iop_request_header rh;
rh.request_id = req->request_id;
- rh.iface = iface;
+ rh.iface = req->interface;
rh.objkey = forb_object_to_key(req->obj);
- rh.method_index = method_ind;
+ rh.method_index = req->method_ind;
rh.source = forb_object_to_forb(req->obj)->server_id;
ret = forb_iop_request_header_serialize(&req->cdr_request, &rh);
if (ret) {
/* Request body is 8 byte aligned */
ret = FORB_CDR_put_align(&req->cdr_request, 8);
+ char str[50];
+ ul_logdeb("preparing request: id=%d dest=%s iface=%s method=%d\n", req->request_id,
+ forb_server_id_to_string(str, &req->obj->server, sizeof(str)),
+ rh.iface, rh.method_index);
}
+ *index = req->cdr_request.wptr;
return ret;
}
const forb_server_id *server_id,
const void *src_addr,
CORBA_boolean (*serialize_addr)(FORB_CDR_Codec *codec, const void *addr),
- const CORBA_string orb_id)
+ const CORBA_char *orb_id)
{
if (!forb_server_id_serialize(codec, server_id)) return CORBA_FALSE;
if (serialize_addr) {
if (!serialize_addr(codec, src_addr)) return CORBA_FALSE;
}
if (!CORBA_string_serialize(codec, &orb_id)) return CORBA_FALSE;
+ /* All headers must be 8 byte aligned so align the length of
+ * this message */
+ if (!FORB_CDR_put_align(codec, 8)) return CORBA_FALSE;
if (!forb_iop_prepend_message_header(codec, forb_iop_HELLO)) return CORBA_FALSE;
return CORBA_TRUE;
}
+int forb_iop_send_hello_to(forb_peer_t *peer)
+{
+ forb_port_t *port = peer->port;
+ FORB_CDR_Codec codec;
+ int ret;
+ FORB_CDR_codec_init_static(&codec, port->forb->orb);
+ if (!FORB_CDR_buffer_init(&codec, 1024, 0))
+ return -1;
+ if (!FORB_CDR_buffer_reset(&codec, forb_iop_MESSAGE_HEADER_SIZE)) {
+ ret = -1;
+ goto free;
+ }
+ if (!forb_iop_prepare_hello(&codec, &port->forb->server_id,
+ port->desc.addr,
+ port->desc.proto->serialize_addr,
+ port->forb->attr.orb_id)) {
+ ret = -1;
+ goto free;
+ }
+ ret = forb_proto_send(peer, &codec);
+ if (ret > 0) ret = 0;
+free:
+ FORB_CDR_codec_release_buffer(&codec);
+ return ret;
+}
+
+int
+forb_iop_redistribute_hello_to(forb_peer_t *dest, forb_peer_t *peer)
+{
+ forb_port_t *port = peer->port;
+ FORB_CDR_Codec codec;
+ int ret;
+ FORB_CDR_codec_init_static(&codec, port->forb->orb);
+ if (!FORB_CDR_buffer_init(&codec, 1024, 0))
+ return -1;
+ if (!FORB_CDR_buffer_reset(&codec, forb_iop_MESSAGE_HEADER_SIZE)) {
+ ret = -1;
+ goto free;
+ }
+ if (!forb_iop_prepare_hello(&codec, &peer->server_id,
+ peer->addr,
+ peer->port->desc.proto->serialize_addr,
+ peer->orb_id)) {
+ ret = -1;
+ goto free;
+ }
+ ul_logdeb("redistributing hello of %s (%s) to %s (%s)\n",
+ ""/*TODO:id*/, peer->orb_id, "", dest->orb_id);
+ ret = forb_proto_send(dest, &codec);
+ if (ret > 0) ret = 0;
+free:
+ FORB_CDR_codec_release_buffer(&codec);
+ return ret;
+}
+
bool
forb_iop_process_message_header(forb_iop_message_header *mh, FORB_CDR_Codec *codec)
{
case forb_iop_HELLO:
break;
default:
+ ul_logerr("rcvd wrong message type: %d\n",
+ mh->message_type);
return false;
}
codec->data_endian = (mh->flags && forb_iop_LITTLE_ENDIAN) ?
return true;
break;
default:
+ ul_logerr("rcvd wrong protocol versio: %d.%d\n",
+ mh->proto_version.major, mh->proto_version.minor);
return false;
}
}
forb_iop_REPLY_HEADER_SIZE);
forb_exception_serialize(codec, env);
}
+ /* All headers must be 8 byte aligned so align the length of
+ * this message */
+ if (!FORB_CDR_put_align(codec, 8)) {
+ ul_logerr("Not enough space for tail align\n");
+ return; /* FIXME: handle error (goto above)*/
+ }
/* forb_iop_REPLY_HEADER_SIZE equals to 8 even if the real
* header is shorter. We want reply data to be 8 byte
* aligned */
peer = forb_get_next_hop(forb, dest, &timeout);
if (!peer) {
- ul_logerr("Reply destination not found\n");
+ char str[60];
+ forb_server_id_to_string(str, dest, sizeof(str));
+ ul_logerr("Reply destination not found: %s\n", str);
goto err;
+ } else {
+ char str[60];
+ forb_server_id_to_string(str, dest, sizeof(str));
+ ul_logdeb("sending reply: dest=%s, id=%u\n", str, request_id);
}
forb_proto_send(peer, codec);
forb_peer_put(peer);
;
}
-
static void
process_request(forb_port_t *port, FORB_CDR_Codec *codec, uint32_t message_size)
{
forb_exec_req_t *exec_req;
uint32_t req_size, data_size, header_size;
char str[32];
+ forb_peer_t *peer;
data_size = FORB_CDR_data_size(codec);
ret = forb_iop_request_header_deserialize(codec, &request_header);
request_header.request_id,
request_header.iface,
request_header.method_index);
+
+ if (port->new_peer) {
+ /* Request from a new peer was reported by the underlaying protocol */
+ peer = forb_peer_find(port->forb, &request_header.source);
+ if (peer) {
+ /* We already know this peer */
+ /* TODO: Can it be in FORB_PEER_WANTED state?
+ * If yes, we cannot simply igore this. */
+ ul_logmsg("new_peer was already known\n");
+ forb_peer_put(port->new_peer);
+ port->new_peer = NULL;
+ } else {
+ ul_logdeb("discovered new_peer from incomming connection\n");
+ peer = port->new_peer;
+ port->new_peer = NULL;
+ forb_new_peer_discovered(port, peer, request_header.source,
+ peer->addr, peer->orb_id);
+ }
+
+ }
obj = forb_key_to_object(forb, request_header.objkey);
if (!obj) {
/* Enqueue execution request */
exec_req = forb_malloc(sizeof(*exec_req));
if (exec_req) {
+ memset(exec_req, 0, sizeof(exec_req));
+ exec_req->request_type = FORB_EXEC_REQ_REMOTE;
exec_req->request_id = request_header.request_id;
exec_req->source = request_header.source;
exec_req->obj = obj;
forb_iop_send_reply(port->forb, &request_header.source,
&reply_codec, request_header.request_id, &env);
FORB_CDR_codec_release_buffer(&reply_codec);
+ /* TODO: relese exec_req etc. */
}
static void
forb_syncobj_wait(&port->reply_processed);
}
-void new_peer_discovered(forb_port_t *port, forb_peer_t *peer,
- forb_server_id server_id, void *addr,
- CORBA_string orb_id)
-{
- forb_t *forb = port->forb;
- bool notify_waiters = false;
- if (peer /* && peer->state == FORB_PEER_WANTED */) {
- notify_waiters = true;
- } else {
- peer = forb_peer_new();
- }
- if (!peer)
- return;
-
- fosa_mutex_lock(&forb->peer_mutex);
- peer->server_id = server_id;
- peer->port = port;
- peer->addr = addr;
- peer->orb_id = orb_id;
- peer->state = FORB_PEER_DISCOVERED;
- if (notify_waiters) {
- fosa_cond_broadcast(&peer->cond);
- } else {
- forb_peer_nolock_insert(forb, forb_peer_get(peer));
- }
- forb_port_peer_ins_tail(port, forb_peer_get(peer));
- fosa_mutex_unlock(&forb->peer_mutex);
- {
- char str[60];
- ul_logdeb("new peer discovered %s (orb_id '%s')\n",
- forb_server_id_to_string(str, &peer->server_id, sizeof(str)),
- orb_id);
- }
- forb_peer_put(peer);
-
- /* Broadcast our hello packet now */
- forb_syncobj_signal(&port->hello);
-}
-
/**
* Process incomming HELLO messages.
*
/* printf("Hello received at port %p\n", port); */
forb_server_id_deserialize(codec, &server_id);
- {
- char str[60];
- ul_logdeb("rcvd hello from %s\n", forb_server_id_to_string(str, &server_id, sizeof(str)));
- }
if (port->desc.proto->deserialize_addr) {
port->desc.proto->deserialize_addr(codec, &addr);
}
+ {
+ char str[60], addrstr[60];
+ if (port->desc.proto->addr2str) {
+ port->desc.proto->addr2str(addrstr, sizeof(addrstr), addr);
+ } else
+ addrstr[0] = 0;
+ ul_logdeb("rcvd hello from %s (addr %s)\n",
+ forb_server_id_to_string(str, &server_id, sizeof(str)),
+ addrstr);
+ }
CORBA_string_deserialize(codec, &peer_orb_id);
if (forb_server_id_cmp(&server_id, &forb->server_id) != 0) {
peer = forb_peer_find(forb, &server_id);
if (peer && peer->state == FORB_PEER_DISCOVERED) {
/* TODO: Update last hello receive time */
- if (addr)
- forb_free(addr);
- if (peer_orb_id)
- forb_free(peer_orb_id);
- forb_peer_put(peer);
+ if (port->new_peer) {
+ ul_logdeb("peer already discovered but not connected - replacing\n");
+ forb_peer_disconnected(peer);
+ forb_peer_put(peer);
+ peer = port->new_peer;
+ port->new_peer = NULL;
+ forb_new_peer_discovered(port, peer, server_id, addr, peer_orb_id);
+ } else {
+ ul_logdeb("peer already discovered - ignoring\n");
+ if (addr)
+ forb_free(addr);
+ if (peer_orb_id)
+ forb_free(peer_orb_id);
+ forb_peer_put(peer);
+ }
} else {
- new_peer_discovered(port, peer, server_id, addr, peer_orb_id);
+ if (port->new_peer) {
+ if (peer) {
+ ul_logerr("Unahandled case - FORB_PEER_WANTED && port->new_peer\n");
+ forb_peer_put(peer);
+ }
+ peer = port->new_peer;
+ port->new_peer = NULL;
+ }
+
+ forb_new_peer_discovered(port, peer, server_id, addr, peer_orb_id);
}
}
}
ul_logmsg("rcvd unknown message type\n");
break;
}
+ if (port->new_peer) {
+ /* If for some reaseon the new_peer was not processed so free it here. */
+ ul_logmsg("Forgotten new_peer\n");
+ forb_peer_put(port->new_peer);
+ port->new_peer = NULL;
+ }
+
+ FORB_CDR_get_align(codec, 8);
+
if (FORB_CDR_data_size(codec) != data_size - mh->message_size) {
size_t processed = data_size - FORB_CDR_data_size(codec);
- ul_logmsg("Message of type %d handled incorrectly (size=%d, processed=%d); fixing\n",
+ ul_logmsg("Message of type %d handled incorrectly (size=%d, processed=%zu); fixing\n",
mh->message_type, mh->message_size, processed);
- ;
+ ;
codec->rptr += mh->message_size - processed;
}
}
forb_port_t *port = arg;
const forb_proto_t *proto = port->desc.proto;
FORB_CDR_Codec *c = &port->codec;
- size_t rcvd, len;
+ ssize_t rcvd;
+ size_t len;
forb_iop_message_header mh;
bool header_received = false;
&c->buffer[c->wptr],
c->wptr_max - c->wptr);
if (rcvd < 0) {
- ul_logmsg("recv returned error %d\n", rcvd);
+ ul_logerr("recv returned error %zd (%s), exiting\n", rcvd, strerror(errno));
return NULL;
}
c->wptr += rcvd;
ul_logerr("Header doesn't start at 8 byte bounday\n");
}
header_received = forb_iop_process_message_header(&mh, c);
+ if (!header_received) {
+ ul_logerr("Wrong header received\n");
+ /* TODO: We should probably reset the buffer here */
+ }
len = FORB_CDR_data_size(c);
} else {
break; /* Wait for more data to arrive*/
return NULL;
}
+/**
+ * Sends REQUEST message to another FORB.
+ *
+ * The request @a req has to be prepared by
+ * forb_iop_prepare_request(). Then, this function adds a message
+ * header, connects to the destination FORB and sends the request.
+ *
+ * If no exception is reported, then the caller must wait for response
+ * by calling forb_wait_for_reply().
+ *
+ * @param req A request prepared by forb_iop_prepare_request()
+ * @param env Environment for returning exceptions
+ */
+void
+forb_request_send(forb_request_t *req, unsigned index, CORBA_Environment *env)
+{
+ CORBA_boolean ret;
+ forb_peer_t *peer;
+ ssize_t size;
+ size_t len;
+ fosa_abs_time_t timeout;
+ forb_t *forb = forb_object_to_forb(req->obj);
+ forb_exec_req_t *exec_req;
+
+ if (!forb) {
+ env->major = FORB_EX_INTERNAL;
+ return;
+ }
+
+ req->env = env; /* Remember, where to return exceptions */
+ /* All headers must be 8 byte aligned so align the length of
+ * this message */
+ if (!FORB_CDR_put_align(&req->cdr_request, 8)) {
+ env->major = FORB_EX_INTERNAL;
+ ul_logerr("Not enough space for tail align\n");
+ return;
+ }
+
+ /* Local invocation case, destination of a message is only
+ * a different executor thread */
+ if (forb_object_is_local(req->obj)) {
+ exec_req = forb_malloc(sizeof(*exec_req));
+ memset(exec_req, 0, sizeof(exec_req));
+ exec_req->request_type = FORB_EXEC_REQ_LOCAL;
+ exec_req->input_request = req;
+ exec_req->obj = forb_object_duplicate(req->obj);
+ exec_req->method_index = req->method_ind;
+ exec_req->interface = req->interface;
+ req->cdr_request.rptr = index;
+ exec_req->codec = req->cdr_request;
+ req->cdr_request.release_buffer = CORBA_FALSE;
+ exec_req->request_id = req->request_id;
+ forb_exec_req_ins_tail(forb_object_get_executor(exec_req->obj), exec_req);
+ return;
+ }
+
+ ret = forb_iop_prepend_message_header(&req->cdr_request, forb_iop_REQUEST);
+ if (!ret) {
+ /* This should never happen */
+ env->major = FORB_EX_INTERNAL;
+ return;
+ }
+
+ fosa_clock_get_time(FOSA_CLOCK_ABSOLUTE, &timeout);
+ timeout = fosa_abs_time_incr(timeout,
+ fosa_msec_to_rel_time(1000));
+ peer = forb_get_next_hop(forb, &req->obj->server, &timeout);
+ if (!peer) {
+ char str[50];
+ ul_logerr("Cannot find peer to send request for server %s\n",
+ forb_server_id_to_string(str, &req->obj->server, sizeof(str)));
+ env->major = FORB_EX_COMM_FAILURE;
+ return;
+ }
+ /* Register the request with forb so we can match incomming
+ * reply to this request. */
+ ret = forb_request_insert(forb, req);
+ if (ret <= 0) {
+ ul_logerr("Insert request error %d\n", ret);
+ env->major = FORB_EX_INTERNAL;
+ goto err_peer_put;
+ }
+
+ {
+ char str[50];
+ ul_logdeb("sending request: id=%d dest=%s\n", req->request_id,
+ forb_server_id_to_string(str, &req->obj->server, sizeof(str)));
+ }
+ len = FORB_CDR_data_size(&req->cdr_request);
+ fosa_mutex_lock(&peer->send_lock);
+ size = forb_proto_send(peer, &req->cdr_request);
+ fosa_mutex_unlock(&peer->send_lock);
+ if (size <= 0 || size != len) {
+ env->major = FORB_EX_COMM_FAILURE;
+ /* Request is deleted when the stub calls forb_request_destroy() */
+ }
+ err_peer_put:
+ forb_peer_put(peer);
+}
projects / frescor / forb.git / blobdiff