hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

let the extension area of the mar device remember the index to the session data in mar-cli.c. this prevents relocated pointer issues upon memory reallocation

Browse Source
This commit is contained in:
hyung-hwan 2021-07-24 08:43:12 +00:00
parent 435e35adfe
commit a45a99ad78
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hio/lib/mar-cli.c
View File

@ -84,9 +84,11 @@ typedef struct dev_xtn_t dev_xtn_t;
struct dev_xtn_t struct dev_xtn_t
{ {
sess_t* sess; hio_oow_t sid;
hio_svc_marc_t* svc;
}; };
#define INVALID_SID HIO_TYPE_MAX(hio_oow_t)
hio_svc_marc_t* hio_svc_marc_start (hio_t* hio, const hio_svc_marc_connect_t* ci, const hio_svc_marc_tmout_t* tmout) hio_svc_marc_t* hio_svc_marc_start (hio_t* hio, const hio_svc_marc_connect_t* ci, const hio_svc_marc_tmout_t* tmout)
{ {
@ -215,16 +217,17 @@ static int send_pending_query_if_any (sess_t* sess)
} }
/* ------------------------------------------------------------------- */ /* ------------------------------------------------------------------- */
static hio_dev_mar_t* alloc_device (hio_svc_marc_t* marc, sess_t* sess); static hio_dev_mar_t* alloc_device (hio_svc_marc_t* marc, hio_oow_t sid);
static void mar_on_disconnect (hio_dev_mar_t* dev) static void mar_on_disconnect (hio_dev_mar_t* dev)
{ {
hio_t* hio = dev->hio; hio_t* hio = dev->hio;
dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev); dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev);
sess_t* sess = xtn->sess; sess_t* sess;
if (!sess) return; /* this session data is not set if there's failure in alloc_device() */ if (xtn->sid == INVALID_SID) return; /* this session data is not set if there's failure in alloc_device() */
sess = &xtn->svc->sess.ptr[xtn->sid];
HIO_DEBUG6 (hio, "MARC(%p) - device disconnected - sid %lu session %p session-connected %d device %p device-broken %d\n", sess->svc, (unsigned long int)sess->sid, sess, (int)sess->connected, dev, (int)dev->broken); HIO_DEBUG6 (hio, "MARC(%p) - device disconnected - sid %lu session %p session-connected %d device %p device-broken %d\n", sess->svc, (unsigned long int)sess->sid, sess, (int)sess->connected, dev, (int)dev->broken);
HIO_ASSERT (hio, dev == sess->dev); HIO_ASSERT (hio, dev == sess->dev);
@ -237,7 +240,7 @@ static void mar_on_disconnect (hio_dev_mar_t* dev)
sess->connected = 0; sess->connected = 0;
dev = alloc_device(sess->svc, sess); dev = alloc_device(sess->svc, sess->sid);
if (HIO_LIKELY(dev)) if (HIO_LIKELY(dev))
{ {
sess->dev = dev; sess->dev = dev;
@ -279,8 +282,10 @@ static void mar_on_connect (hio_dev_mar_t* dev)
{ {
hio_t* hio = dev->hio; hio_t* hio = dev->hio;
dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev); dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev);
sess_t* sess = xtn->sess; sess_t* sess;
HIO_ASSERT (hio, xtn->sid != INVALID_SID);
sess = &xtn->svc->sess.ptr[xtn->sid];
HIO_DEBUG5 (hio, "MARC(%p) - device connected - sid %lu session %p device %p device-broken %d\n", sess->svc, (unsigned long int)sess->sid, sess, dev, dev->broken); HIO_DEBUG5 (hio, "MARC(%p) - device connected - sid %lu session %p device %p device-broken %d\n", sess->svc, (unsigned long int)sess->sid, sess, dev, dev->broken);
sess->connected = 1; sess->connected = 1;
@ -289,9 +294,14 @@ static void mar_on_connect (hio_dev_mar_t* dev)
static void mar_on_query_started (hio_dev_mar_t* dev, int mar_ret, const hio_bch_t* mar_errmsg) static void mar_on_query_started (hio_dev_mar_t* dev, int mar_ret, const hio_bch_t* mar_errmsg)
{ {
hio_t* hio = dev->hio;
dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev); dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev);
sess_t* sess = xtn->sess; sess_t* sess;
sess_qry_t* sq = get_first_session_query(sess); sess_qry_t* sq;
HIO_ASSERT (hio, xtn->sid != INVALID_SID);
sess = &xtn->svc->sess.ptr[xtn->sid];
sq = get_first_session_query(sess);
if (mar_ret) if (mar_ret)
{ {
@ -327,9 +337,14 @@ static void mar_on_query_started (hio_dev_mar_t* dev, int mar_ret, const hio_bch
static void mar_on_row_fetched (hio_dev_mar_t* dev, void* data) static void mar_on_row_fetched (hio_dev_mar_t* dev, void* data)
{ {
hio_t* hio = dev->hio;
dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev); dev_xtn_t* xtn = (dev_xtn_t*)hio_dev_mar_getxtn(dev);
sess_t* sess = xtn->sess; sess_t* sess;
sess_qry_t* sq = get_first_session_query(sess); sess_qry_t* sq;
HIO_ASSERT (hio, xtn->sid != INVALID_SID);
sess = &xtn->svc->sess.ptr[xtn->sid];
sq = get_first_session_query(sess);
sq->on_result (sess->svc, sess->sid, (data? HIO_SVC_MARC_RCODE_ROW: HIO_SVC_MARC_RCODE_DONE), data, sq->qctx); sq->on_result (sess->svc, sess->sid, (data? HIO_SVC_MARC_RCODE_ROW: HIO_SVC_MARC_RCODE_DONE), data, sq->qctx);
@ -340,7 +355,7 @@ static void mar_on_row_fetched (hio_dev_mar_t* dev, void* data)
} }
} }
static hio_dev_mar_t* alloc_device (hio_svc_marc_t* marc, sess_t* sess) static hio_dev_mar_t* alloc_device (hio_svc_marc_t* marc, hio_oow_t sid)
{ {
hio_t* hio = (hio_t*)marc->hio; hio_t* hio = (hio_t*)marc->hio;
hio_dev_mar_t* mar; hio_dev_mar_t* mar;
@ -363,11 +378,12 @@ static hio_dev_mar_t* alloc_device (hio_svc_marc_t* marc, sess_t* sess)
if (HIO_UNLIKELY(!mar)) return HIO_NULL; if (HIO_UNLIKELY(!mar)) return HIO_NULL;
xtn = (dev_xtn_t*)hio_dev_mar_getxtn(mar); xtn = (dev_xtn_t*)hio_dev_mar_getxtn(mar);
xtn->sess = sess; xtn->sid = sid;
xtn->svc = marc;
if (hio_dev_mar_connect(mar, &marc->ci) <= -1) if (hio_dev_mar_connect(mar, &marc->ci) <= -1)
{ {
xtn->sess = HIO_NULL; xtn->sid = INVALID_SID;
hio_dev_mar_halt (mar); hio_dev_mar_halt (mar);
return HIO_NULL; return HIO_NULL;
} }
@ -387,7 +403,7 @@ static sess_t* get_session (hio_svc_marc_t* marc, hio_oow_t sid)
sess_t* tmp; sess_t* tmp;
hio_oow_t newcapa, i; hio_oow_t newcapa, i;
newcapa = marc->sess.capa + 16; newcapa = marc->sess.capa + 64; /* TODO: make this configurable? */
if (newcapa <= sid) newcapa = sid + 1; if (newcapa <= sid) newcapa = sid + 1;
newcapa = HIO_ALIGN_POW2(newcapa, 16); newcapa = HIO_ALIGN_POW2(newcapa, 16);
@ -416,7 +432,7 @@ static sess_t* get_session (hio_svc_marc_t* marc, hio_oow_t sid)
sq = make_session_query(hio, HIO_SVC_MARC_QTYPE_ACTION, "", 0, HIO_NULL, 0); /* this is a place holder */ sq = make_session_query(hio, HIO_SVC_MARC_QTYPE_ACTION, "", 0, HIO_NULL, 0); /* this is a place holder */
if (HIO_UNLIKELY(!sq)) return HIO_NULL; if (HIO_UNLIKELY(!sq)) return HIO_NULL;
sess->dev = alloc_device(marc, sess); sess->dev = alloc_device(marc, sess->sid);
if (HIO_UNLIKELY(!sess->dev)) if (HIO_UNLIKELY(!sess->dev))
{ {
free_session_query (hio, sq); free_session_query (hio, sq);