aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorJonas Karlsson <[email protected]>2014-02-21 14:01:38 +0100
committerLukas Larsson <[email protected]>2014-02-24 15:16:08 +0100
commit4a6850e522b91eb009ddd0ed9d9f542f1baf1bee (patch)
treef87fa607ccb90bb3d36020826800c2ff8946948c /erts/emulator
parentad9d36c55fb6c77ce0a6163e009313deaa2d2bb0 (diff)
downloadotp-4a6850e522b91eb009ddd0ed9d9f542f1baf1bee.tar.gz
otp-4a6850e522b91eb009ddd0ed9d9f542f1baf1bee.tar.bz2
otp-4a6850e522b91eb009ddd0ed9d9f542f1baf1bee.zip
ose: Updating event and signal API for OSE
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_driver.h6
-rw-r--r--erts/emulator/drivers/ose/ose_signal_drv.c8
-rw-r--r--erts/emulator/sys/common/erl_poll.h1
-rw-r--r--erts/emulator/sys/ose/erl_poll.c12
4 files changed, 15 insertions, 12 deletions
diff --git a/erts/emulator/beam/erl_driver.h b/erts/emulator/beam/erl_driver.h
index a15b0e17f5..5517c26ba4 100644
--- a/erts/emulator/beam/erl_driver.h
+++ b/erts/emulator/beam/erl_driver.h
@@ -682,11 +682,11 @@ EXTERN int erl_drv_getenv(char *key, char *value, size_t *value_size);
#ifdef __OSE__
typedef ErlDrvUInt ErlDrvOseEventId;
EXTERN union SIGNAL *erl_drv_ose_get_signal(ErlDrvEvent ev);
-EXTERN ErlDrvEvent erl_drv_ose_event_alloc(SIGSELECT sig,ErlDrvOseEventId id,
- ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig));
+EXTERN ErlDrvEvent erl_drv_ose_event_alloc(SIGSELECT sig, ErlDrvOseEventId handle,
+ ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig), void *extra);
EXTERN void erl_drv_ose_event_free(ErlDrvEvent ev);
EXTERN void erl_drv_ose_event_fetch(ErlDrvEvent ev, SIGSELECT *sig,
- ErlDrvOseEventId *id);
+ ErlDrvOseEventId *handle, void **extra);
#endif
#endif /* !ERL_DRIVER_TYPES_ONLY */
diff --git a/erts/emulator/drivers/ose/ose_signal_drv.c b/erts/emulator/drivers/ose/ose_signal_drv.c
index 1335bffe18..4929b53856 100644
--- a/erts/emulator/drivers/ose/ose_signal_drv.c
+++ b/erts/emulator/drivers/ose/ose_signal_drv.c
@@ -504,12 +504,12 @@ static void outputv(ErlDrvData driver_data, ErlIOVec *ev)
ctxt->perm_events[1] =
erl_drv_ose_event_alloc(ERTS_SIGNAL_OSE_DRV_ATTACH,(int)ctxt->spid,
- resolve_signal);
+ resolve_signal, NULL);
driver_select(ctxt->port,ctxt->perm_events[1],ERL_DRV_READ|ERL_DRV_USE,1);
ctxt->perm_events[0] =
erl_drv_ose_event_alloc(ERTS_SIGNAL_OSE_DRV_HUNT,(int)ctxt->spid,
- resolve_signal);
+ resolve_signal, NULL);
driver_select(ctxt->port,ctxt->perm_events[0],ERL_DRV_READ|ERL_DRV_USE,1);
start(ctxt->spid);
@@ -679,7 +679,7 @@ static void outputv(ErlDrvData driver_data, ErlIOVec *ev)
for (i = 0, j = 0; i < event_cnt || j < ctxt->event_cnt; ) {
if (ctxt->events)
- erl_drv_ose_event_fetch(ctxt->events[j],&tmp_signo,NULL);
+ erl_drv_ose_event_fetch(ctxt->events[j],&tmp_signo,NULL,NULL);
if (signo == tmp_signo) {
events[i++] = ctxt->events[j++];
@@ -687,7 +687,7 @@ static void outputv(ErlDrvData driver_data, ErlIOVec *ev)
} else if (signo < tmp_signo || !ctxt->events) {
/* New signal to select on */
events[i] = erl_drv_ose_event_alloc(signo,(int)ctxt->spid,
- resolve_signal);
+ resolve_signal, NULL);
driver_select(ctxt->port,events[i++],ERL_DRV_READ|ERL_DRV_USE,1);
EV_GET_UINT32(ev,&signo,&p,&q);
} else {
diff --git a/erts/emulator/sys/common/erl_poll.h b/erts/emulator/sys/common/erl_poll.h
index ce8dcd3f90..2f1c05f401 100644
--- a/erts/emulator/sys/common/erl_poll.h
+++ b/erts/emulator/sys/common/erl_poll.h
@@ -119,6 +119,7 @@ struct erts_sys_fd_type {
ErtsPollOseMsgList *msgs;
ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig);
ethr_mutex mtx;
+ void *extra;
};
#endif
diff --git a/erts/emulator/sys/ose/erl_poll.c b/erts/emulator/sys/ose/erl_poll.c
index 78dc275c06..ca1ed6e53a 100644
--- a/erts/emulator/sys/ose/erl_poll.c
+++ b/erts/emulator/sys/ose/erl_poll.c
@@ -547,8 +547,8 @@ int erts_poll_wait(ErtsPollSet ps,
erts_dsprintf(
dsbufp,
"erts_poll_wait() failed: found unkown signal id %d (signo %u) "
- "(curr_proc 0x%x /sender 0x%x)\n",
- fd.id, fd.signo, current_process(), sender(&sig));
+ "(curr_proc 0x%x)\n",
+ fd.id, fd.signo, current_process());
erts_send_error_to_logger_nogl(dsbufp);
timeout = 0;
ASSERT(0);
@@ -737,17 +737,17 @@ union SIGNAL *erl_drv_ose_get_signal(ErlDrvEvent drv_ev) {
ev->msgs = msg->next;
ethr_mutex_unlock(&ev->mtx);
erts_free(ERTS_ALC_T_FD_SIG_LIST,msg);
- restore(sig);
return sig;
}
}
ErlDrvEvent
erl_drv_ose_event_alloc(SIGSELECT signo, ErlDrvOseEventId id,
- ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig)) {
+ ErlDrvOseEventId (*resolve_signal)(union SIGNAL *sig), void *extra) {
struct erts_sys_fd_type *ev = erts_alloc(ERTS_ALC_T_DRV_EV,
sizeof(struct erts_sys_fd_type));
ev->signo = signo;
+ ev->extra = extra;
ev->id = id;
ev->msgs = NULL;
ev->resolve_signal = resolve_signal;
@@ -763,10 +763,12 @@ void erl_drv_ose_event_free(ErlDrvEvent drv_ev) {
}
void erl_drv_ose_event_fetch(ErlDrvEvent drv_ev, SIGSELECT *signo,
- ErlDrvOseEventId *id) {
+ ErlDrvOseEventId *id, void **extra) {
struct erts_sys_fd_type *ev = (struct erts_sys_fd_type *)drv_ev;
if (signo)
*signo = ev->signo;
+ if (extra)
+ *extra = ev->extra;
if (id)
*id = ev->id;
}