RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Jun-2017 09:42:48
Branch: rpm-5_4 Handle: 2017062107424800
Modified files: (Branch: rpm-5_4)
rpm/rpmio rpmeio.c rpmeio.h teio.c
Log:
- rpmeio: stub in parameter setting.
Summary:
Revision Changes Path
1.1.2.9 +15 -14 rpm/rpmio/rpmeio.c
1.1.2.8 +3 -1 rpm/rpmio/rpmeio.h
1.1.2.14 +9 -1 rpm/rpmio/teio.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmeio.c
============================================================================
$ cvs diff -u -r1.1.2.8 -r1.1.2.9 rpmeio.c
--- rpm/rpmio/rpmeio.c 21 Jun 2017 07:19:42 -0000 1.1.2.8
+++ rpm/rpmio/rpmeio.c 21 Jun 2017 07:42:48 -0000 1.1.2.9
@@ -256,18 +256,6 @@
#ifdef TODO
- eio_set_max_poll_time(eio_tstamp nseconds);
- eio_set_max_poll_reqs(unsigned int nreqs);
- eio_set_min_parallel(unsigned int nthreads);
- eio_set_max_parallel(unsigned int nthreads);
- eio_set_max_idle(unsigned int nthreads);
- eio_set_idle_timeout (unsigned int seconds);
-
-unsigned nreqs = eio_nreqs();
-unsigned nready = eio_nready();
-unsigned nthreads = eio_nthreads();
-unsigned npending = eio_npending();
-
#define EIO_STACKSIZE 4096 /* default? */
eio _req *grp = eio_grp(eio_cb cb, void *data);
@@ -280,7 +268,9 @@
#endif /* TODO */
-rpmevl rpmeioStart(unsigned flags)
+rpmevl rpmeioStart(double max_poll_time, unsigned max_poll_reqs,
+ unsigned min_parallel, unsigned max_parallel,
+ unsigned max_idle, unsigned idle_timeout, unsigned flags)
{
int rc;
rpmevl evl = NULL;
@@ -311,7 +301,18 @@
SPEW("<-- %s() evl %p loop %p", __FUNCTION__, evl, evl->loop);
}
-
+ if (max_poll_time > 0.0)
+ eio_set_max_poll_time(max_poll_time);
+ if (max_poll_reqs)
+ eio_set_max_poll_reqs(max_poll_reqs);
+ if (min_parallel)
+ eio_set_min_parallel(min_parallel);
+ if (max_parallel)
+ eio_set_max_parallel(max_parallel);
+ if (max_idle)
+ eio_set_max_idle(max_idle);
+ if (idle_timeout)
+ eio_set_idle_timeout(idle_timeout);
evl->flags = flags;
evl->zlog = (_rpmeio_debug || _rpmio_debug) ? rpmzLogNew(NULL) : NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmeio.h
============================================================================
$ cvs diff -u -r1.1.2.7 -r1.1.2.8 rpmeio.h
--- rpm/rpmio/rpmeio.h 21 Jun 2017 07:19:42 -0000 1.1.2.7
+++ rpm/rpmio/rpmeio.h 21 Jun 2017 07:42:48 -0000 1.1.2.8
@@ -98,7 +98,9 @@
extern void rpmeioDumpREQ(const char *msg, eio_req * req, FILE *fp);
-rpmevl rpmeioStart(unsigned flags);
+rpmevl rpmeioStart(double max_poll_time, unsigned max_poll_reqs,
+ unsigned min_parallel, unsigned max_parallel,
+ unsigned max_idle, unsigned idle_timeout, unsigned flags);
#define RPMEVL_PIPE 0x1
void rpmeioLoop(rpmevl evl);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/teio.c
============================================================================
$ cvs diff -u -r1.1.2.13 -r1.1.2.14 teio.c
--- rpm/rpmio/teio.c 21 Jun 2017 07:19:42 -0000 1.1.2.13
+++ rpm/rpmio/teio.c 21 Jun 2017 07:42:48 -0000 1.1.2.14
@@ -158,9 +158,17 @@
static int doEIO(ARGV_t av, int ac)
{
int rc = 0;
+ double max_poll_time = 0.0;
+ unsigned max_poll_reqs = 0;
+ unsigned min_parallel = 0;
+ unsigned max_parallel = 0;
+ unsigned max_idle = 0;
+ unsigned idle_timeout = 0;
unsigned flags = 0; /* RPMEVL_PIPE */
- rpmevl evl = rpmeioStart(flags);
+ rpmevl evl = rpmeioStart(max_poll_time, max_poll_reqs,
+ min_parallel, max_parallel,
+ max_idle, idle_timeout, flags);
do {
/* avoid relative paths yourself(!) */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
