Use specially-aligned types instead of packed structs

common/JackActivationCount.h

@@ -33,7 +33,7 @@ struct JackClientControl;
 \brief Client activation counter.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 class JackActivationCount
 {
 
@@ -74,7 +74,7 @@ class JackActivationCount
             return fValue;
         }
 
-}  POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackAtomicArrayState.h

@@ -30,7 +30,7 @@ namespace Jack
 /*!
 \brief Counter for CAS
 */
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct AtomicArrayCounter
 {
     union {
@@ -68,7 +68,7 @@ struct AtomicArrayCounter
         return *this;
     }
 
-} POST_PACKED_STRUCTURE;
+};
 
 #define Counter1(e) (e).info.fLongVal
 #define GetIndex1(e, state) ((e).info.scounter.fByteVal[state])
@@ -109,7 +109,7 @@ struct AtomicArrayCounter
 
 // CHECK livelock
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 template <class T>
 class JackAtomicArrayState
 {
@@ -249,7 +249,7 @@ class JackAtomicArrayState
             WriteNextStateStopAux(state);
         }
 
-} POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackAtomicState.h

@@ -31,7 +31,7 @@ namespace Jack
 \brief Counter for CAS
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct AtomicCounter
 {
     union {
@@ -70,7 +70,7 @@ struct AtomicCounter
         return *this;
     }
 
-} POST_PACKED_STRUCTURE;
+};
 
 #define Counter(e) (e).info.fLongVal
 #define CurIndex(e) (e).info.scounter.fShortVal1
@@ -85,7 +85,7 @@ struct AtomicCounter
 
 // CHECK livelock
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 template <class T>
 class JackAtomicState
 {
@@ -254,7 +254,7 @@ class JackAtomicState
         }
         */
 
-} POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackClientControl.h

@@ -34,7 +34,7 @@ namespace Jack
 \brief Client control possibly in shared memory.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct JackClientControl : public JackShmMemAble
 {
     char fName[JACK_CLIENT_NAME_SIZE + 1];
@@ -89,7 +89,7 @@ struct JackClientControl : public JackShmMemAble
         fSessionID = uuid;
     }
 
-} POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackConnectionManager.h

@@ -36,7 +36,7 @@ struct JackClientControl;
 \brief Utility class.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 template <int SIZE>
 class JackFixedArray
 {
@@ -117,13 +117,13 @@ class JackFixedArray
             return fCounter;
         }
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Utility class.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 template <int SIZE>
 class JackFixedArray1 : public JackFixedArray<SIZE>
 {
@@ -154,13 +154,13 @@ class JackFixedArray1 : public JackFixedArray<SIZE>
             }
         }
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Utility class.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 template <int SIZE>
 class JackFixedMatrix
 {
@@ -250,13 +250,13 @@ class JackFixedMatrix
         }
 
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Utility class.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 template <int SIZE>
 class JackLoopFeedback
 {
@@ -364,13 +364,13 @@ class JackLoopFeedback
             return -1;
         }
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief For client timing measurements.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct JackClientTiming
 {
     jack_time_t fSignaledAt;
@@ -393,7 +393,7 @@ struct JackClientTiming
         fStatus = NotTriggered;
     }
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Connection manager.
@@ -407,7 +407,7 @@ struct JackClientTiming
 </UL>
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 class SERVER_EXPORT JackConnectionManager
 {
 
@@ -487,7 +487,7 @@ class SERVER_EXPORT JackConnectionManager
         int SuspendRefNum(JackClientControl* control, JackSynchro* table, JackClientTiming* timing, long time_out_usec);
         void TopologicalSort(std::vector<jack_int_t>& sorted);
 
-} POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackEngineControl.h

@@ -41,11 +41,13 @@ class JackGraphManager;
 #define JACK_ENGINE_ROLLING_COUNT 32
 #define JACK_ENGINE_ROLLING_INTERVAL 1024
 
