Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-slsdetector
Commits
d8ae71b0
Commit
d8ae71b0
authored
Apr 17, 2018
by
Alejandro Homs Puron
Committed by
operator for beamline
May 03, 2018
Browse files
Destroy Receiver::Port::Thread and Camera::AcqThread before other members
parent
6368a954
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/SlsDetectorCamera.h
View file @
d8ae71b0
...
...
@@ -288,7 +288,6 @@ private:
PixelDepth
m_pixel_depth
;
ImageType
m_image_type
;
bool
m_raw_mode
;
AutoPtr
<
AcqThread
>
m_acq_thread
;
State
m_state
;
double
m_new_frame_timeout
;
double
m_abort_sleep_time
;
...
...
@@ -297,6 +296,7 @@ private:
TimeRangesChangedCallback
*
m_time_ranges_cb
;
PixelDepthCPUAffinityMap
m_cpu_affinity_map
;
GlobalCPUAffinityMgr
m_global_cpu_affinity_mgr
;
AutoPtr
<
AcqThread
>
m_acq_thread
;
};
}
// namespace SlsDetector
...
...
include/SlsDetectorReceiver.h
View file @
d8ae71b0
...
...
@@ -135,8 +135,8 @@ private:
Mutex
m_mutex
;
FrameMap
::
Item
*
m_frame_map_item
;
IntList
m_bad_frame_list
;
Thread
m_thread
;
Stats
m_stats
;
Thread
m_thread
;
};
typedef
std
::
vector
<
AutoPtr
<
Port
>
>
PortList
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment