sar/sadc: Remove preallocation constants

Next sysstat version will dynamically allocate records for new devices when they are registered by the system. So we no longer need to preallocate those records. This patch removes the constants and files that were used for this purpose. Signed-off-by: Sebastien GODARD <[email protected]>
shaleengarg · Nov 12, 2017 · 069e24e · 069e24e
1 parent 031bfd8
commit 069e24e
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 106 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -213,7 +213,7 @@ svg_stats.o: svg_stats.c sa.h sadf.h ioconf.h sysconfig.h svg_stats.h
 
 raw_stats.o: raw_stats.c sa.h sadf.h ioconf.h sysconfig.h raw_stats.h
 
-sa_wrap.o: sa_wrap.c sa.h rd_stats.h count.h rd_sensors.h prealloc.h
+sa_wrap.o: sa_wrap.c sa.h rd_stats.h count.h rd_sensors.h
 
 format_sadf.o: format.c sadf.h
 	$(CC) -o $@ -c $(CFLAGS) -DSOURCE_SADF $(DFLAGS) $<
@@ -587,7 +587,7 @@ clean:
 	find nls -name "*.gmo" -exec rm -f {} \;
 
 almost-distclean: clean nls/sysstat.pot
-	rm -f sa1 sa2 sysstat cron/crontab version.h sysconfig.h prealloc.h
+	rm -f sa1 sa2 sysstat cron/crontab version.h sysconfig.h
 	rm -f sysstat.sysconfig cron/sysstat.crond cron/sysstat.cron.daily sysstat.service
 	rm -f cron/sysstat-collect.service cron/sysstat-collect.timer cron/sysstat-summary.service cron/sysstat-summary.timer
 	rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in

diff --git a/build/prealloc b/build/prealloc
diff --git a/configure b/configure
@@ -644,8 +644,6 @@ COMPRESS_MANPG
 IGNORE_FILE_ATTRIBUTES
 MAN_GROUP
 man_group
-PREALLOC_FACTOR
-prealloc
 COMPRESSAFTER
 compressafter
 HISTORY
@@ -762,7 +760,6 @@ sa_dir
 conf_dir
 history
 compressafter
-prealloc
 man_group
 cron_owner
 cron_interval
@@ -1412,8 +1409,6 @@ Some influential environment variables:
   compressafter
               number of days after which data files are compressed (default
               value is 10)
-  prealloc    preallocation factor that will determine data files size
-              (default value is 1)
   man_group   group for manual pages
   cron_owner  crontab owner
   cron_interval
@@ -5079,19 +5074,6 @@ fi
 $as_echo "$COMPRESSAFTER" >&6; }
 
 
-# Preallocation factor
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking preallocation factor value" >&5
-$as_echo_n "checking preallocation factor value... " >&6; }
-
-if test x$prealloc = x""; then
-   PREALLOC_FACTOR=1
-else
-   PREALLOC_FACTOR=$prealloc
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PREALLOC_FACTOR" >&5
-$as_echo "$PREALLOC_FACTOR" >&6; }
-
-
 # Manual page group
 grep ^man: /etc/group >/dev/null 2>&1
 if test $? = 0; then
@@ -5396,8 +5378,6 @@ ac_config_files="$ac_config_files version.h:version.in"
 		# File must be renamed
 ac_config_files="$ac_config_files sysconfig.h:sysconfig.in"
 	# File must be renamed
-ac_config_files="$ac_config_files prealloc.h:prealloc.in"
-	# File must be renamed
 ac_config_files="$ac_config_files cron/sysstat.cron.daily"
 
 ac_config_files="$ac_config_files cron/sysstat.cron.hourly"
@@ -6148,7 +6128,6 @@ do
     "sysstat.sysconfig") CONFIG_FILES="$CONFIG_FILES sysstat.sysconfig" ;;
     "version.h") CONFIG_FILES="$CONFIG_FILES version.h:version.in" ;;
     "sysconfig.h") CONFIG_FILES="$CONFIG_FILES sysconfig.h:sysconfig.in" ;;
-    "prealloc.h") CONFIG_FILES="$CONFIG_FILES prealloc.h:prealloc.in" ;;
     "cron/sysstat.cron.daily") CONFIG_FILES="$CONFIG_FILES cron/sysstat.cron.daily" ;;
     "cron/sysstat.cron.hourly") CONFIG_FILES="$CONFIG_FILES cron/sysstat.cron.hourly" ;;
     "cron/sysstat.crond") CONFIG_FILES="$CONFIG_FILES cron/sysstat.crond" ;;

diff --git a/configure.in b/configure.in
@@ -337,17 +337,6 @@ fi
 AC_MSG_RESULT($COMPRESSAFTER)
 AC_SUBST(COMPRESSAFTER)
 
-# Preallocation factor
-AC_MSG_CHECKING(preallocation factor value)
-AC_ARG_VAR([prealloc],[preallocation factor that will determine data files size (default value is 1)])
-if test x$prealloc = x""; then
-   PREALLOC_FACTOR=1
-else
-   PREALLOC_FACTOR=$prealloc
-fi
-AC_MSG_RESULT($PREALLOC_FACTOR)
-AC_SUBST(PREALLOC_FACTOR)
-
 # Manual page group
 grep ^man: /etc/group >/dev/null 2>&1
 if test $? = 0; then
@@ -591,7 +580,6 @@ AC_CONFIG_FILES([cron/crontab:cron/crontab.sample])	# File must be renamed
 AC_CONFIG_FILES([sysstat.sysconfig])
 AC_CONFIG_FILES([version.h:version.in])		# File must be renamed
 AC_CONFIG_FILES([sysconfig.h:sysconfig.in])	# File must be renamed
-AC_CONFIG_FILES([prealloc.h:prealloc.in])	# File must be renamed
 AC_CONFIG_FILES([cron/sysstat.cron.daily])
 AC_CONFIG_FILES([cron/sysstat.cron.hourly])
 AC_CONFIG_FILES([cron/sysstat.crond])

diff --git a/iconfig b/iconfig
@@ -79,12 +79,6 @@ if [ "${COMPRESSAFTER}" != "" ]; then
 	COMPRESSAFTER="compressafter=${COMPRESSAFTER} "
 fi
 
-# Preallocation factor
-PREALLOC_ANSWER=`${ASK} 'Preallocation factor value:' "prealloc" "prealloc"`
-if [ "${PREALLOC_ANSWER}" != "" ]; then
-	PREALLOC_ANSWER="prealloc=${PREALLOC_ANSWER} "
-fi
-
 # Manual page group
 MAN=`${ASK} 'Group for manual pages:' "man_group" "man_group"`
 if [ "${MAN}" != "" ]; then
@@ -202,7 +196,7 @@ fi
 
 echo
 echo -n "./configure ${PREFIX}${SA_LIB_DIR}${SA_DIR}${SYSCONFIG_DIR}${CLEAN_SA_DIR}${NLS} \
-${HISTORY}${COMPRESSAFTER}${PREALLOC_ANSWER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR}"
+${HISTORY}${COMPRESSAFTER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR}"
 if [ "${SADC_OPT}" != "" ];
 then
 	echo -n "sadc_options=\"${SADC_OPT}\""
@@ -211,7 +205,7 @@ echo "${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${SENSORS}${STRIP}${COPY_ONLY}"
 echo
 
 ./configure ${PREFIX}${SA_LIB_DIR}${SA_DIR}${SYSCONFIG_DIR}${CLEAN_SA_DIR}${NLS} \
-${HISTORY}${COMPRESSAFTER}${PREALLOC_ANSWER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR} \
+${HISTORY}${COMPRESSAFTER}${MAN}${IGNORE_FILE_ATTR}${CRON}${RCDIR} \
 sadc_options="${SADC_OPT}" ${COMPRESSMANPG}${INSTALL_DOC}${DEBUGINFO}${SENSORS} \
 ${STRIP}${COPY_ONLY}
 
diff --git a/prealloc.in b/prealloc.in
diff --git a/sa.h b/sa.h
@@ -9,7 +9,6 @@
 #include <stdio.h>
 
 #include "common.h"
-#include "prealloc.h"
 #include "rd_stats.h"
 #include "rd_sensors.h"
 

diff --git a/sa_wrap.c b/sa_wrap.c
@@ -956,19 +956,19 @@ __nr_t wrap_get_irq_nr(struct activity *a)
  * @a	Activity structure.
  *
  * RETURNS:
- * Number of serial lines supporting tx/rx accouting + a pre-allocation
- * constant. Number cannot exceed MAX_NR_SERIAL_LINES.
+ * Number of serial lines supporting tx/rx accouting.
+ * Number cannot exceed MAX_NR_SERIAL_LINES.
  ***************************************************************************
  */
 __nr_t wrap_get_serial_nr(struct activity *a)
 {
 	__nr_t n = 0;
 
 	if ((n = get_serial_nr()) > 0) {
-		if ((n + NR_SERIAL_PREALLOC) > MAX_NR_SERIAL_LINES)
+		if (n > MAX_NR_SERIAL_LINES)
 			return MAX_NR_SERIAL_LINES;
 		else
-			return n + NR_SERIAL_PREALLOC;
+			return n;
 	}
 
 	return 0;
@@ -983,19 +983,18 @@ __nr_t wrap_get_serial_nr(struct activity *a)
  * @a	Activity structure.
  *
  * RETURNS:
- * Number of network interfaces + a pre-allocation constant. Number cannot
- * exceed MAX_NR_IFACES.
+ * Number of network interfaces. Number cannot exceed MAX_NR_IFACES.
  ***************************************************************************
  */
 __nr_t wrap_get_iface_nr(struct activity *a)
 {
 	__nr_t n = 0;
 
 	if ((n = get_iface_nr()) > 0) {
-		if ((n + NR_IFACE_PREALLOC) > MAX_NR_IFACES)
+		if (n > MAX_NR_IFACES)
 			return MAX_NR_IFACES;
 		else
-			return n + NR_IFACE_PREALLOC;
+			return n;
 	}
 
 	return 0;
@@ -1030,8 +1029,7 @@ __nr_t wrap_get_cpu_nr(struct activity *a)
  * @a	Activity structure.
  *
  * RETURNS:
- * Number of devices + a pre-allocation constant. Number cannot exceed
- * MAX_NR_DISKS.
+ * Number of devices. Number cannot exceed MAX_NR_DISKS.
  ***************************************************************************
  */
 __nr_t wrap_get_disk_nr(struct activity *a)
@@ -1040,10 +1038,10 @@ __nr_t wrap_get_disk_nr(struct activity *a)
 	unsigned int f = COLLECT_PARTITIONS(a->opt_flags);
 
 	if ((n = get_disk_nr(f)) > 0) {
-		if ((n + NR_DISK_PREALLOC) > MAX_NR_DISKS)
+		if (n > MAX_NR_DISKS)
 			return MAX_NR_DISKS;
 		else
-			return n + NR_DISK_PREALLOC;
+			return n;
 	}
 
 	return 0;
@@ -1120,15 +1118,15 @@ __nr_t wrap_get_in_nr(struct activity *a)
  * @a   Activity structure.
  *
  * RETURNS:
- * Number of CPU frequencies + a pre-allocation constant.
+ * Number of CPU frequencies.
  ***************************************************************************
  */
 __nr_t wrap_get_freq_nr(struct activity *a)
 {
 	__nr_t n = 0;
 
 	if ((n = get_freq_nr()) > 0)
-		return n + NR_FREQ_PREALLOC;
+		return n;
 
 	return 0;
 }
@@ -1141,20 +1139,18 @@ __nr_t wrap_get_freq_nr(struct activity *a)
  * @a	Activity structure.
  *
  * RETURNS:
- * Number of USB devices + a pre-allocation constant. Number cannot exceed
- * MAX_NR_USB.
+ * Number of USB devices. Number cannot exceed MAX_NR_USB.
  ***************************************************************************
  */
 __nr_t wrap_get_usb_nr(struct activity *a)
 {
 	__nr_t n = 0;
 
-	if ((n = get_usb_nr()) >= 0) {
-		/* Return a positive number even if no USB devices have been found */
-		if ((n + NR_USB_PREALLOC) > MAX_NR_USB)
+	if ((n = get_usb_nr()) > 0) {
+		if (n > MAX_NR_USB)
 			return MAX_NR_USB;
 		else
-			return n + NR_USB_PREALLOC;
+			return n;
 	}
 
 	return 0;
@@ -1169,19 +1165,18 @@ __nr_t wrap_get_usb_nr(struct activity *a)
  * @a	Activity structure.
  *
  * RETURNS:
- * Number of filesystems + a pre-allocation constant. Number cannot exceed
- * MAX_NR_FS.
+ * Number of filesystems. Number cannot exceed MAX_NR_FS.
  ***************************************************************************
  */
 __nr_t wrap_get_filesystem_nr(struct activity *a)
 {
 	__nr_t n = 0;
 
 	if ((n = get_filesystem_nr()) > 0) {
-		if ((n + NR_FILESYSTEM_PREALLOC) > MAX_NR_FS)
+		if (n > MAX_NR_FS)
 			return MAX_NR_FS;
 		else
-			return n + NR_FILESYSTEM_PREALLOC;
+			return n;
 	}
 
 	return 0;
@@ -1195,20 +1190,18 @@ __nr_t wrap_get_filesystem_nr(struct activity *a)
  * @a	Activity structure.
  *
  * RETURNS:
- * Number of FC hosts + a pre-allocation constant. Number cannot exceed
- * MAX_NR_FCHOSTS.
+ * Number of FC hosts. Number cannot exceed MAX_NR_FCHOSTS.
  ***************************************************************************
  */
 __nr_t wrap_get_fchost_nr(struct activity *a)
 {
 	__nr_t n = 0;
 
-	if ((n = get_fchost_nr()) >= 0) {
-		/* Return a positive number even if no FC hosts have been found */
-		if ((n + NR_FCHOST_PREALLOC) > MAX_NR_FCHOSTS)
+	if ((n = get_fchost_nr()) > 0) {
+		if (n > MAX_NR_FCHOSTS)
 			return MAX_NR_FCHOSTS;
 		else
-			return n + NR_FCHOST_PREALLOC;
+			return n;
 	}
 
 	return 0;

diff --git a/sadf.c b/sadf.c
@@ -437,8 +437,7 @@ time_t get_time_ref(void)
  * Each activity selected may have several views. Moreover we have to take
  * into account volatile activities (eg. CPU) for which the number of views
  * will depend on the highest number of items (eg. maximum number of CPU)
- * saved in the file. This number may be higher than the real number of views
- * that will be displayed since some items have a preallocation constant.
+ * saved in the file.
  *
  * IN:
  * @ifd			File descriptor of input file.