-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting

[oweals/gnunet.git] / src / ats / gnunet-service-ats_addresses_mlp.c

diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index 196ebaba8c9676f7f9dcdb223423f556113640ef..b3c1512ce726310b1ae2000e6c517f1e15823446 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -48,68 +48,46 @@ mlp_solve_to_string (int retcode)
   switch (retcode) {
     case 0:
       return "ok";
-      break;
     case GLP_EBADB:
       return "invalid basis";
-      break;
     case GLP_ESING:
       return "singular matrix";
-      break;
     case GLP_ECOND:
       return "ill-conditioned matrix";
-      break;
     case GLP_EBOUND:
       return "invalid bounds";
-      break;
     case GLP_EFAIL:
       return "solver failed";
-      break;
     case GLP_EOBJLL:
       return "objective lower limit reached";
-      break;
     case GLP_EOBJUL:
       return "objective upper limit reached";
-      break;
     case GLP_EITLIM:
       return "iteration limit exceeded";
-      break;
     case GLP_ETMLIM:
       return "time limit exceeded";
-      break;
     case GLP_ENOPFS:
       return "no primal feasible solution";
-      break;
     case GLP_EROOT:
       return "root LP optimum not provided";
-      break;
     case GLP_ESTOP:
       return "search terminated by application";
-      break;
     case GLP_EMIPGAP:
       return "relative mip gap tolerance reached";
-      break;
     case GLP_ENOFEAS:
       return "no dual feasible solution";
-      break;
     case GLP_ENOCVG:
       return "no convergence";
-      break;
     case GLP_EINSTAB:
       return "numerical instability";
-      break;
     case GLP_EDATA:
       return "invalid data";
-      break;
     case GLP_ERANGE:
       return "result out of range";
-      break;
     default:
       GNUNET_break (0);
       return "unknown error";
-      break;
   }
-  GNUNET_break (0);
-  return "unknown error";
 }
 
 
@@ -124,29 +102,20 @@ mlp_status_to_string (int retcode)
   switch (retcode) {
     case GLP_UNDEF:
       return "solution is undefined";
-      break;
     case GLP_FEAS:
       return "solution is feasible";
-      break;
     case GLP_INFEAS:
       return "solution is infeasible";
-      break;
     case GLP_NOFEAS:
       return "no feasible solution exists";
-      break;
     case GLP_OPT:
       return "solution is optimal";
-      break;
     case GLP_UNBND:
       return "solution is unbounded";
-      break;
     default:
       GNUNET_break (0);
       return "unknown error";
-      break;
   }
-  GNUNET_break (0);
-  return "unknown error";
 }
 
 /**
@@ -162,37 +131,26 @@ mlp_ats_to_string (int ats_index)
   switch (ats_index) {
     case GNUNET_ATS_ARRAY_TERMINATOR:
       return "GNUNET_ATS_ARRAY_TERMINATOR";
-      break;
     case GNUNET_ATS_UTILIZATION_UP:
       return "GNUNET_ATS_UTILIZATION_UP";
-      break;
     case GNUNET_ATS_UTILIZATION_DOWN:
       return "GNUNET_ATS_UTILIZATION_DOWN";
-      break;
     case GNUNET_ATS_COST_LAN:
       return "GNUNET_ATS_COST_LAN";
-      break;
     case GNUNET_ATS_COST_WAN:
       return "GNUNET_ATS_COST_LAN";
-      break;
     case GNUNET_ATS_COST_WLAN:
       return "GNUNET_ATS_COST_WLAN";
-      break;
     case GNUNET_ATS_NETWORK_TYPE:
       return "GNUNET_ATS_NETWORK_TYPE";
-      break;
     case GNUNET_ATS_QUALITY_NET_DELAY:
       return "GNUNET_ATS_QUALITY_NET_DELAY";
-      break;
     case GNUNET_ATS_QUALITY_NET_DISTANCE:
       return "GNUNET_ATS_QUALITY_NET_DISTANCE";
-      break;
     default:
+      GNUNET_break (0);
       return "unknown";
-      break;
   }
-  GNUNET_break (0);
-  return "unknown error";
 }
 
 /**
@@ -278,7 +236,7 @@ mlp_delete_problem (struct GAS_MLP_Handle *mlp)
  * @return GNUNET_OK to continue
  */
 static int
