diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2018-02-08 10:41:01 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2018-02-08 10:41:01 +0100 |
| commit | 6b414014de24dd9671e491c765c7c5535cd05d40 (patch) | |
| tree | 6653b3f2f89603678fa7fabbdcdbbd55c7427c39 /bin/tools | |
| parent | 2a383d2e9d13f5e652cb4e00ccb61558303d6f84 (diff) | |
| download | uca-6b414014de24dd9671e491c765c7c5535cd05d40.tar.gz uca-6b414014de24dd9671e491c765c7c5535cd05d40.tar.bz2 uca-6b414014de24dd9671e491c765c7c5535cd05d40.tar.xz uca-6b414014de24dd9671e491c765c7c5535cd05d40.zip | |
Raise minimum GLib version to 2.38
Diffstat (limited to 'bin/tools')
| -rw-r--r-- | bin/tools/benchmark.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bin/tools/benchmark.c b/bin/tools/benchmark.c index 99050f7..f6d7d7d 100644 --- a/bin/tools/benchmark.c +++ b/bin/tools/benchmark.c @@ -153,19 +153,19 @@ grab_frames_readout (UcaCamera *camera, gpointer buffer, guint n_frames, UcaCame static void grab_callback (gpointer data, gpointer user_data) { - static GStaticMutex mutex = G_STATIC_MUTEX_INIT; + static GMutex mutex; guint *n_acquired_frames = user_data; - g_static_mutex_lock (&mutex); + g_mutex_lock (&mutex); *n_acquired_frames += 1; - g_static_mutex_unlock (&mutex); + g_mutex_unlock (&mutex); } static guint grab_frames_async (UcaCamera *camera, gpointer buffer, guint n_frames, UcaCameraTriggerSource trigger_source, GTimer *timer) { GError *error = NULL; - volatile guint n_acquired_frames = 0; + guint n_acquired_frames = 0; g_object_set (camera, "trigger-source", trigger_source, NULL); uca_camera_set_grab_func (camera, grab_callback, &n_acquired_frames); @@ -363,8 +363,6 @@ main (int argc, char *argv[]) g_io_channel_shutdown (log_channel, TRUE, &error); g_assert_no_error (error); - -cleanup_camera: g_object_unref (camera); cleanup_manager: |