Browse Source

Move fields and pad to meet alignment constraints

pull/761/head
Colin McEwan 4 years ago
parent
commit
ff631bbbdc
3 changed files with 9 additions and 6 deletions
  1. +1
    -1
      common/JackAtomicState.h
  2. +7
    -4
      common/JackEngineControl.h
  3. +1
    -1
      common/JackTransportEngine.h

+ 1
- 1
common/JackAtomicState.h View File

@@ -93,8 +93,8 @@ class JackAtomicState

protected:

T fState[2];
volatile AtomicCounter fCounter;
T fState[2];
SInt32 fCallWriteCounter;

UInt32 WriteNextStateStartAux()


+ 7
- 4
common/JackEngineControl.h View File

@@ -48,7 +48,14 @@ class JackGraphManager;
PRE_PACKED_STRUCTURE
struct SERVER_EXPORT JackEngineControl : public JackShmMem
{
// Timer
JackFrameTimer fFrameTimer;

// Padding to align fTransport
char padding[ sizeof(UInt32) - sizeof(fFrameTimer) % sizeof(UInt32) ];
// Shared state
JackTransportEngine fTransport;
jack_nframes_t fBufferSize;
jack_nframes_t fSampleRate;
bool fSyncMode;
@@ -64,7 +71,6 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
int fClientPriority;
int fMaxClientPriority;
char fServerName[JACK_SERVER_NAME_SIZE+1];
JackTransportEngine fTransport;
jack_timer_type_t fClockSource;
int fDriverNum;
bool fVerbose;
@@ -85,9 +91,6 @@ struct SERVER_EXPORT JackEngineControl : public JackShmMem
UInt64 fComputation;
UInt64 fConstraint;

// Timer
JackFrameTimer fFrameTimer;

#ifdef JACK_MONITOR
JackEngineProfiling fProfiler;
#endif


+ 1
- 1
common/JackTransportEngine.h View File

@@ -101,10 +101,10 @@ class SERVER_EXPORT JackTransportEngine : public JackAtomicArrayState<jack_posit
jack_time_t fSyncTimeout;
int fSyncTimeLeft;
int fTimeBaseMaster;
SInt32 fWriteCounter;
bool fPendingPos;
bool fNetworkSync;
bool fConditionnal;
SInt32 fWriteCounter;

bool CheckAllRolling(JackClientInterface** table);
void MakeAllStartingLocating(JackClientInterface** table);


Loading…
Cancel
Save