Skip to contentSkip to conversation

hugeshmget: Use __func__ instead of hardcoded function

PATCH In review “Samir 2 participants 3 messages Apr 6 – Apr 12

lore
Share & tools
lore

“Samir

author
#0 lore raw

PATCH 1/1 hugeshmget: Use __func__ instead of hardcoded function

Replace hardcoded "setup" string with __func__ in error messages to follow LTP coding style guidelines(make check).

Fixed in:
- hugeshmget02.c:83
- hugeshmget03.c:76
- hugeshmget05.c:75

Changed from: tst_brk(TBROK | TERRNO, "shmget #setup");
Changed to:   tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
---
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +-
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -1
index bbd968c06..065aa05fc 100644
@@ -80,7 +80,7 @@ void setup(void)
 	shm_id_1 = shmget(shmkey, shm_size,
 			  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
 	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 }
 
 void cleanup(void)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
index 625761f6e..1f07d585a 100644
@@ -73,7 +73,7 @@ static void setup(void)
 				  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
 	}
 	if (errno != ENOSPC)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 }
 
 static void cleanup(void)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -1
index 336319603..a2bb9020d 100644
@@ -72,7 +72,7 @@ void setup(void)
 	shm_id_1 = shmget(shmkey, shm_size,
 			  SHM_HUGETLB | SHM_RW | IPC_CREAT | IPC_EXCL);
 	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 
 	/* get the userid for a non-root user */
 	ltp_uid = getuserid(ltp_user);
Signature · 5 lines
2.52.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi!

Quoted 7 lines

Fixed in:
- hugeshmget02.c:83
- hugeshmget03.c:76
- hugeshmget05.c:75

Changed from: tst_brk(TBROK | TERRNO, "shmget #setup");
Changed to:   tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

You should really use SAFE_SHMGET() in the setup() in the 02 and 05 tests instead.

Quoted 25 lines
---
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +-
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -1
index bbd968c06..065aa05fc 100644
@@ -80,7 +80,7 @@ void setup(void)
 	shm_id_1 = shmget(shmkey, shm_size,
 			  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
 	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 }
 
 void cleanup(void)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +0 -0
index 625761f6e..1f07d585a 100644

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c static void setup(void) · line 76

Quoted 5 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
@@ -73,7 +73,7 @@ static void setup(void)
 				  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
 	}
 	if (errno != ENOSPC)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

And here you should probably just print tst_brk(TBROK | TERRNO, "shmget()");

There is enough information printed by the tst_brk() to locate the failure, no need to add more.

Quoted 21 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +0 -0
 static void cleanup(void)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -1
index 336319603..a2bb9020d 100644
@@ -72,7 +72,7 @@ void setup(void)
 	shm_id_1 = shmget(shmkey, shm_size,
 			  SHM_HUGETLB | SHM_RW | IPC_CREAT | IPC_EXCL);
 	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 
 	/* get the userid for a non-root user */
 	ltp_uid = getuserid(ltp_user);
Signature · 5 lines
2.52.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#2 lore raw
Quoted 59 lines · Cyril Hrubis

Hi!

Quoted 7 lines

Fixed in:
- hugeshmget02.c:83
- hugeshmget03.c:76
- hugeshmget05.c:75

Changed from: tst_brk(TBROK | TERRNO, "shmget #setup");
Changed to:   tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

You should really use SAFE_SHMGET() in the setup() in the 02 and 05 tests instead.

Quoted 25 lines
---
  testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +-
  testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
  testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -1
index bbd968c06..065aa05fc 100644
@@ -80,7 +80,7 @@ void setup(void)
  	shm_id_1 = shmget(shmkey, shm_size,
  			  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
  	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
  }
 
  void cleanup(void)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +0 -0
index 625761f6e..1f07d585a 100644

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c static void setup(void) · line 76

Quoted 5 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -1
@@ -73,7 +73,7 @@ static void setup(void)
  				  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
  	}
  	if (errno != ENOSPC)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

And here you should probably just print tst_brk(TBROK | TERRNO, "shmget()");

There is enough information printed by the tst_brk() to locate the failure, no need to add more.

Quoted 13 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +0 -0
  static void cleanup(void)
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -1
index 336319603..a2bb9020d 100644
@@ -72,7 +72,7 @@ void setup(void)
  	shm_id_1 = shmget(shmkey, shm_size,
  			  SHM_HUGETLB | SHM_RW | IPC_CREAT | IPC_EXCL);
  	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 
Quoted 8 lines
Quoted 8 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +0 -0
  	/* get the userid for a non-root user */
  	ltp_uid = getuserid(ltp_user);
Signature · 5 lines
2.52.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Hi Cyril,

I have incorporated the requested review comments and submitted the revised version (v2). Thank you for your valuable feedback. Patch v2: https://lore.kernel.org/ltp/[email protected]/T/#u

Thanks,
Samir

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp