Hi,
I have wrote an initial API for thread support. It consist of 3 functions
extern int sanei_thread_begin( void (*start)(void *arg),
unsigned stack_size,
void *arg_list);
extern int sanei_thread_kill( int pid, int sig);
extern int sanei_thread_wait( int pid, int *stat_loc, int options);
that should replace fork(), kill() and waitpid(). They have the same parameters, except for thread_begin that require a
pointer to a function, a stack size and a pointer to data.
I have included also the patches to the Umax backend as example. There is only one problem: the call to close(fds[1]),
must be avoided when using threads. I think it could be removed also on other platforms, because file handles are
closed automatically at process exit.
I have also added reader_fds to Umax_Scanner structure, so I don't need to create another data structure, as I wrote in
the past.
If you find that changes useful, I will add them also to Mustek,Tamarack, SnapScan, Coolscan backends. Without that
changes, those backends wont work under OS/2.
I have tested the code on an Umax Astra 610S, connected to my (old!) Adaptec 1542CF.
Bye,
Yuri Dario
/*
* member of TeamOS/2 - Italy
*/
--_=_=_=IMA.BOUNDARY.EX1BDI138764=_=_=_
Content-Type: application/octet-stream; name="sanei_thread.c"
Content-Transfer-Encoding: base64
Lyogc2FuZSAtIFNjYW5uZXIgQWNjZXNzIE5vdyBFYXN5LgogICBDb3B5cmlnaHQgKEMpIDE5OTgg
WXVyaSBEYXJpbwogICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgU0FORSBwYWNrYWdlLgoKICAg
VGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFu
ZC9vcgogICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJs
aWMgTGljZW5zZSBhcwogICBwdWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlv
bjsgZWl0aGVyIHZlcnNpb24gMiBvZiB0aGUKICAgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9u
KSBhbnkgbGF0ZXIgdmVyc2lvbi4KCiAgIFRoaXMgcHJvZ3JhbSBpcyBkaXN0cmlidXRlZCBpbiB0
aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLCBidXQKICAgV0lUSE9VVCBBTlkgV0FSUkFO
VFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgogICBNRVJDSEFOVEFCSUxJ
VFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQogICBH
ZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCgogICBZb3Ugc2hvdWxkIGhh
dmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQogICBh
bG9uZyB3aXRoIHRoaXMgcHJvZ3JhbTsgaWYgbm90LCB3cml0ZSB0byB0aGUgRnJlZSBTb2Z0d2Fy
ZQogICBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUgUGxhY2UgLSBTdWl0ZSAzMzAsIEJvc3Rv
biwKICAgTUEgMDIxMTEtMTMwNywgVVNBLgoKICAgQXMgYSBzcGVjaWFsIGV4Y2VwdGlvbiwgdGhl
IGF1dGhvcnMgb2YgU0FORSBnaXZlIHBlcm1pc3Npb24gZm9yCiAgIGFkZGl0aW9uYWwgdXNlcyBv
ZiB0aGUgbGlicmFyaWVzIGNvbnRhaW5lZCBpbiB0aGlzIHJlbGVhc2Ugb2YgU0FORS4KCiAgIFRo
ZSBleGNlcHRpb24gaXMgdGhhdCwgaWYgeW91IGxpbmsgYSBTQU5FIGxpYnJhcnkgd2l0aCBvdGhl
ciBmaWxlcwogICB0byBwcm9kdWNlIGFuIGV4ZWN1dGFibGUsIHRoaXMgZG9lcyBub3QgYnkgaXRz
ZWxmIGNhdXNlIHRoZQogICByZXN1bHRpbmcgZXhlY3V0YWJsZSB0byBiZSBjb3ZlcmVkIGJ5IHRo
ZSBHTlUgR2VuZXJhbCBQdWJsaWMKICAgTGljZW5zZS4gIFlvdXIgdXNlIG9mIHRoYXQgZXhlY3V0
YWJsZSBpcyBpbiBubyB3YXkgcmVzdHJpY3RlZCBvbgogICBhY2NvdW50IG9mIGxpbmtpbmcgdGhl
IFNBTkUgbGlicmFyeSBjb2RlIGludG8gaXQuCgogICBUaGlzIGV4Y2VwdGlvbiBkb2VzIG5vdCwg
aG93ZXZlciwgaW52YWxpZGF0ZSBhbnkgb3RoZXIgcmVhc29ucyB3aHkKICAgdGhlIGV4ZWN1dGFi
bGUgZmlsZSBtaWdodCBiZSBjb3ZlcmVkIGJ5IHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMKICAgTGlj
ZW5zZS4KCiAgIElmIHlvdSBzdWJtaXQgY2hhbmdlcyB0byBTQU5FIHRvIHRoZSBtYWludGFpbmVy
cyB0byBiZSBpbmNsdWRlZCBpbgogICBhIHN1YnNlcXVlbnQgcmVsZWFzZSwgeW91IGFncmVlIGJ5
IHN1Ym1pdHRpbmcgdGhlIGNoYW5nZXMgdGhhdAogICB0aG9zZSBjaGFuZ2VzIG1heSBiZSBkaXN0
cmlidXRlZCB3aXRoIHRoaXMgZXhjZXB0aW9uIGludGFjdC4KCiAgIElmIHlvdSB3cml0ZSBtb2Rp
ZmljYXRpb25zIG9mIHlvdXIgb3duIGZvciBTQU5FLCBpdCBpcyB5b3VyIGNob2ljZQogICB3aGV0
aGVyIHRvIHBlcm1pdCB0aGlzIGV4Y2VwdGlvbiB0byBhcHBseSB0byB5b3VyIG1vZGlmaWNhdGlv
bnMuCiAgIElmIHlvdSBkbyBub3Qgd2lzaCB0aGF0LCBkZWxldGUgdGhpcyBleGNlcHRpb24gbm90
aWNlLiAgKi8KCiNpbmNsdWRlIDxzYW5lL2NvbmZpZy5oPgoKI2luY2x1ZGUgPHN0ZGlvLmg+CiNp
bmNsdWRlIDxzdGRsaWIuaD4KI2lmZGVmIEhBVkVfVU5JU1REX0gKIyBpbmNsdWRlIDx1bmlzdGQu
aD4KI2VuZGlmCgojaWZkZWYgX19FTVhfXwojZGVmaW5lIElOQ0xfRE9TUFJPQ0VTUwojaW5jbHVk
ZSA8b3MyLmg+CiNlbmRpZgoKI2luY2x1ZGUgPHNhbmUvc2FuZWlfdGhyZWFkLmg+CgppbnQKc2Fu
ZWlfdGhyZWFkX2JlZ2luKCB2b2lkICgqc3RhcnQpKHZvaWQgKmFyZyksIAogICAgICAgICAgICAg
ICAgICAgIHVuc2lnbmVkIHN0YWNrX3NpemUsIAogICAgICAgICAgICAgICAgICAgIHZvaWQgKmFy
Z19saXN0KQp7CiNpZmRlZiBfX0VNWF9fCiAgIHJldHVybiBfYmVnaW50aHJlYWQoIHN0YXJ0LCBO
VUxMLCBzdGFja19zaXplLCBhcmdfbGlzdCk7CiNlbHNlCiAgIHJldHVybiBmb3JrKCk7CiNlbmRp
Zgp9CgppbnQKc2FuZWlfdGhyZWFkX2tpbGwoIGludCBwaWQsIGludCBzaWcpCnsKI2lmZGVmIF9f
RU1YX18KICAgcmV0dXJuIERvc0tpbGxUaHJlYWQoIHBpZCk7CiNlbHNlCiAgIHJldHVybiBraWxs
KCBwaWQsIHNpZyk7CiNlbmRpZgp9CgppbnQKc2FuZWlfdGhyZWFkX3dhaXQoIGludCBwaWQsIGlu
dCAqc3RhdF9sb2MsIGludCBvcHRpb25zKQp7CiNpZmRlZiBfX0VNWF9fCiAgIHJldHVybiAwOyAv
KiBEb3NXYWl0VGhyZWFkKCAoVElEKikgJnBpZCwgRENXV19XQUlUKTsqLwojZWxzZQogICByZXR1
cm4gd2FpdHBpZCggcGlkLCBzaWcpOwojZW5kaWYKfQoK
--_=_=_=IMA.BOUNDARY.EX1BDI138764=_=_=_
Content-Type: application/octet-stream; name="sanei_thread.h"
Content-Transfer-Encoding: base64
Lyogc2FuZSAtIFNjYW5uZXIgQWNjZXNzIE5vdyBFYXN5LgogICBDb3B5cmlnaHQgKEMpIDE5OTgg
WXVyaSBEYXJpbwogICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgU0FORSBwYWNrYWdlLgoKICAg
U0FORSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9k
aWZ5IGl0IHVuZGVyCiAgIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu
c2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlCiAgIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhl
ciB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyCiAgIG9wdGlvbikgYW55IGxh
dGVyIHZlcnNpb24uCgogICBTQU5FIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQg
d2lsbCBiZSB1c2VmdWwsIGJ1dCBXSVRIT1VUCiAgIEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVu
IHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mIE1FUkNIQU5UQUJJTElUWSBvcgogICBGSVRORVNTIEZP
UiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vu
c2UKICAgZm9yIG1vcmUgZGV0YWlscy4KCiAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNv
cHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCiAgIGFsb25nIHdpdGggc2FuZTsg
c2VlIHRoZSBmaWxlIENPUFlJTkcuICBJZiBub3QsIHdyaXRlIHRvIHRoZSBGcmVlCiAgIFNvZnR3
YXJlIEZvdW5kYXRpb24sIEluYy4sIDY3NSBNYXNzIEF2ZSwgQ2FtYnJpZGdlLCBNQSAwMjEzOSwg
VVNBLgoKICAgVGhpcyBmaWxlIGRlY2xhcmVzIFNBTkUgYXBwbGljYXRpb24gaW50ZXJmYWNlLiAg
U2VlIHRoZSBTQU5FCiAgIHN0YW5kYXJkIGZvciBhIGRldGFpbGVkIGV4cGxhbmF0aW9uIG9mIHRo
ZSBpbnRlcmZhY2UuICAqLwogICAKI2lmbmRlZiBzYW5laV90aHJlYWRfaAojZGVmaW5lIHNhbmVp
X3RocmVhZF9oCgpleHRlcm4gaW50IHNhbmVpX3RocmVhZF9iZWdpbiggdm9pZCAoKnN0YXJ0KSh2
b2lkICphcmcpLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHN0YWNr
X3NpemUsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAqYXJnX2xpc3QpOwpl
eHRlcm4gaW50IHNhbmVpX3RocmVhZF9raWxsKCBpbnQgcGlkLCBpbnQgc2lnKTsKZXh0ZXJuIGlu
dCBzYW5laV90aHJlYWRfd2FpdCggaW50IHBpZCwgaW50ICpzdGF0X2xvYywgaW50IG9wdGlvbnMp
OwoKI2VuZGlmIC8qIHNhbmVpX3RocmVhZF9oICovCg==
--_=_=_=IMA.BOUNDARY.EX1BDI138764=_=_=_
Content-Type: application/octet-stream; name="patch.umax"
Content-Transfer-Encoding: base64
ZGlmZiAtdSAuL3VtYXguYyAuL3VtYXguYw0KLS0tIC4vdW1heC5jCVR1ZSBKdWwgMjggMDQ6NTU6
MDYgMTk5OA0KKysrIC4vdW1heC5jCVNhdCBBdWcgIDEgMTk6Mzk6NTYgMTk5OA0KQEAgLTEzNyw2
ICsxMzcsNyBAQA0KICNpbmNsdWRlICJzYW5lL3NhbmVvcHRzLmgiDQogI2luY2x1ZGUgInNhbmUv
c2FuZWlfc2NzaS5oIg0KICNpbmNsdWRlICJzYW5lL3NhbmVpX2RlYnVnLmgiDQorI2luY2x1ZGUg
InNhbmUvc2FuZWlfdGhyZWFkLmgiDQogDQogI2luY2x1ZGUgPGFzc2VydC5oPg0KICNpbmNsdWRl
IDxtYXRoLmg+DQpAQCAtMzExNSw4ICszMTE2LDggQEANCiAgIGlmIChzY2FubmVyLT5yZWFkZXJf
cGlkID4gMCkNCiAgIHsNCiAgICAgREJHKERCR19zYW5lX2luZm8sImtpbGxpbmcgcmVhZGVyX3By
b2Nlc3NcbiIpOw0KLSAgICBraWxsKHNjYW5uZXItPnJlYWRlcl9waWQsIFNJR1RFUk0pOw0KLSAg
ICB3YWl0cGlkKHNjYW5uZXItPnJlYWRlcl9waWQsIDAsIDApOw0KKyAgICBzYW5laV90aHJlYWRf
a2lsbChzY2FubmVyLT5yZWFkZXJfcGlkLCBTSUdURVJNKTsNCisgICAgc2FuZWlfdGhyZWFkX3dh
aXQoc2Nhbm5lci0+cmVhZGVyX3BpZCwgMCwgMCk7DQogICAgIHNjYW5uZXItPnJlYWRlcl9waWQg
PSAwOw0KICAgICBEQkcoREJHX3NhbmVfaW5mbywicmVhZGVyX3Byb2Nlc3Mga2lsbGVkXG4iKTsN
CiANCkBAIC0zMjczLDYgKzMyNzQsMTggQEANCiByZXR1cm4gc3RhdHVzOw0KIH0NCiANCisvLw0K
Ky8vIHJlYWRlciB0aHJlYWQgZm9yIE9TLzI6IG5lZWQgYSB3cmFwcGVyLCBiZWNhdXNlIHRocmVh
ZHMgY2FuIGhhdmUNCisvLyBvbmx5IG9uZSBwYXJhbWV0ZXIuDQorLy8NCitzdGF0aWMgdm9pZCBv
czJfcmVhZGVyX3Byb2Nlc3MoIHZvaWQqIGRhdGEpDQorew0KKyAgIHN0cnVjdCBVbWF4X1NjYW5u
ZXIqIHNjYW5uZXIgPSAoc3RydWN0IFVtYXhfU2Nhbm5lciopIGRhdGE7DQorDQorICAgREJHKERC
R19zYW5lX3Byb2MsInJlYWRlcl9wcm9jZXNzIHRocmVhZCBzdGFydGVkXG4iKTsNCisgICByZWFk
ZXJfcHJvY2Vzcyggc2Nhbm5lciwgc2Nhbm5lci0+cmVhZGVyX2Zkcyk7DQorfQ0KKw0KIA0KIC8q
IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLSBJTklUIE9QVElPTlMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSAqLw0KIA0K
QEAgLTUyNzYsNyArNTI4OSwxMCBAQA0KICAgIHJldHVybiBTQU5FX1NUQVRVU19JT19FUlJPUjsN
CiAgIH0NCiANCi0gIHNjYW5uZXItPnJlYWRlcl9waWQgPSBmb3JrKCk7CQkJCQkgICAgIC8qIGNy
ZWF0ZSByZWFkZXIgcm91dGluZSBhcyBuZXcgcHJvY2VzcyAqLw0KKyAgICAgIC8qIGNyZWF0ZSBy
ZWFkZXIgcm91dGluZSBhcyBuZXcgcHJvY2VzcyBvciB0aHJlYWQgKi8NCisgIHNjYW5uZXItPnJl
YWRlcl9mZHMgPSBmZHNbMV07DQorICBzY2FubmVyLT5yZWFkZXJfcGlkID0gc2FuZWlfdGhyZWFk
X2JlZ2luKCBvczJfcmVhZGVyX3Byb2Nlc3MsIDY0KjEwMjQsIA0KKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgKHZvaWQqKSBzY2FubmVyKTsNCiAgIGlmIChzY2Fu
bmVyLT5yZWFkZXJfcGlkID09IDApDQogICB7CQkJCQkJCQkJLyogcmVhZGVyX3BpZCA9IDAgPT09
PiBjaGlsZCBwcm9jZXNzICovDQogICAgIHNpZ3NldF90IGlnbm9yZV9zZXQ7DQpAQCAtNTI5Myw3
ICs1MzA5LDEwIEBADQogDQogICAgIF9leGl0KHJlYWRlcl9wcm9jZXNzKHNjYW5uZXIsIGZkc1sx
XSkpOyAgIC8qIGRvbid0IHVzZSBleGl0KCkgc2luY2UgdGhhdCB3b3VsZCBydW4gdGhlIGF0ZXhp
dCgpIGhhbmRsZXJzICovDQogICB9DQorI2lmbmRlZiBIQVZFX09TMl9IDQogICBjbG9zZShmZHNb
MV0pOw0KKyNlbmRpZg0KKw0KICAgc2Nhbm5lci0+cGlwZSA9IGZkc1swXTsNCiANCiAgcmV0dXJu
IFNBTkVfU1RBVFVTX0dPT0Q7DQpkaWZmIC11IC4vdW1heC5oIC4vdW1heC5oDQotLS0gLi91bWF4
LmgJVHVlIEp1bCAyMSAwNDo1NToyMCAxOTk4DQorKysgLi91bWF4LmgJU2F0IEF1ZyAgMSAxNjo1
MDo1NiAxOTk4DQpAQCAtMzk0LDYgKzM5NCw3IEBADQogICBTQU5FX1BhcmFtZXRlcnMJCXBhcmFt
czsNCiANCiAgIHBpZF90CQkJCXJlYWRlcl9waWQ7DQorICBpbnQgIAkJCQlyZWFkZXJfZmRzOw0K
ICAgaW50CQkJCXBpcGU7DQogfSBVbWF4X1NjYW5uZXI7DQogDQo=
--_=_=_=IMA.BOUNDARY.EX1BDI138764=_=_=_--
-- Source code, list archive, and docs: http://www.mostang.com/sane/ To unsubscribe: echo unsubscribe sane-devel | mail majordomo@mostang.com