Remove unused atomic functions.

None of the source files that #included gp_atomic.h actually needed the
declarations from gp_atomic.h. They actually needed the definitions from
port/atomics.h, which gp-atomic.h in turn #included.

src/backend/cdb/dispatcher/cdbdisp_async.c

@@ -29,7 +29,6 @@
 #include "cdb/cdbgang.h"
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
-#include "utils/gp_atomic.h"
 
 #define DISPATCH_WAIT_TIMEOUT_MSEC 2000
 

src/backend/cdb/dispatcher/cdbdisp_thread.c

@@ -30,7 +30,7 @@
 #include "cdb/cdbgang.h"
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
-#include "utils/gp_atomic.h"
+#include "port/atomics.h"
 
 #ifndef _WIN32
 #define mythread() ((unsigned long) pthread_self())

src/backend/cdb/dispatcher/cdbgang_async.c

@@ -25,7 +25,6 @@
 #include "cdb/cdbgang.h"
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
-#include "utils/gp_atomic.h"
 
 static int getPollTimeout(const struct timeval* startTS);
 static Gang *createGang_async(GangType type, int gang_id, int size, int content);

src/backend/cdb/motion/ic_udpifc.c

@@ -30,11 +30,10 @@
 #include "miscadmin.h"
 #include "libpq/libpq-be.h"
 #include "libpq/ip.h"
-#include "utils/gp_atomic.h"
 #include "utils/builtins.h"
 #include "utils/debugbreak.h"
 #include "utils/faultinjector.h"
-#include "utils/pg_crc.h"
+#include "port/atomics.h"
 #include "port/pg_crc32c.h"
 
 #include "cdb/cdbselect.h"

src/backend/postmaster/backoff.c

@@ -60,7 +60,7 @@
 #include "funcapi.h"
 #include "catalog/pg_type.h"
 #include "access/tuptoaster.h"
-#include "utils/gp_atomic.h"
+#include "port/atomics.h"
 
 extern bool gp_debug_resqueue_priority;
 

src/backend/storage/lmgr/proc.c

@@ -60,7 +60,7 @@
 #include "cdb/cdblocaldistribxact.h"
 #include "cdb/cdbgang.h"
 #include "cdb/cdbvars.h"  /*Gp_is_writer*/
-#include "utils/gp_atomic.h"
+#include "port/atomics.h"
 #include "utils/session_state.h"
 
 /* GUC variables */

src/backend/utils/cache/sharedcache.c

@@ -10,11 +10,12 @@
  */
 
 #include "postgres.h"
-#include "utils/sharedcache.h"
+
+#include "cdb/cdbutil.h"
 #include "cdb/cdbvars.h"
+#include "port/atomics.h"
 #include "utils/memutils.h"
-#include "utils/gp_atomic.h"
-#include "cdb/cdbutil.h"
+#include "utils/sharedcache.h"
 
 /* Suffix used to generate shared memory hashtable name from cache name */
 #define CACHE_HASHTABLE_SUFFIX "_HASHTABLE"

src/backend/utils/cache/syncrefhashtable.c

@@ -11,7 +11,7 @@
 
 #include "postgres.h"
 #include "utils/syncrefhashtable.h"
-#include "utils/gp_atomic.h"
+#include "port/atomics.h"
 #include "storage/shmem.h"
 
 /*

src/backend/utils/misc/Makefile

@@ -18,7 +18,7 @@ SUBDIRS     := fstream
 override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
 
 OBJS = guc.o help_config.o pg_rusage.o ps_status.o superuser.o tzparser.o uriparser.o \
-       faultinjector.o netcheck.o simex.o simexsys.o syncbitvector.o testutils.o gp_atomic.o \
+       faultinjector.o netcheck.o simex.o simexsys.o syncbitvector.o testutils.o \
 	   bitstream.o bitmap_compression.o size.o guc_gp.o zlib_wrapper.o
 
 # This location might depend on the installation directories. Therefore

src/backend/utils/misc/gp_atomic.c

-/*
- * gp_atomic.c
- *    routines for atomic operations.
- *
- * Copyright (c) 2011 - present, EMC DCD (Greenplum)
- */
-
-#include "postgres.h"
-#include "utils/gp_atomic.h"
-
-/*
- * atomic_incmod_value
- *
- * Atomically adds 1 to a value, modulo 'mod'
- *
- * Algorithm:
- *   *loc = (*loc + 1) % mod
- *
- */
-int32
-gp_atomic_incmod_32(volatile int32 *loc, int32 mod)
-{
-	Assert(NULL != loc);
-	int32 oldval = pg_atomic_add_fetch_u32((pg_atomic_uint32 *)loc, 1);
-	if (oldval >= mod)
-	{
-		/* we have overflow */
-		if (oldval == mod)
-		{
-			/* exactly at overflow, reduce by one cycle */
-			pg_atomic_sub_fetch_u32((pg_atomic_uint32 *)loc, mod);
-		}
-		/* must reduce result */
-		oldval %= mod;
-	}
-	return(oldval);
-}
-
-
-/*
- * gp_atomic_dec_positive_32
- *
- * Atomically decrements a value by a positive amount dec. If result was negative,
- * sets value to 0
- *
- * Returns new decremented value, which is never negative
- */
-uint32
-gp_atomic_dec_positive_32(volatile uint32 *loc, uint32 dec)
-{
-	uint32 newVal = 0;
-	while (true)
-	{
-		uint32 oldVal = (uint32) *loc;
-		newVal = 0;
-		if (oldVal > dec)
-		{
-			newVal = oldVal - dec;
-		}
-		bool casResult = pg_atomic_compare_exchange_u32((pg_atomic_uint32 *)loc, &oldVal, newVal);
-		if (true == casResult)
-		{
-			break;
-		}
-	}
-	return newVal;
-}
-
-/*
- * gp_atomic_inc_ceiling_32
- *
- * Atomically increments a value by a positive amount inc. If result is over
- * a ceiling ceil, set value to ceil.
- *
- * Returns new incremented value, which is <= ceil.
- */
-uint32
-gp_atomic_inc_ceiling_32(volatile uint32 *loc, uint32 inc, uint32 ceil)
-{
-	uint32 newVal = 0;
-	while (true)
-	{
-		uint32 oldVal = (uint32) *loc;
-		newVal = oldVal + inc;
-		if (newVal > ceil)
-		{
-			newVal = ceil;
-		}
-		bool casResult = pg_atomic_compare_exchange_u32((pg_atomic_uint32 *)loc, &oldVal, newVal);
-		if (true == casResult)
-		{
-			break;
-		}
-	}
-	return newVal;
-}

