From fd5f11baffc198c2cd6e02c48bd153f54581917d Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <hlinnakangas@pivotal.io>
Date: Thu, 13 Aug 2020 12:32:36 +0300
Subject: [PATCH] Rename faultInjectorSlots field for clarity.

---
 src/backend/utils/misc/faultinjector.c | 23 +++++++++++------------
 src/include/utils/faultinjector.h      |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/backend/utils/misc/faultinjector.c b/src/backend/utils/misc/faultinjector.c
index 82c5615833..85898f8f63 100644
--- a/src/backend/utils/misc/faultinjector.c
+++ b/src/backend/utils/misc/faultinjector.c
@@ -47,8 +47,7 @@
 typedef struct FaultInjectorShmem_s {
 	slock_t		lock;
 	
-	int			faultInjectorSlots;	
-		/* number of fault injection set */
+	int			numActiveFaults; /* number of fault injections set */
 	
 	HTAB		*hash;
 } FaultInjectorShmem_s;
@@ -61,9 +60,9 @@ static	FaultInjectorShmem_s *faultInjectorShmem = NULL;
  * faultInjectorSlots_ptr points to this until shmem is initialized. Just to
  * keep any FaultInjector_InjectFaultIfSet calls from crashing.
  */
-static int dummyslots = 0;
+static int dummy = 0;
 
-int *faultInjectorSlots_ptr = &dummyslots;
+int *numActiveFaults_ptr = &dummy;
 
 static void FiLockAcquire(void);
 static void FiLockRelease(void);
@@ -197,7 +196,7 @@ FaultInjector_ShmemInit(void)
 				 (errmsg("not enough shared memory for fault injector"))));
 	}	
 
-	faultInjectorSlots_ptr = &faultInjectorShmem->faultInjectorSlots;
+	numActiveFaults_ptr = &faultInjectorShmem->numActiveFaults;
 	
 	if (! foundPtr) 
 	{
@@ -206,7 +205,7 @@ FaultInjector_ShmemInit(void)
 	
 	SpinLockInit(&faultInjectorShmem->lock);
 	
-	faultInjectorShmem->faultInjectorSlots = 0;
+	faultInjectorShmem->numActiveFaults = 0;
 	
 	MemSet(&hash_ctl, 0, sizeof(hash_ctl));
 	hash_ctl.keysize = FAULT_NAME_MAX_LENGTH;
@@ -278,7 +277,7 @@ FaultInjector_InjectFaultIfSet_out_of_line(
 	 * Although this is a race condition without lock, a false negative is
 	 * ok given this framework is purely for dev/testing.
 	 */
-	if (faultInjectorShmem->faultInjectorSlots == 0)
+	if (faultInjectorShmem->numActiveFaults == 0)
 		return FaultInjectorTypeNotSpecified;
 
 	snprintf(databaseNameLocal, sizeof(databaseNameLocal), "%s", databaseName);
@@ -613,7 +612,7 @@ FaultInjector_NewHashEntry(
 
 	FiLockAcquire();
 
-	if ((faultInjectorShmem->faultInjectorSlots + 1) >= FAULTINJECTOR_MAX_SLOTS) {
+	if ((faultInjectorShmem->numActiveFaults + 1) >= FAULTINJECTOR_MAX_SLOTS) {
 		FiLockRelease();
 		status = STATUS_ERROR;
 		ereport(WARNING,
@@ -673,7 +672,7 @@ FaultInjector_NewHashEntry(
 		
 	entryLocal->faultInjectorState = FaultInjectorStateWaiting;
 
-	faultInjectorShmem->faultInjectorSlots++;
+	faultInjectorShmem->numActiveFaults++;
 		
 	FiLockRelease();
 	
@@ -760,18 +759,18 @@ FaultInjector_SetFaultInjection(
 				while ((entryLocal = (FaultInjectorEntry_s *) hash_seq_search(&hash_status)) != NULL) {
 					isRemoved = FaultInjector_RemoveHashEntry(entryLocal->faultName);
 					if (isRemoved == TRUE) {
-						faultInjectorShmem->faultInjectorSlots--;
+						faultInjectorShmem->numActiveFaults--;
 					}					
 				}
 				FiLockRelease();
-				Assert(faultInjectorShmem->faultInjectorSlots == 0);
+				Assert(faultInjectorShmem->numActiveFaults == 0);
 			}
 			else
 			{
 				FiLockAcquire();
 				isRemoved = FaultInjector_RemoveHashEntry(entry->faultName);
 				if (isRemoved == TRUE) {
-					faultInjectorShmem->faultInjectorSlots--;
+					faultInjectorShmem->numActiveFaults--;
 				}
 				FiLockRelease();
 			}
diff --git a/src/include/utils/faultinjector.h b/src/include/utils/faultinjector.h
index 9328e6a798..fd0100e91b 100644
--- a/src/include/utils/faultinjector.h
+++ b/src/include/utils/faultinjector.h
@@ -96,11 +96,11 @@ extern FaultInjectorType_e FaultInjector_InjectFaultIfSet_out_of_line(
 							   const char*				 tableName);
 
 #define FaultInjector_InjectFaultIfSet(faultName, ddlStatement, databaseName, tableName) \
-	(((*faultInjectorSlots_ptr) > 0) ? \
+	(((*numActiveFaults_ptr) > 0) ? \
 	 FaultInjector_InjectFaultIfSet_out_of_line(faultName, ddlStatement, databaseName, tableName) : \
 	 FaultInjectorTypeNotSpecified)
 
-extern int *faultInjectorSlots_ptr;
+extern int *numActiveFaults_ptr;
 
 
 extern char *InjectFault(
-- 
GitLab