-create_constraint_it (void *cls, const GNUNET_HashCode * key, void *value)
+create_constraint_it (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct GAS_MLP_Handle *mlp = cls;
   struct ATS_Address *address = value;
@@ -674,7 +632,7 @@ mlp_add_constraints_all_addresses (struct GAS_MLP_Handle *mlp, struct GNUNET_CON
  * @return GNUNET_OK to continue
  */
 static int
-create_columns_it (void *cls, const GNUNET_HashCode * key, void *value)
+create_columns_it (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
   struct GAS_MLP_Handle *mlp = cls;
   struct ATS_Address *address = value;
@@ -866,7 +824,7 @@ lp_solv:
   end = GNUNET_TIME_absolute_get ();
   duration = GNUNET_TIME_absolute_get_difference (start, end);
   mlp->lp_solved++;
-  mlp->lp_total_duration =+ duration.rel_value;
+  mlp->lp_total_duration += duration.rel_value;
   s_ctx->lp_duration = duration;
 
   GNUNET_STATISTICS_update (mlp->stats,"# LP problem solved", 1, GNUNET_NO);
@@ -943,7 +901,7 @@ mlp_solve_mlp_problem (struct GAS_MLP_Handle *mlp, struct GAS_MLP_SolutionContex
   end = GNUNET_TIME_absolute_get ();
   duration = GNUNET_TIME_absolute_get_difference (start, end);
   mlp->mlp_solved++;
-  mlp->mlp_total_duration =+ duration.rel_value;
+  mlp->mlp_total_duration += duration.rel_value;
   s_ctx->mlp_duration = duration;
 
   GNUNET_STATISTICS_update (mlp->stats,"# MLP problem solved", 1, GNUNET_NO);
@@ -1021,8 +979,8 @@ GAS_mlp_solve_problem (struct GAS_MLP_Handle *mlp, struct GAS_MLP_SolutionContex
 
   ctx->lp_result = GNUNET_SYSERR;
   ctx->mlp_result = GNUNET_SYSERR;
-  ctx->lp_duration = GNUNET_TIME_relative_get_forever();
-  ctx->mlp_duration = GNUNET_TIME_relative_get_forever();
+  ctx->lp_duration = GNUNET_TIME_UNIT_FOREVER_REL;
+  ctx->mlp_duration = GNUNET_TIME_UNIT_FOREVER_REL;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Solve LP problem\n");
 #if WRITE_MLP
@@ -1369,7 +1327,7 @@ GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
 #endif
   mlp->control_param_mlp.tm_lim = max_duration.rel_value;
 
-  mlp->last_execution = GNUNET_TIME_absolute_get_forever();
+  mlp->last_execution = GNUNET_TIME_UNIT_FOREVER_ABS;
 
   mlp->co_D = D;
   mlp->co_R = R;
@@ -1706,7 +1664,7 @@ GAS_mlp_address_delete (struct GAS_MLP_Handle *mlp, struct GNUNET_CONTAINER_Mult
 }
 
 static int
-mlp_get_preferred_address_it (void *cls, const GNUNET_HashCode * key, void *value)
+mlp_get_preferred_address_it (void *cls, const struct GNUNET_HashCode * key, void *value)
 {
 
   struct ATS_PreferedAddress *aa = (struct ATS_PreferedAddress *) cls;
@@ -1767,8 +1725,8 @@ GAS_mlp_address_change_preference (struct GAS_MLP_Handle *mlp,
 {
   GNUNET_STATISTICS_update (mlp->stats,"# LP address preference changes", 1, GNUNET_NO);
 
-  struct ATS_Peer *p = mlp_find_peer (mlp, peer);
-  p = p;
+  //struct ATS_Peer *p = mlp_find_peer (mlp, peer);
+  //FIXME to finish implementation
   /* Here we have to do the matching */
 }