From e0482eff8323bd5f2133078c8b809d757f9725be Mon Sep 17 00:00:00 2001
From: n-peugnet <n.peugnet@free.fr>
Date: Wed, 13 Oct 2021 00:14:37 +0200
Subject: fix exp daily commits using git log --first-parent
Without this option daily commits visibly alternated between two
branches, creating huge diffs at each switch, and causing the data to be
misleading.
---
exp/Makefile | 34 +++++++++++++++++++++-------------
exp/README.md | 17 +++++++++--------
2 files changed, 30 insertions(+), 21 deletions(-)
(limited to 'exp')
diff --git a/exp/Makefile b/exp/Makefile
index 8b7ce5c..e7c104a 100644
--- a/exp/Makefile
+++ b/exp/Makefile
@@ -1,14 +1,21 @@
-REPO_URL := https://club1.fr/~nicolas/git/dna-backup/
-
SHELL := /bin/bash
+################# Principal parameters #################
+
+REPO_URL ?= https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+REPO_BRANCH ?= master
+RANGE ?= daily
+# Number of initial commits to skip. This option has been added for the
+# Linux kernel repo, as the first commits are too far away date wise.
+SKIP_COMMITS ?= 0
+
# Reset LC_NUMERIC to make printf thousands separator work as expected
export LC_NUMERIC :=
export DNA_BACKUP ?= ../dna-backup
export DNA_PARAMS ?= dna_params
export MAX_VERSION ?= 5
-export COMMITS ?= commits.daily
+export COMMITS ?= commits.$(RANGE)
DNA_4K ?= dna_4k
DNA_8K ?= dna_8k
NOPACK ?= nopack
@@ -21,10 +28,6 @@ export REPO_PATH ?= repo
export GIT_PATH ?= $(abspath git)
GITC := git -C $(REPO_PATH)
-# Number of initial commits to skip. This option has been added for the
-# Linux kernel repo, as the first commits are too far away date wise.
-SKIP_COMMITS ?= 30
-
DNADIRS := $(DNA_4K) $(DNA_8K)
DATADIRS := $(DNA_4K) $(DNA_8K) $(DIFFS) $(NOPACK) $(TARGZ) $(REAL)
SIZEFILES := $(DATADIRS:%=%.size)
@@ -65,7 +68,7 @@ $(NOPACK).size: $(NOPACK).versions run
| bc \
>> $@; \
prev=$$i; \
- done
+ done
%.size: % run
find $< -type f -exec du -ba {} + | sort -k2 | cut -f1 > $@
@@ -105,16 +108,21 @@ $(DATADIRS) $(NOPACK).versions $(REAL).versions:
$(DNA_BACKUP): .FORCE
@$(MAKE) -C $(@D) --no-print-directory $(@F)
+.INTERMEDIATE: commits.monthly
commits.monthly: commits.daily
sed -n '0~30p' $< > $@
+.INTERMEDIATE: commits.weekly
commits.weekly: commits.daily
sed -n '0~7p' $< > $@
-commits.daily: | repo git
- $(GITC) log --reverse --no-merges --pretty=tformat:"%H %as" \
+.INTERMEDIATE: commits.daily
+commits.daily: commits
+ tail -n +$(SKIP_COMMITS) $< > $@
+
+commits: | repo git
+ $(GITC) log $(REPO_BRANCH) --reverse --date-order --first-parent --pretty=tformat:"%H %as" \
| sort --unique --key=2 \
- | tail -n +$(SKIP_COMMITS) \
> $@
repo git &:
@@ -125,11 +133,11 @@ repo git &:
.PHONY: clean
clean: mostlyclean
rm -rf $(REPO_PATH) $(GIT_PATH)
- rm -f commits.*
+ rm -f commits
mostlyclean: resultsclean
rm -rf $(DATADIRS) $(DATADIRS:%=%.versions)
- rm -f run $(DATADIRS:%=%.results) $(DNA_PARAMS)
+ rm -f run $(DATADIRS:%=%.results) $(DNA_PARAMS) commits.*
resultsclean:
rm -f summary.csv $(SIZEFILES)
diff --git a/exp/README.md b/exp/README.md
index 1437aea..2ad6ece 100644
--- a/exp/README.md
+++ b/exp/README.md
@@ -4,7 +4,7 @@
```bash
# run experiences
-make [SKIP_COMMITS=<count>] [MAX_VERSION=<count>] [COMMITS=<file>]
+make [SKIP_COMMITS=<count>] [MAX_VERSION=<count>] [RANGE=<range>]
# clean results
make mostlyclean
@@ -13,12 +13,13 @@ make mostlyclean
make clean
```
-Les 3 fichiers de commits suivants peuvent être automatiquement générés :
+`<range>` can be one of these:
+- `daily`
+- `weekly`
+- `monthly`
-- `commits.daily`
-- `commits.weekly`
-- `commits.monthly`
+By default:
-Par défaut les 30 premiers commits journaliers sont skippés, le nombre
-max de version utilisés pour l'expérience est 5 et le fichier
-`commits.daily` est utiliser comme source de commits.
+- `SKIP_COMMITS` = 0
+- `MAX_VERSION` = 5
+- `RANGE` = daily
--
cgit v1.2.3