Commit e4b47afe authored by Ricardo Martínez's avatar Ricardo Martínez
Browse files

PathComp Backend Adding Logs

parent bd873955

src/pathcomp/backend/pathComp_sp.c

+294 −291
Original line number Diff line number Diff line 
/*

 * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

////////////////////////////////////////////////////////////////////////////////////////

/**

 * 	# Copyright 2022 Centre Tecnolgic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -12,8 +13,10 @@ 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



 * Author: CTTC/CERCA PONS RU Ricardo Martnez (ricardo.martinez@cttc.es)

 */

 ////////////////////////////////////////////////////////////////////////////////////////

#include <stdio.h>

#include <stdlib.h> 

#include <sys/types.h>
@@ -48,7 +51,7 @@ GList* contextSet; 
 *	@param s

 *  @param mapNodes

 *

 *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>

 *	@author Ricardo Martnez <ricardo.martinez@cttc.es>

 *	@date 2022

 */

 /////////////////////////////////////////////////////////////////////////////////////////
@@ -103,7 +106,7 @@ gint computation(struct pred_t* pred, struct graph_t* g, struct service_t* s, st 
 *  @param path

 *  @param g

 *

 *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>

 *	@author Ricardo Martnez <ricardo.martinez@cttc.es>

 *	@date 2022

 */

 /////////////////////////////////////////////////////////////////////////////////////////
@@ -183,7 +186,7 @@ void computation_shortest_path(struct service_t* s, struct compRouteOutput_t* pa 
 *

 *  @param outputList

 *

 *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>

 *	@author Ricardo Martnez <ricardo.martinez@cttc.es>

 *	@date 2022

 */

void sp_execution_services(struct compRouteOutputList_t* oPathList) {
@@ -230,8 +233,8 @@ void sp_execution_services(struct compRouteOutputList_t* oPathList) { 
			 continue;

		 }

		 struct path_t* path = &(pathService->paths[pathService->numPaths - 1]);

		 //allocate_graph_resources(path, service, g);			// LGR: crashes in some cases with assymetric topos

		 //allocate_graph_reverse_resources(path, service, g);	// LGR: crashes in some cases with assymetric topos

		 allocate_graph_resources(path, service, g);

		 allocate_graph_reverse_resources(path, service, g);

		 print_graph(g);

	}

	return;
@@ -244,7 +247,7 @@ void sp_execution_services(struct compRouteOutputList_t* oPathList) { 
 *

 *  @param compRouteOutput

 *

 *	@author Ricardo Mart�nez <ricardo.martinez@cttc.es>

 *	@author Ricardo Martnez <ricardo.martinez@cttc.es>

 *	@date 2022

 */

 /////////////////////////////////////////////////////////////////////////////////////////

src/pathcomp/backend/pathComp_tools.c

+3400 −3396
Original line number Diff line number Diff line 
/*

 * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

////////////////////////////////////////////////////////////////////////////////////////

/**

 * 	# Copyright 2022 Centre Tecnològic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -12,7 +13,10 @@ 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.



 * Author: CTTC/CERCA PONS RU Ricardo Martínez (ricardo.martinez@cttc.es)

 */

/////////////////////////////////////////////////////////////////////////////////////////



#include <stdio.h>

#include <stdlib.h>

src/pathcomp/backend/pathComp_tools.h

+623 −619
Original line number Diff line number Diff line 
/*

 * Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

////////////////////////////////////////////////////////////////////////////////////////

/**

 * 	# Copyright 2022 Centre Tecnol�gic de Telecomunicacions de Catalunya (CTTC/CERCA) www.cttc.es

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -12,7 +13,10 @@ 
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.



 * Author: CTTC/CERCA PONS RU Ricardo Mart�nez (ricardo.martinez@cttc.es)

 */

/////////////////////////////////////////////////////////////////////////////////////////



#ifndef _PATHCOMP_TOOLS_H

#define _PATHCOMP_TOOLS_H
@@ -124,8 +128,8 @@ struct map_nodes_t { 
    gint numMapNodes;

};



#define MAX_NUM_VERTICES				100 // 100 # LGR: reduced from 100 to 20 to divide by 5 the memory used

#define MAX_NUM_EDGES					5 // 100 # LGR: reduced from 100 to 5 to divide by 20 the memory used

#define MAX_NUM_VERTICES				20 // 100 # LGR: reduced from 100 to 20 to divide by 5 the memory used

#define MAX_NUM_EDGES					10 // 100 # LGR: reduced from 100 to 10 to divide by 10 the memory used

// Structures for the graph composition

struct targetNodes_t {

	// remote / targeted node
@@ -249,7 +253,7 @@ struct endPoint_t { 
// Structure for the device contents

///////////////////////////////////////////////////////////////////

#define MAX_DEV_TYPE_SIZE				128

#define MAX_DEV_ENDPOINT_LENGTH			100	// 10 # LGR: controllers might have large number of endpoints

#define MAX_DEV_ENDPOINT_LENGTH			10

struct device_t {

	gdouble power_idle; // power idle (baseline) of the switch in Watts

	gint operational_status; // 0 - Undefined, 1 - Disabled, 2 - Enabled