diff --git a/lib/hcl-s.c b/lib/hcl-s.c index e4f4337..aed802a 100644 --- a/lib/hcl-s.c +++ b/lib/hcl-s.c @@ -726,8 +726,8 @@ hcl_server_proto_t* hcl_server_proto_open (hcl_oow_t xtnsize, hcl_server_worker_ vmprim.dl_open = hcl_vmprim_dl_open; vmprim.dl_close = hcl_vmprim_dl_close; vmprim.dl_getsym = hcl_vmprim_dl_getsym; - vmprim.gettime = hcl_vmprim_vm_gettime; - vmprim.sleep = hcl_vmprim_vm_sleep; + vmprim.vm_gettime = hcl_vmprim_vm_gettime; + vmprim.vm_sleep = hcl_vmprim_vm_sleep; proto = (hcl_server_proto_t*)hcl_server_allocmem(worker->server, HCL_SIZEOF(*proto)); if (!proto) return HCL_NULL; @@ -1192,7 +1192,7 @@ static int insert_exec_timer (hcl_server_proto_t* proto, const hcl_ntime_t* tmou HCL_MEMSET (&event, 0, HCL_SIZEOF(event)); event.ctx = proto; - proto->hcl->vmprim.gettime (proto->hcl, &event.when); + proto->hcl->vmprim.vm_gettime (proto->hcl, &event.when); HCL_ADD_NTIME (&event.when, &event.when, tmout); event.handler = exec_runtime_handler; event.updater = exec_runtime_updater; @@ -1591,8 +1591,8 @@ hcl_server_t* hcl_server_open (hcl_mmgr_t* mmgr, hcl_oow_t xtnsize, hcl_server_p vmprim.dl_open = hcl_vmprim_dl_open; vmprim.dl_close = hcl_vmprim_dl_close; vmprim.dl_getsym = hcl_vmprim_dl_getsym; - vmprim.gettime = hcl_vmprim_gettime; - vmprim.sleep = hcl_vmprim_sleep; + vmprim.vm_gettime = hcl_vmprim_vm_gettime; + vmprim.vm_sleep = hcl_vmprim_vm_sleep; #if defined(USE_LTDL) lt_dlinit (); @@ -1810,7 +1810,7 @@ static hcl_server_worker_t* alloc_worker (hcl_server_t* server, int cli_sck, con worker->peeraddr = *peeraddr; worker->server = server; - server->dummy_hcl->vmprim.gettime (server->dummy_hcl, &worker->alloc_time); /* TODO: the callback may return monotonic time. find a way to guarantee it is realtime??? */ + server->dummy_hcl->vmprim.vm_gettime (server->dummy_hcl, &worker->alloc_time); /* TODO: the callback may return monotonic time. find a way to guarantee it is realtime??? */ if (server->wid_map.free_first == HCL_SERVER_WID_INVALID && prepare_to_acquire_wid(server) <= -1) { diff --git a/lib/tmr.c b/lib/tmr.c index ab8de08..00c4430 100644 --- a/lib/tmr.c +++ b/lib/tmr.c @@ -247,7 +247,7 @@ int hcl_tmr_fire (hcl_tmr_t* tmr, const hcl_ntime_t* tm, hcl_oow_t* firecnt) /* if the current time is not specified, get it from the system */ if (tm) now = *tm; /*else if (hcl_gettime(&now) <= -1) return -1;*/ - tmr->hcl->vmprim.gettime (tmr->hcl, &now); + tmr->hcl->vmprim.vm_gettime (tmr->hcl, &now); while (tmr->size > 0) { @@ -274,7 +274,7 @@ int hcl_tmr_gettmout (hcl_tmr_t* tmr, const hcl_ntime_t* tm, hcl_ntime_t* tmout) /* if the current time is not specified, get it from the system */ if (tm) now = *tm; /*else if (hcl_gettime(&now) <= -1) return -1;*/ - tmr->hcl->vmprim.gettime (tmr->hcl, &now); + tmr->hcl->vmprim.vm_gettime (tmr->hcl, &now); HCL_SUB_NTIME (tmout, &tmr->event[0].when, &now); if (tmout->sec < 0) HCL_CLEAR_NTIME (tmout);