Revert "Merge branch 'feature/cancel' into develop"

This reverts commit 5e40a9f5e4478beafab0ec6fde80f09c71045c3a, reversing
changes made to 5f319a32306e81bfe6aa83ec18632570649098b5.

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index c0fcab741ab092d84ec8dfd73d1d4dbd3ee0f34d..ee3bc32b2b6b2c01432bc608f922850d95304a6e 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -214,16 +214,6 @@ void free_handler(handler* h)
        h = NULL;
 }
 
-void* cancel_reset_handler(void* h)
-{
-       handler* handle = (handler*) h;
-       sleep(2);
-       kds_s2000w_handler_recreate_session(handle);
-       reset_handler(handle);
-
-       return NULL;
-}
-
 void reset_handler(handler* h)
 {
 #ifndef NODEBUG

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 7433b9d1512420f89e084d9d2720598304089658..237cd3d4076b6b4a6880f38d795e41972053c269 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -59,7 +59,6 @@ typedef struct {
 
 handler* init_handler();
 void free_handler(handler* h);
-void* cancel_reset_handler(void* h);
 void reset_handler(handler* h);
 void kds_s2000w_handler_recreate_session(handler* h);
 void kds_s2000w_handler_open(const char* devicename, void** handle);

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 7363d279343434ea38506f4a35428f12e59dad16..2d3236ea18fcac629aeff67def7005881ec4c39f 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -3,7 +3,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
-#include <pthread.h>
 #include "config.h"
 #include "kds_s2000w_net.h"
 #include "kds_s2000w_option_descriptors.h"
@@ -163,8 +162,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        handler* h = (handler*) handle;
 
        if (h->read_info->cancel) {
-               pthread_t reset_thread;
-               pthread_create(&reset_thread, NULL, cancel_reset_handler, handle);
+               reset_handler(h);
                return SANE_STATUS_CANCELLED;
        }
 
@@ -200,8 +198,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
        handler* h = (handler*) handle;
 
        if (h->read_info->cancel) {
-               pthread_t reset_thread;
-               pthread_create(&reset_thread, NULL, cancel_reset_handler, handle);
+               reset_handler(h);
                return SANE_STATUS_CANCELLED;
        }
 
@@ -255,8 +252,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 
        // cancel
        if (h->read_info->cancel) {
-               pthread_t reset_thread;
-               pthread_create(&reset_thread, NULL, cancel_reset_handler, handle);
+               reset_handler(h);
                *length = 0;
                return SANE_STATUS_CANCELLED;
        }

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 67c7bb41b52b2fd203cdc680bc1179d9426ec1da..81fa72e96c83da30132268edd8c25cd84bfc7a28 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -24,6 +24,26 @@ void __wrap_wait_a_second()
        return;
 }
 
+void sane_kds_s2000w_net_read_cancel_test()
+{
+       handler* h = init_handler();
+       h->read_info->scan_started = 1;
+       h->read_info->cancel = 1;
+       int* length = malloc(sizeof(int));
+       *length = 0;
+
+       SANE_Status status = _sane_kds_s2000w_net_read(h, NULL, 0, length);
+
+       assert_int_equal(h->read_info->cancel, 0);
+       assert_int_equal(h->read_info->scan_started, 0);
+       assert_int_equal(status, SANE_STATUS_CANCELLED);
+
+       free(length);
+       length = NULL;
+       free_handler(h);
+       h = NULL;
+}
+
 void sane_kds_s2000w_net_read_without_data()
 {
        int length = 0;

diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
index cce2a3eb3fbc781efee5472fca0ca4885916d0e3..b306155b6d7cbc56cb5aee7a43c8e91155fdceb1 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.h
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -6,6 +6,7 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
+void sane_kds_s2000w_net_read_cancel_test();
 void sane_kds_s2000w_net_read_without_data();
 void sane_kds_s2000w_net_read_empty_image();
 void sane_kds_s2000w_net_read_without_header_test();

diff --git a/tests/kds_s2000w_net_read_tests_run.c b/tests/kds_s2000w_net_read_tests_run.c
index ba50bd4f288b61fa51217a5a72663ec943b0490d..47cef1d9e31198608883ae2e7b866f51ec6ea7da 100644 (file)
--- a/tests/kds_s2000w_net_read_tests_run.c
+++ b/tests/kds_s2000w_net_read_tests_run.c
@@ -3,6 +3,7 @@
 int main()
 {
        const struct CMUnitTest net_read_tests[] = {
+               cmocka_unit_test(sane_kds_s2000w_net_read_cancel_test),
                cmocka_unit_test(sane_kds_s2000w_net_read_without_data),
                cmocka_unit_test(sane_kds_s2000w_net_read_empty_image),
                cmocka_unit_test(sane_kds_s2000w_net_read_without_header_test),

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 338be583b4c32d171c020638750483778e903099..05f1f7bf69c1310e7c5dd2f2cfec420b75cfaa22 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -112,6 +112,21 @@ void kds_s2000w_net_get_select_fd()
        assert_int_equal(result, SANE_STATUS_UNSUPPORTED);
 }
 
+
+void sane_kds_s2000w_net_start_cancel()
+{
+       handler* h = init_handler();
+       h->read_info->cancel = 1;
+
+       SANE_Status status = _sane_kds_s2000w_net_start(h);
+
+       assert_int_equal(h->read_info->cancel, 0);
+       assert_int_equal(status, SANE_STATUS_CANCELLED);
+
+       free_handler(h);
+       h = NULL;
+}
+
 void sane_kds_s2000w_net_start(void** state)
 {
        response** response_list = (response**) *state;
@@ -513,6 +528,20 @@ void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state)
        h = NULL;
 }
 
+void sane_kds_s2000w_net_get_parameter_cancel()
+{
+       handler* h = init_handler();
+       h->read_info->cancel = 1;
+
+       SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, NULL);
+
+       assert_int_equal(h->read_info->cancel, 0);
+       assert_int_equal(status, SANE_STATUS_CANCELLED);
+
+       free_handler(h);
+       h = NULL;
+}
+
 void sane_kds_s2000w_net_cancel()
 {
        response* resp = kds_s2000w_client_response_init();

diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h
index 41fdd700c65076d89e6b047609d653fe30810b76..9a9a419b6360daf37a88fe3751d4be4d203f9d27 100644 (file)
--- a/tests/kds_s2000w_net_tests.h
+++ b/tests/kds_s2000w_net_tests.h
@@ -12,11 +12,13 @@ void kds_s2000w_net_init();
 void kds_s2000w_net_get_devices_only_remote();
 void kds_s2000w_net_set_io_mode();
 void kds_s2000w_net_get_select_fd();
+void sane_kds_s2000w_net_start_cancel();
 void sane_kds_s2000w_net_start(void** state);
 void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state);
 void sane_kds_s2000w_net_start_one_page_per_feeder(void** state);
 void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state);
 void sane_kds_s2000w_net_start_slow_two_pages_per_feeder(void** state);
+void sane_kds_s2000w_net_get_parameter_cancel();
 void sane_kds_s2000w_net_cancel();
 void sane_kds_s2000w_net_open();
 void sane_kds_s2000w_net_open_busy_device();

diff --git a/tests/kds_s2000w_net_tests_run.c b/tests/kds_s2000w_net_tests_run.c
index 816dd0849555944309368feb9dd1b8b34e888845..d41cadee0132736255c5ba6e7e3c77acd5c6c5c3 100644 (file)
--- a/tests/kds_s2000w_net_tests_run.c
+++ b/tests/kds_s2000w_net_tests_run.c
@@ -69,6 +69,8 @@ int main()
                cmocka_unit_test(kds_s2000w_net_get_devices_only_remote),
                cmocka_unit_test(kds_s2000w_net_set_io_mode),
                cmocka_unit_test(kds_s2000w_net_get_select_fd),
+               cmocka_unit_test(sane_kds_s2000w_net_start_cancel),
+               cmocka_unit_test(sane_kds_s2000w_net_get_parameter_cancel),
                cmocka_unit_test(sane_kds_s2000w_net_cancel),
                cmocka_unit_test(sane_kds_s2000w_net_open),
                cmocka_unit_test(sane_kds_s2000w_net_open_busy_device),