Changeset 27 for trunk/src/renetcolAgg.h

Show
Ignore:
Timestamp:
04/05/07 18:10:36 (16 years ago)
Author:
andreu
Message:

explicite output to find wrong definition bug - memory leak in renetcolAgg find

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/renetcolAgg.h

    r25 r27  
    3838#include <sys/sem.h> 
    3939 
     40#include "rrd.h" 
    4041#include "rrdwrap.h" 
    4142#include "dataFlowSet.h" 
    4243 
    43 #define RRD_LOCATION "" 
     44#define RRD_LOCATION "/home/maintenance/RRD/" 
    4445#define RRD_EXTENSION ".rrd" 
    45 #define END_RRD_CREATE " --start 1106560200 DS:inFlows:GAUGE:600:U:U DS:outFlows:GAUGE:600:U:U DS:inBytes:GAUGE:600:U:U DS:outBytes:GAUGE:600:U:U DS:inPkts:GAUGE:600:U:U DS:outPkts:GAUGE:600:U:U DS:inUdpPkts:GAUGE:600:U:U DS:outUdpPkts:GAUGE:600:U:U DS:inTcpPkts:GAUGE:600:U:U DS:outTcpPkts:GAUGE:600:U:U DS:inIcmpPkts:GAUGE:600:U:U DS:outIcmpPkts:GAUGE:600:U:U DS:inOthersPkts:GAUGE:600:U:U DS:outOthersPkts:GAUGE:600:U:U DS:inUdpBytes:GAUGE:600:U:U DS:outUdpBytes:GAUGE:600:U:U DS:inTcpBytes:GAUGE:600:U:U DS:outTcpBytes:GAUGE:600:U:U DS:inIcmpBytes:GAUGE:600:U:U DS:outIcmpBytes:GAUGE:600:U:U DS:inOthersBytes:GAUGE:600:U:U DS:outOthersBytes:GAUGE:600:U:U DS:inUdpFlows:GAUGE:600:U:U DS:outUdpFlows:GAUGE:600:U:U DS:inTcpFlows:GAUGE:600:U:U DS:outTcpFlows:GAUGE:600:U:U DS:inIcmpFlows:GAUGE:600:U:U DS:outIcmpFlows:GAUGE:600:U:U DS:inOthersFlows:GAUGE:600:U:U DS:outOthersFlows:GAUGE:600:U:U RRA:AVERAGE:0.5:1:2100 RRA:AVERAGE:0.5:24:1550 RRA:AVERAGE:0.5:288:1594 RRA:AVERAGE:0.5:2016:1040 RRA:MAX:0.5:1:2100 RRA:MAX:0.5:24:1550 RRA:MAX:0.5:288:1594 RRA:MAX:0.5:2016:1040" 
    46 #define SHMSIZE 3000000 
     46 
     47#define RRD_PARAM_0 "rrdcreate" 
     48#define RRD_PARAM_1 "--start" 
     49#define RRD_PARAM_2 "1106560200" 
     50#define RRD_PARAM_3 "--step" 
     51#define RRD_PARAM_4 "300" 
     52#define RRD_PARAM_5 "DS:inFlows:GAUGE:600:U:U" 
     53#define RRD_PARAM_6 "DS:outFlows:GAUGE:600:U:U" 
     54#define RRD_PARAM_7 "DS:inBytes:GAUGE:600:U:U" 
     55#define RRD_PARAM_8 "DS:outBytes:GAUGE:600:U:U" 
     56#define RRD_PARAM_9 "DS:inPkts:GAUGE:600:U:U" 
     57#define RRD_PARAM_10 "DS:outPkts:GAUGE:600:U:U" 
     58#define RRD_PARAM_11 "DS:inFirstCoS:GAUGE:600:U:U" 
     59#define RRD_PARAM_12 "DS:outFirstCoS:GAUGE:600:U:U" 
     60#define RRD_PARAM_13 "DS:inSecondCoS:GAUGE:600:U:U" 
     61#define RRD_PARAM_14 "DS:outSecondCoS:GAUGE:600:U:U" 
     62#define RRD_PARAM_15 "DS:inThirdCoS:GAUGE:600:U:U" 
     63#define RRD_PARAM_16 "DS:outThirdCoS:GAUGE:600:U:U" 
     64#define RRD_PARAM_17 "DS:inFourthCoS:GAUGE:600:U:U" 
     65#define RRD_PARAM_18 "DS:outFourthCoS:GAUGE:600:U:U" 
     66#define RRD_PARAM_19 "RRA:AVERAGE:0.5:1:2100" 
     67#define RRD_PARAM_20 "RRA:AVERAGE:0.5:24:1550" 
     68#define RRD_PARAM_21 "RRA:AVERAGE:0.5:288:1594" 
     69#define RRD_PARAM_22 "RRA:AVERAGE:0.5:2016:1040" 
     70#define RRD_PARAM_23 "RRA:MAX:0.5:1:2100" 
     71#define RRD_PARAM_24 "RRA:MAX:0.5:24:1550" 
     72#define RRD_PARAM_25 "RRA:MAX:0.5:288:1594" 
     73 
     74#define RRD_UPDATE_0 "rrdupdate" 
     75 
     76#define SHMSIZE 33554432 /* FIXME get from another file ? */ 
    4777 
    4878struct SHMForAgg {