util: don't include fd_stat.h, fd_pod.h by default

Author: riptl

src/app/shared/fd_config_parse.c

@@ -1,4 +1,5 @@
 #include "fd_config_private.h"
+#include "../../util/pod/fd_pod.h"
 
 /* Pod query utils ****************************************************/
 

src/discof/gossip/fd_gossip_tile.c

@@ -14,6 +14,7 @@
 #include "../../flamenco/gossip/fd_gossip.h"
 #include "../../flamenco/runtime/fd_system_ids.h"
 #include "../../flamenco/runtime/fd_runtime.h"
+#include "../../util/pod/fd_pod.h"
 #include "../../util/net/fd_ip4.h"
 #include "../../util/net/fd_udp.h"
 #include "../../util/net/fd_net_headers.h"

src/flamenco/fd_flamenco_base.h

@@ -119,30 +119,6 @@ fd_acct_addr_cstr( char        cstr[ static FD_BASE58_ENCODED_32_SZ ],
   return fd_base58_encode_32( addr, NULL, cstr );
 }
 
-/* fd_pod utils */
-
-FD_FN_UNUSED static fd_pubkey_t *
-fd_pod_query_pubkey( uchar const * pod,
-                     char const *  path,
-                     fd_pubkey_t * val ) {
-
-  ulong        bufsz = 0UL;
-  void const * buf   = fd_pod_query_buf( pod, path, &bufsz );
-
-  if( FD_UNLIKELY( (!buf) | (bufsz!=sizeof(fd_pubkey_t)) ) )
-    return NULL;
-
-  memcpy( val->uc, buf, sizeof(fd_pubkey_t) );
-  return val;
-}
-
-static inline ulong
-fd_pod_insert_pubkey( uchar *             pod,
-                      char const *        path,
-                      fd_pubkey_t const * val ) {
-  return fd_pod_insert_buf( pod, path, val->uc, sizeof(fd_pubkey_t) );
-}
-
 FD_PROTOTYPES_END
 
 #endif /* HEADER_fd_src_flamenco_fd_flamenco_base_h */

src/tango/tempo/fd_tempo.c

@@ -1,4 +1,5 @@
 #include "../fd_tango.h"
+#include "../../util/math/fd_stat.h"
 
 #if FD_HAS_DOUBLE
 
@@ -24,10 +25,10 @@ fd_tempo_wallclock_model( double * opt_tau ) {
        jitter. */
 
     ulong iter = 0UL;
-    for(;;) { 
+    for(;;) {
 #     define TRIAL_CNT 512UL
 #     define TRIM_CNT  64UL
-      double trial[ TRIAL_CNT ]; 
+      double trial[ TRIAL_CNT ];
       for( ulong trial_idx=0UL; trial_idx<TRIAL_CNT; trial_idx++ ) {
         FD_COMPILER_MFENCE();
         long tic = fd_log_wallclock();
@@ -67,10 +68,10 @@ fd_tempo_tickcount_model( double * opt_tau ) {
     /* Same as the above but for fd_tickcount(). */
 
     ulong iter = 0UL;
-    for(;;) { 
+    for(;;) {
 #     define TRIAL_CNT 512UL
 #     define TRIM_CNT  64UL
-      double trial[ TRIAL_CNT ]; 
+      double trial[ TRIAL_CNT ];
       for( ulong trial_idx=0UL; trial_idx<TRIAL_CNT; trial_idx++ ) {
         FD_COMPILER_MFENCE();
         long tic = fd_tickcount();
@@ -131,10 +132,10 @@ fd_tempo_tick_per_ns( double * opt_sigma ) {
          well modeled as normal. */
 
       ulong iter = 0UL;
-      for(;;) { 
+      for(;;) {
   #     define TRIAL_CNT 32UL
   #     define TRIM_CNT   4UL
-        double trial[ TRIAL_CNT ]; 
+        double trial[ TRIAL_CNT ];
         for( ulong trial_idx=0UL; trial_idx<TRIAL_CNT; trial_idx++ ) {
           long then; long toc; fd_tempo_observe_pair( &then, &toc );
           fd_log_sleep( 16777216L ); /* ~16.8 ms */
@@ -199,7 +200,7 @@ fd_tempo_observe_pair( long * opt_now,
        tickcount because that is typically the lower overhead, more
        deterministic one and less likely to get jerked around behind our
        back.
-       
+
        Theoretically, this exploits how the minimum of a shifted
        exponential random variable converges.  Since the time to read
        the various clocks is expected to be reasonably modeled as a

src/util/fd_util.h

@@ -18,13 +18,13 @@
 //#include "tile/fd_tile.h"         /* includes shmem/fd_shmem.h */
 //#include "scratch/fd_scratch.h"   /* includes tile/fd_tile.h sanitize/fd_sanitize.h valloc/fd_valloc.h */
 //#include "tpool/fd_tpool.h"       /* includes tile/fd_tile.h scratch/fd_scratch.h */
-//#include "wksp/fd_wksp.h"         /* includes pod/fd_pod.h tpool/fd_tpool.h checkpt/fd_checkpt.h sanitize/fd_sanitize.h */
+//#include "wksp/fd_wksp.h"         /* tpool/fd_tpool.h checkpt/fd_checkpt.h sanitize/fd_sanitize.h */
 #include "alloc/fd_alloc.h"         /* includes wksp/fd_wksp.h valloc/fd_valloc.h */
 #include "rng/fd_rng.h"             /* includes bits/fd_bits.h */
 
 /* FIXME: Should these be optional APIs? */
 #include "sandbox/fd_sandbox.h"     /* includes fd_util_base.h */
-#include "math/fd_stat.h"           /* includes bits/fd_bits.h */
+//#include "math/fd_stat.h"         /* includes bits/fd_bits.h */
 #include "bits/fd_sat.h"            /* includes bits/fd_bits.h */
 //#include "hist/fd_histf.h"        /* includes log/fd_log.h */
 

src/util/math/test_stat.c

@@ -1,4 +1,5 @@
 #include "../fd_util.h"
+#include "../../util/math/fd_stat.h"
 
 /* This are uniform in [-0.5,+0.5] */
 

src/util/pod/fd_pod_ctl.c

@@ -1,4 +1,5 @@
 #include "../fd_util.h"
+#include "../../util/pod/fd_pod.h"
 
 #if FD_HAS_HOSTED
 

src/util/pod/test_pod.c

@@ -1,4 +1,5 @@
 #include "../fd_util.h"
+#include "../../util/pod/fd_pod.h"
 
 uchar mem[ 16384 ];
 

src/util/wksp/fd_wksp.h

@@ -1,7 +1,6 @@
 #ifndef HEADER_fd_src_util_wksp_fd_wksp_h
 #define HEADER_fd_src_util_wksp_fd_wksp_h
 
-#include "../pod/fd_pod.h"
 #include "../tpool/fd_tpool.h"
 #include "../checkpt/fd_checkpt.h"
 #include "../sanitize/fd_sanitize.h"

src/util/wksp/fd_wksp_helper.c

@@ -1,4 +1,5 @@
 #include "fd_wksp_private.h"
+#include "../pod/fd_pod.h"
 
 /* fd_wksp_private_{join,leave}_func are used to automagically handle
    the first join / last leave by the fd_wksp_attach / fd_wksp_detach. */