Re: modular/release.sh issue
On 9/23/19 3:15 AM, Michel Dänzer wrote: On 2019-09-20 2:51 p.m., Martin-Éric Racine wrote: Howdy! I finally got around migrating my local Git tree to GitLab and was about to push a new release of xf86-video-geode, but ran into this issue with modular/release.sh: https://paste.debian.net/1101728/ The development files are all within my home directory, and ownership and permissions are -R to my username, so I'm not sure of what would cause these: cp: cannot create regular file '../../.INSTALL.tmp': Permission denied I think this is a harmless issue in autotools and can be ignored. This happens at some point during make distcheck, but (with xf86-video-amdgpu/ati) it works fine at another point, and the file is included in the generated tarballs. This would be from our xorg autoconf macros most likely: https://gitlab.freedesktop.org/xorg/util/macros/blob/master/xorg-macros.m4.in#L1837-1853 -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - https://blogs.oracle.com/alanc ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
RE: [EXTERNAL] - Re: [PATCH xserver 2/2] os: Add epoll-like port implementation for Solaris
On 2019-09-23 Alan Coopersmith wrote: > On 10/12/17 1:48 PM, Peter Harris wrote: > > x11perf -noop with 200 xlogos connected is slightly faster with ports: > > > >before after Operation > > -- - > > 1840.0 1920.0 (1.04) X protocol NoOperation > > Is the version you tested with a different revision of the code than what got > pushed? After finally getting Xorg to build on Solaris 11.4 with meson, I > found > that the code in git master doesn't build. (I'd never noticed before since > it's not > hooked up in autoconf, only meson.) Well, that's embarrassing. It looks like I never tested the version I sent to X.org, due to a typo in my make file. (We use neither autoconf nor meson, although we should be switching to meson soon). > The changes I needed to compile follow - tested briefly in Xnest with xev, > xterm, > & x11perf -noop without seeing any problems. These changes look good to me. Sorry about that. Peter Harris ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xserver 2/2] os: Add epoll-like port implementation for Solaris
On 10/12/17 1:48 PM, Peter Harris wrote:
x11perf -noop with 200 xlogos connected is slightly faster with ports:
before after Operation
-- -
1840.0 1920.0 (1.04) X protocol NoOperation
Is the version you tested with a different revision of the code than what
got pushed? After finally getting Xorg to build on Solaris 11.4 with meson,
I found that the code in git master doesn't build. (I'd never noticed before
since it's not hooked up in autoconf, only meson.)
The changes I needed to compile follow - tested briefly in Xnest
with xev, xterm, & x11perf -noop without seeing any problems.
-Alan Coopersmith- alan.coopersm...@oracle.com
Oracle Solaris Engineering - https://blogs.oracle.com/alanc
diff --git a/os/ospoll.c b/os/ospoll.c
index db9e73811..c68aabc87 100644
--- a/os/ospoll.c
+++ b/os/ospoll.c
@@ -40,6 +40,7 @@
#if !HAVE_OSPOLL && defined(HAVE_PORT_CREATE)
#include
+#include
#define PORT1
#define HAVE_OSPOLL 1
#endif
@@ -78,7 +79,6 @@ struct ospoll {
#endif
#if EPOLL || PORT
-#include
/* epoll-based implementation */
struct ospollfd {
@@ -468,10 +468,10 @@ epoll_mod(struct ospoll *ospoll, struct ospollfd *osfd)
{
int events = 0;
if (osfd->xevents & X_NOTIFY_READ)
-events |= EPOLLIN;
+events |= POLLIN;
if (osfd->xevents & X_NOTIFY_WRITE)
-events |= EPOLLOUT;
-port_associate(ospool->epoll_fd, PORT_SOURCE_FD, osfd->fd, events, osfd);
+events |= POLLOUT;
+port_associate(ospoll->epoll_fd, PORT_SOURCE_FD, osfd->fd, events, osfd);
}
#endif
@@ -601,9 +601,14 @@ ospoll_wait(struct ospoll *ospoll, int timeout)
#define MAX_EVENTS 256
port_event_t events[MAX_EVENTS];
uint_t nget = 1;
+timespec_t port_timeout = {
+.tv_sec = timeout / 1000,
+.tv_nsec = (timeout % 1000) * 100
+};
nready = 0;
-if (port_getn(ospoll->epoll_fd, events, MAX_EVENTS, , ) == 0)
{
+if (port_getn(ospoll->epoll_fd, events, MAX_EVENTS, , _timeout)
+== 0) {
nready = nget;
}
for (int i = 0; i < nready; i++) {
@@ -612,17 +617,18 @@ ospoll_wait(struct ospoll *ospoll, int timeout)
uint32_t revents = ev->portev_events;
int xevents = 0;
-if (revents & EPOLLIN)
+if (revents & POLLIN)
xevents |= X_NOTIFY_READ;
-if (revents & EPOLLOUT)
+if (revents & POLLOUT)
xevents |= X_NOTIFY_WRITE;
-if (revents & (~(EPOLLIN|EPOLLOUT)))
+if (revents & (~(POLLIN|POLLOUT)))
xevents |= X_NOTIFY_ERROR;
if (osfd->callback)
osfd->callback(osfd->fd, xevents, osfd->data);
-if (osfd->trigger == ospoll_trigger_level && !osfd->deleted) {
+if (osfd->trigger == ospoll_trigger_level &&
+!xorg_list_is_empty(>deleted)) {
epoll_mod(ospoll, osfd);
}
}
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
Re: modular/release.sh issue
On 2019-09-20 2:51 p.m., Martin-Éric Racine wrote: > Howdy! > > I finally got around migrating my local Git tree to GitLab and was > about to push a new release of xf86-video-geode, but ran into this > issue with modular/release.sh: > > https://paste.debian.net/1101728/ > > The development files are all within my home directory, and ownership > and permissions are -R to my username, so I'm not sure of what would > cause these: > > cp: cannot create regular file '../../.INSTALL.tmp': Permission denied I think this is a harmless issue in autotools and can be ignored. This happens at some point during make distcheck, but (with xf86-video-amdgpu/ati) it works fine at another point, and the file is included in the generated tarballs. -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
modular/release.sh issue
Howdy! I finally got around migrating my local Git tree to GitLab and was about to push a new release of xf86-video-geode, but ran into this issue with modular/release.sh: https://paste.debian.net/1101728/ The development files are all within my home directory, and ownership and permissions are -R to my username, so I'm not sure of what would cause these: cp: cannot create regular file '../../.INSTALL.tmp': Permission denied Also GPG is installed and works fine in the same chroot to sign Debian packages, so I'm not sure of why release.sh would fail at this. Can anyone help me with this? Thanks! Martin-Éric ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