+typedef JACK_ALIGNED_TYPE(UInt64) jack_UInt64;
+
 /*!
 \brief Engine control in shared memory.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct SERVER_EXPORT JackEngineControl : public JackShmMem
 {
     // Shared state
@@ -81,9 +83,9 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
     float fCPULoad;
 
     // For OSX thread
-    UInt64 fPeriod;
-    UInt64 fComputation;
-    UInt64 fConstraint;
+    jack_UInt64 fPeriod;
+    jack_UInt64 fComputation;
+    jack_UInt64 fConstraint;
 
     // Timer
     JackFrameTimer fFrameTimer;
@@ -182,7 +184,7 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
     void CalcCPULoad(JackClientInterface** table, JackGraphManager* manager, jack_time_t cur_cycle_begin, jack_time_t prev_cycle_end);
     void ResetRollingUsecs();
 
-} POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackEngineProfiling.h

@@ -37,7 +37,7 @@ namespace Jack
 \brief Timing stucture for a client.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct JackTimingMeasureClient
 {
     int fRefNum;
@@ -54,13 +54,13 @@ struct JackTimingMeasureClient
         fStatus((jack_client_state_t)0)
     {}
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Timing interval in the global table for a given client
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct JackTimingClientInterval
 {
     int fRefNum;
@@ -74,13 +74,13 @@ struct JackTimingClientInterval
          fEndInterval(-1)
     {}
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Timing stucture for a table of clients.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 struct JackTimingMeasure
 {
     unsigned int fAudioCycle;
@@ -96,7 +96,7 @@ struct JackTimingMeasure
         fPrevCycleEnd(0)
     {}
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief Client timing monitoring.
@@ -105,7 +105,7 @@ struct JackTimingMeasure
 class JackClientInterface;
 class JackGraphManager;
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 class SERVER_EXPORT JackEngineProfiling
 {
 
@@ -132,7 +132,7 @@ class SERVER_EXPORT JackEngineProfiling
 
         JackTimingMeasure* GetCurMeasure();
 
-} POST_PACKED_STRUCTURE;
+};
 
 } // end of namespace
 

common/JackFilters.h

@@ -38,7 +38,7 @@ namespace Jack
 
     #define MAX_SIZE 64
 
-    PRE_PACKED_STRUCTURE
+    /* Note: This class must be kept 32/64 clean! */
     struct JackFilter
     {
 
@@ -66,9 +66,9 @@ namespace Jack
             return mean / MAX_SIZE;
         }
 
-    } POST_PACKED_STRUCTURE;
+    };
 
-    PRE_PACKED_STRUCTURE
+    /* Note: This class must be kept 32/64 clean! */
     class JackDelayLockedLoop
     {
 
@@ -149,9 +149,9 @@ namespace Jack
                 return fCurrentWakeup;
             }
 
-    } POST_PACKED_STRUCTURE;
+    };
 
-    PRE_PACKED_STRUCTURE
+    /* Note: This class must be kept 32/64 clean! */
     class JackAtomicDelayLockedLoop : public JackAtomicState<JackDelayLockedLoop>
     {
          public:
@@ -215,7 +215,7 @@ namespace Jack
 
                 return res;
             }
-    } POST_PACKED_STRUCTURE;
+    };
 
 #endif
 

common/JackFrameTimer.h

@@ -32,7 +32,7 @@ namespace Jack
 \brief A structure used for time management.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 class SERVER_EXPORT JackTimer
 {
 
@@ -69,13 +69,13 @@ class SERVER_EXPORT JackTimer
             return fCurrentWakeup;
         }
 
-} POST_PACKED_STRUCTURE;
+};
 
 /*!
 \brief A class using the JackAtomicState to manage jack time.
 */
 
-PRE_PACKED_STRUCTURE
+/* Note: This class must be kept 32/64 clean! */
 class SERVER_EXPORT JackFrameTimer : public JackAtomicState<JackTimer>
 {
 
@@ -97,7 +97,7 @@ class SERVER_EXPORT JackFrameTimer : public JackAtomicState<JackTimer>
         void IncFrameTime(jack_nframes_t buffer_size, jack_time_t callback_usecs, jack_time_t period_usecs);
         void ReadFrameTime(JackTimer* timer);
 
-} POST_PACKED_STRUCTURE;
+};
 
 
 } // end of namespace