src/backend/utils/misc/syncbitvector.c

@@ -17,9 +17,10 @@
  */
 
 #include "postgres.h"
+
+#include "port/atomics.h"
 #include "storage/shmem.h"
 #include "utils/syncbitvector.h"
-#include "utils/gp_atomic.h"
 
 /*
  * bit vector access descriptor.

src/backend/utils/mmgr/memprot.c

@@ -27,6 +27,7 @@
 #endif
 
 #include "miscadmin.h"
+#include "port/atomics.h"
 #include "storage/pg_sema.h"
 #include "storage/ipc.h"
 #include "utils/palloc.h"
@@ -37,7 +38,6 @@
 #include "utils/simex.h"
 #include "utils/vmem_tracker.h"
 #include "utils/session_state.h"
-#include "utils/gp_atomic.h"
 #include "utils/gp_alloc.h"
 
 #define SHMEM_OOM_TIME "last vmem oom time"

src/backend/utils/mmgr/redzone_handler.c

@@ -12,9 +12,10 @@
  */
 
 #include "postgres.h"
-#include "utils/gp_atomic.h"
+
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
+#include "port/atomics.h"
 #include "utils/vmem_tracker.h"
 #include "utils/session_state.h"
 

src/backend/utils/mmgr/runaway_cleaner.c

@@ -14,12 +14,13 @@
  */
 
 #include "postgres.h"
-#include "utils/gp_atomic.h"
+
 #include "cdb/cdbvars.h"
-#include "utils/vmem_tracker.h"
-#include "utils/session_state.h"
-#include "utils/faultinjector.h"
 #include "miscadmin.h"
+#include "port/atomics.h"
+#include "utils/faultinjector.h"
+#include "utils/session_state.h"
+#include "utils/vmem_tracker.h"
 
 /* External dependencies within the runaway cleanup framework */
 extern bool vmemTrackerInited;

src/backend/utils/mmgr/vmem_tracker.c

@@ -13,9 +13,10 @@
  */
 
 #include "postgres.h"
-#include "utils/gp_atomic.h"
+
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
+#include "port/atomics.h"
 #include "utils/faultinjection.h"
 #include "utils/vmem_tracker.h"
 #include "utils/session_state.h"

src/backend/utils/session_state.c

@@ -13,10 +13,10 @@
 
 #include "postgres.h"
 
-#include "utils/gp_atomic.h"
 #include "utils/memutils.h"
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
+#include "port/atomics.h"
 #include "utils/session_state.h"
 #include "utils/vmem_tracker.h"
 

src/backend/utils/workfile_manager/workfile_mgr_test.c

@@ -16,10 +16,10 @@
 #include "cdb/cdbvars.h"
 #include "executor/execWorkfile.h"
 #include "miscadmin.h"
+#include "port/atomics.h"
 #include "postmaster/primary_mirror_mode.h"
 #include "storage/bfz.h"
 #include "storage/buffile.h"
-#include "utils/gp_atomic.h"
 #include "utils/builtins.h"
 #include "utils/logtape.h"
 #include "utils/memutils.h"

src/backend/utils/workfile_manager/workfile_queryspace.c

@@ -10,8 +10,8 @@
 
 #include "postgres.h"
 
+#include "port/atomics.h"
 #include "storage/shmem.h"
-#include "utils/gp_atomic.h"
 #include "utils/workfile_mgr.h"
 #include "utils/memutils.h"
 #include "miscadmin.h"

src/backend/utils/workfile_manager/workfile_segmentspace.c

@@ -10,8 +10,8 @@
 
 #include "postgres.h"
 
+#include "port/atomics.h"
 #include "storage/shmem.h"
-#include "utils/gp_atomic.h"
 #include "cdb/cdbvars.h"
 #include "utils/workfile_mgr.h"
 #include "miscadmin.h"

src/include/utils/gp_atomic.h

-/*
- * gp_atomic.h
- *    Header file for atomic operations.
- *
- * Copyright (c) 2011 - present, EMC DCD (Greenplum).
- */
-#ifndef GP_ATOMIC_H
-#define GP_ATOMIC_H
-
-#include "port/atomics.h"
-
-extern int32 gp_atomic_incmod_32(volatile int32 *loc, int32 mod);
-extern uint32 gp_atomic_dec_positive_32(volatile uint32 *loc, uint32 dec);
-extern uint32 gp_atomic_inc_ceiling_32(volatile uint32 *loc, uint32 inc, uint32 ceil);
-
-#endif   /* GP_ATOMIC_H */