From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 27 Oct 2009 15:08:25 +0000 (+0100)
Subject: Fixed the number of available container blocks
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/frescor/frsh.git/commitdiff_plain/46bdfcdba5ae69dbfe393903281ee669b033fccf?hp=115e06d6138b0e292bd992047c4439a42e32005e

Fixed the number of available container blocks

FRES_NUM_BLOCKS was also prefixed with __ to make the name distinguishable
from regular block identifiers.
---

diff --git a/fres/contract/fres_container.c b/fres/contract/fres_container.c
index cd77459..f040f43 100644
--- a/fres/contract/fres_container.c
+++ b/fres/contract/fres_container.c
@@ -184,7 +184,7 @@ static const struct fres_block_desc desc_spare_capacity = {
  * Information about various block types
  * 
  */
-static const struct fres_block_desc *block_registry[FRES_NUM_BLOCKS] = {
+static const struct fres_block_desc *block_registry[__FRES_NUM_BLOCKS] = {
 	[FRES_BLOCK_LABEL] = &desc_default_label,
 	[FRES_BLOCK_RESOURCE] = &desc_default_resource,
 	[FRES_BLOCK_BASIC] = &desc_default_basic,
@@ -291,7 +291,7 @@ fres_container_destroy(struct fres_container *container)
 {
 	enum fres_block_type i;
 	if (!container) return;
-	for (i=0; i<FRES_NUM_BLOCKS; i++) {
+	for (i=0; i<__FRES_NUM_BLOCKS; i++) {
 		fres_container_del_block(container, i);
 	}
 
@@ -363,7 +363,7 @@ fres_container_duplicate(const struct fres_container *source)
 	dest = fres_container_new();
 	if (!dest) return NULL;
 
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		ret = fres_block_duplicate(&dest->blocks[type], &source->blocks[type], type);
 		if (ret) goto free_dest_err;
 	}
@@ -531,14 +531,14 @@ fres_container_ptr_serialize(FORB_CDR_Codec *codec, const fres_container_ptr *co
 	if (!container) goto err;
 
 	count=0;
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		if (container->blocks[type].state != FRES_BLOCK_EMPTY)
 			count++;
 	}
 
 	if (!CORBA_long_serialize(codec, &count)) goto err;
 	
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		struct fres_block *b = &container->blocks[type];
 		if (b->state != FRES_BLOCK_EMPTY) {
 			ret = serialize_block(codec, type, b);
@@ -617,7 +617,7 @@ fres_container_to_string(char *dest, size_t size, const struct fres_container *c
 	int ret, written = 0;
 	enum fres_block_type type;
 	
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		const struct fres_block *b = &c->blocks[type];
 		switch (b->state) {
 			case FRES_BLOCK_EMPTY:
@@ -673,7 +673,7 @@ fres_container_get_num_blocks(const struct fres_container *c)
 	int num = 0;
 	enum fres_block_type type;
 	
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		if (c->blocks[type].state != FRES_BLOCK_EMPTY) {
 			num++;
 		}
@@ -696,7 +696,7 @@ int fres_container_merge(struct fres_container *dest,
 	enum fres_block_type type;
 	int ret;
 	
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		const struct fres_block *sb = &src->blocks[type];
 		struct fres_block *db = &dest->blocks[type];
 		
@@ -726,7 +726,7 @@ int fres_container_copy(struct fres_container *dest,
 	enum fres_block_type type;
 	int ret;
 	
-	for (type=0; type<FRES_NUM_BLOCKS; type++) {
+	for (type=0; type<__FRES_NUM_BLOCKS; type++) {
 		const struct fres_block *sb = &src->blocks[type];
 		struct fres_block *db = &dest->blocks[type];
 		
diff --git a/fres/contract/fres_container.h b/fres/contract/fres_container.h
index ac99cda..212d5c6 100644
--- a/fres/contract/fres_container.h
+++ b/fres/contract/fres_container.h
@@ -91,8 +91,8 @@ enum fres_block_type {
 	FRES_BLOCK_FWP_SCHED,
 	FRES_BLOCK_ITEM_NODES, /**< resources/item/item_idl.idl */
 	FRES_BLOCK_FPGA,       /**< resources/fpga/res_fpga_idl.idl */
-	FRES_NUM_BLOCKS,
 	FRES_BLOCK_FWP,
+	__FRES_NUM_BLOCKS,
 };
 
 typedef CORBA_boolean (fres_block_serialize_fnc_t)(FORB_CDR_Codec *codec, const void *block_data);
diff --git a/fres/contract/fres_container_internal.h b/fres/contract/fres_container_internal.h
index 8612541..19ac8a8 100644
--- a/fres/contract/fres_container_internal.h
+++ b/fres/contract/fres_container_internal.h
@@ -105,12 +105,12 @@ struct fres_block {
  * blocks of the same type.
  */
 struct fres_container {
-	struct fres_block blocks[FRES_NUM_BLOCKS];
+	struct fres_block blocks[__FRES_NUM_BLOCKS];
 };
 
 /** Checks wheder the @a type is valid number of the block */
 #define FRES_BLOCK_TYPE_VALID(type)	\
-	((type) < FRES_NUM_BLOCKS &&	\
+	((type) < __FRES_NUM_BLOCKS &&	\
 	 (type) >= 0)
 
 int