more header cleaning; updated INSTALL

INSTALL

@@ -1,10 +1,10 @@
 Prerequisites (ubuntu/debian):
 
-   autoconf build-essential cmake
+   build-essential cmake
 
 Recommended build procedure:
 
-   ./bootstrap ; mkdir build ; cd build ; cmake ..
+   mkdir build ; cd build ; cmake ..
    make -j 4
    cd test ; make test
 
@@ -19,7 +19,7 @@ Optional dependencies:
 Obsolete build procedure
 =========================
 
-(Uses automake and libtool)
+(Uses autoconf, automake and libtool)
 
    ./reconf ; ./configure --quiet
    make -j 4

src/stasis/bufferManager.c

@@ -44,13 +44,8 @@ terms specified in this license.
  *
  * implementation of the page buffer
  * *************************************************/
-
-#include <config.h>
-
 #ifdef PROFILE_LATCHES_WRITE_ONLY
 
-
-
 #define _GNU_SOURCE
 #include <stdio.h>  // Need _GNU_SOURCE for asprintf
 #include <stasis/lhtable.h>

src/stasis/bufferManager/legacy/pageCache.c

@@ -5,13 +5,10 @@
    allows bufferManager's implementation to focus on providing atomic
    writes, and locking.
 */
-#include <config.h>
 #include <stasis/common.h>
 
 #include <stasis/page.h>
-
 #include <stasis/bufferManager.h>
-
 #include <stasis/bufferManager/legacy/pageCache.h>
 
 #include <assert.h>

src/stasis/common.c

@@ -1,12 +1,10 @@
 #define _GNU_SOURCE
 
-#include <config.h>
 #include <stasis/common.h>
 
 #include <stasis/latches.h>
 
 #include <pbl/pbl.h>
-#include <errno.h>
 #include <assert.h>
 
 #undef pthread_mutex_t

src/stasis/io/pfile.c

@@ -1,18 +1,10 @@
 #include <config.h>
-#define _XOPEN_SOURCE 500
-#include <fcntl.h>
 
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <errno.h>
-#include <assert.h>
-
-
-#include <stasis/common.h>
 #include <stasis/io/handle.h>
-#include <pthread.h>
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <assert.h>
 
 /**
    @file

src/stasis/logger/groupForce.c

@@ -4,9 +4,6 @@
  *  Created on: May 12, 2009
  *      Author: sears
  */
-
-#include <config.h>
-#include <stasis/common.h>
 #include <stasis/logger/logger2.h>
 
 #include <stdio.h>

src/stasis/logger/logEntry.c

@@ -39,16 +39,13 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.
 ---*/
-
-#include <config.h>
-#include <stasis/common.h>
-
-#include <assert.h>
-
 #include <stasis/page.h> // For stasis_record_type_to_size()
 #include <stasis/logger/logger2.h> // needed for LoggerSizeOfInternalLogEntry()
 #include <stasis/logger/logEntry.h>
 #include <stasis/crc32.h>
+
+#include <assert.h>
+
 LogEntry * allocCommonLogEntry(lsn_t prevLSN, int xid, unsigned int type) {
   LogEntry * ret = calloc(1,sizeof(struct __raw_log_entry));
   ret->LSN     = -1;

src/stasis/logger/logger2.c

@@ -45,13 +45,7 @@ terms specified in this license.
 
    Abstract log implementation.  Provides access to methods that
    directly read and write log entries, force the log to disk, etc.
-
-   @todo Switch logger2 to use function pointers
 */
-
-#include <config.h>
-#include <stasis/common.h>
-
 #include <stasis/logger/logger2.h>
 
 #include <stasis/logger/safeWrites.h>

src/stasis/operations.c

@@ -39,15 +39,12 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.
 ---*/
-#include <config.h>
-#include <stasis/common.h>
-
-#include <assert.h>
-
 #include <stasis/operations.h>
 #include <stasis/logger/logEntry.h>
 #include <stasis/page.h>
 
+#include <assert.h>
+
 static stasis_operation_impl stasis_operation_table[MAX_OPERATIONS];
 
 void stasis_operation_impl_register(stasis_operation_impl o) {

src/stasis/operations/arrayList.c

@@ -1,5 +1,3 @@
-#include <config.h>
-
 #include <stasis/operations/arrayList.h>
 
 #include <assert.h>

src/stasis/operations/regions.c

@@ -1,7 +1,7 @@
-#include "config.h"
 #include <stasis/page.h>
 #include <stasis/operations.h>
 #include <stasis/logger/logger2.h>
+
 #include <assert.h>
 
 typedef struct regionAllocLogArg{

src/stasis/page/slotted.c

@@ -1,4 +1,3 @@
-#include "config.h"
 #include <stasis/page.h>
 #include <stasis/page/slotted.h>
 //#include <assert.h>

src/stasis/recovery2.c

@@ -5,13 +5,6 @@
    Implements three phase recovery
 
 */
-
-#include <config.h>
-#include <stasis/common.h>
-
-#include <stdio.h>
-#include <assert.h>
-
 #include <pbl/pbl.h>
 
 #include <stasis/recovery.h>
@@ -26,6 +19,9 @@
 #include <stasis/linkedlist.h>
 #include <stasis/page.h> // Needed for pageReadLSN.
 
+#include <stdio.h>
+#include <assert.h>
+
 static pblHashTable_t * transactionLSN;
 static LinkedList * rollbackLSNs = NULL;
 /** @todo There is no real reason to have this mutex (which prevents

src/stasis/stats.c

@@ -1,4 +1,3 @@
-#include <config.h>
 #include <stasis/common.h>
 #include <stasis/latches.h>
 

src/stasis/transactional2.c

@@ -1,6 +1,3 @@
-#include <config.h>
-
-#include <stasis/common.h>
 #include <stasis/latches.h>
 #include <stasis/transactional.h>
 #include <stasis/recovery.h>

stasis/common.h

@@ -122,10 +122,6 @@ typedef int16_t pagetype_t;
 /*#define PROFILE_LATCHES*/
 /*#define NO_LATCHES */
 
-#if _POSIX_C_SOURCE >= 199309L || _XOPEN_SOURCE >= 500
-#define HAVE_FDATASYNC
-#endif
-
 #ifdef DEBUGGING
 /** @todo Files that use DEBUG have to pull in stdio.h, which is a pain! */
 #define DEBUG(...) \
@@ -162,8 +158,6 @@ typedef struct {
 */
 typedef struct Page_s Page;
 
-
-
 #include "compensations.h"
 
 #endif /* __stasis_common_h */

test/dfa/ping_pong_dfa.c

@@ -39,9 +39,6 @@ authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.
 ---*/
-
-#include <config.h>
-
 #include "../check_includes.h"
 #include <assert.h>
 #include <libdfa/networksetup.h>

test/stasis/check_multiplexer.c

@@ -46,14 +46,11 @@ terms specified in this license.
 #include <stasis/logger/logMemory.h>
 #include <pbl/pbl.h>
 
-#include <stdlib.h>
-#include <string.h>
-#include <config.h>
-#include <assert.h>
-
 #include <sys/time.h>
 #include <time.h>
 
+#include <assert.h>
+
 #define LOG_NAME   "check_iterator.log"
 
 #define NUM_BYTES_IN_FIFO 1000