Re: [PATCH] Add Solaris support to DetermineClientCmd

2011-12-27 Thread Keith Packard 
On Sat, 24 Dec 2011 10:00:56 -0800, Alan Coopersmith 
alan.coopersm...@oracle.com wrote:

 Uses /proc/pid/psinfo to read command  partial arguments.

Merged.
   a28ff2c..cfc4c3d  master - master

-- 
keith.pack...@intel.com


pgpy4d0eFpRwR.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH] Add Solaris support to DetermineClientCmd

2011-12-24 Thread Alan Coopersmith 
Uses /proc/pid/psinfo to read command  partial arguments.

Moves cmdsize  argsize variables into non-Solaris #else clause
to avoid unused variable warnings.

Fixes format mismatch errors when building with DEBUG defined on
a 64-bit platform (where Mask is defined as CARD32).

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Rami Ylimäki rami.ylim...@vincit.fi
---
 os/client.c |   69 ++
 1 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/os/client.c b/os/client.c
index 4aec097..8f4707b 100644
--- a/os/client.c
+++ b/os/client.c
@@ -59,6 +59,11 @@
 #include os.h
 #include dixstruct.h
 
+#ifdef __sun
+#include errno.h
+#include procfs.h
+#endif
+
 /**
  * Try to determine a PID for a client from its connection
  * information. This should be called only once when new client has
@@ -117,8 +122,6 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 {
 char path[PATH_MAX + 1];
 int totsize = 0;
-int cmdsize = 0;
-int argsize = 0;
 int fd = 0;
 
 if (cmdname)
@@ -129,6 +132,48 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 if (pid == -1)
 return;
 
+#ifdef __sun /* Solaris */
+/* Solaris does not support /proc/pid/cmdline, but makes information
+ * similar to what ps shows available in a binary structure in the
+ * /proc/pid/psinfo file. */
+if (snprintf(path, sizeof(path), /proc/%d/psinfo, pid)  0)
+return;
+fd = open(path, O_RDONLY);
+if (fd  0)
+{
+ErrorF (Failed to open %s: %s\n, path, strerror(errno));
+return;
+}
+else
+{
+psinfo_t psinfo = { 0 };
+char *sp;
+
+totsize = read(fd, psinfo, sizeof(psinfo_t));
+close(fd);
+if (totsize = 0)
+return;
+
+/* pr_psargs is the first PRARGSZ (80) characters of the command
+ * line string - assume up to the first space is the command name,
+ * since it's not delimited.   While there is also pr_fname, that's
+ * more limited, giving only the first 16 chars of the basename of
+ * the file that was exec'ed, thus cutting off many long gnome
+ * command names, or returning isapython2.6 for all python scripts.
+ */
+psinfo.pr_psargs[PRARGSZ-1] = '\0';
+sp = strchr(psinfo.pr_psargs, ' ');
+if (sp)
+*sp++ = '\0';
+
+if (cmdname)
+*cmdname = strdup(psinfo.pr_psargs);
+
+if (cmdargs  sp)
+*cmdargs = strdup(sp);
+}
+#else /* not Solaris */
+
 /* Check if /proc/pid/cmdline exists. It's not supported on all
  * operating systems. */
 if (snprintf(path, sizeof(path), /proc/%d/cmdline, pid)  0)
@@ -146,17 +191,20 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 path[totsize - 1] = '\0';
 
 /* Contruct the process name without arguments. */
-cmdsize = strlen(path) + 1;
 if (cmdname)
 {
 *cmdname = strdup(path);
 }
 
 /* Construct the arguments for client process. */
-argsize = totsize - cmdsize;
-if (cmdargs  (argsize  0))
+if (cmdargs)
 {
-char *args = malloc(argsize);
+int cmdsize = strlen(path) + 1;
+int argsize = totsize - cmdsize;
+char *args = NULL;
+
+if (argsize  0)
+args = malloc(argsize);
 if (args)
 {
 int i = 0;
@@ -169,6 +217,7 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 *cmdargs = args;
 }
 }
+#endif
 }
 
 /**
@@ -192,9 +241,9 @@ void ReserveClientIds(struct _Client *client)
 DetermineClientCmd(client-clientIds-pid, 
client-clientIds-cmdname, client-clientIds-cmdargs);
 
 DebugF(client(%lx): Reserved pid(%d).\n,
-   client-clientAsMask, client-clientIds-pid);
+   (unsigned long) client-clientAsMask, client-clientIds-pid);
 DebugF(client(%lx): Reserved cmdname(%s) and cmdargs(%s).\n,
-   client-clientAsMask,
+   (unsigned long) client-clientAsMask,
client-clientIds-cmdname ? client-clientIds-cmdname : NULL,
client-clientIds-cmdargs ? client-clientIds-cmdargs : NULL);
 #endif /* CLIENTIDS */
@@ -216,9 +265,9 @@ void ReleaseClientIds(struct _Client *client)
 return;
 
 DebugF(client(%lx): Released pid(%d).\n,
-   client-clientAsMask, client-clientIds-pid);
+   (unsigned long) client-clientAsMask, client-clientIds-pid);
 DebugF(client(%lx): Released cmdline(%s) and cmdargs(%s).\n,
-   client-clientAsMask,
+   (unsigned long) client-clientAsMask,
client-clientIds-cmdname ? client-clientIds-cmdname : NULL,
client-clientIds-cmdargs ? client-clientIds-cmdargs : NULL);
 
-- 
1.7.3.2

___
xorg-devel@lists.x.org:

Re: [PATCH] Add Solaris support to DetermineClientCmd

2011-12-05 Thread Alan Coopersmith 

On 12/04/11 13:33, walter harms wrote:

hi alan,
to make that more readable could you make two function DetermineClientCmd() ?


I could, but I don't think it will really make it that much more readable,
just harder to maintain as we have to keep more duplicated code in sync, so
I chose not to.

--
-Alan Coopersmith-alan.coopersm...@oracle.com
 Oracle Solaris Platform Engineering: X Window System

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH] Add Solaris support to DetermineClientCmd

2011-12-04 Thread walter harms 
hi alan,
to make that more readable could you make two function DetermineClientCmd() ?

something like
#ifdef sun
#include errno.h
#include procfs.h
void DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
{

}

#else

void DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
{

}

#endif

that will it make more easy to separate this in different file if more of this 
accumulates.

just my two cents,
 wh

note: did not dive into the code only the patch.


Am 03.12.2011 07:06, schrieb Alan Coopersmith:
 Uses /proc/pid/psinfo to read command  partial arguments.
 
 Moves cmdsize  argsize variables into non-Solaris #else clause
 to avoid unused variable warnings.
 
 Fixes format mismatch errors when building with DEBUG defined on
 a 64-bit platform (where Mask is defined as CARD32).
 
 Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
 ---
  os/client.c |   56 ++--
  1 files changed, 46 insertions(+), 10 deletions(-)
 
 diff --git a/os/client.c b/os/client.c
 index 4aec097..2081587 100644
 --- a/os/client.c
 +++ b/os/client.c
 @@ -59,6 +59,11 @@
  #include os.h
  #include dixstruct.h
  
 +#ifdef __sun
 +#include errno.h
 +#include procfs.h
 +#endif
 +
  /**
   * Try to determine a PID for a client from its connection
   * information. This should be called only once when new client has
 @@ -117,8 +122,6 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
 const char **cmdargs)
  {
  char path[PATH_MAX + 1];
  int totsize = 0;
 -int cmdsize = 0;
 -int argsize = 0;
  int fd = 0;
  
  if (cmdname)
 @@ -129,6 +132,35 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
 const char **cmdargs)
  if (pid == -1)
  return;
  
 +#ifdef __sun /* Solaris */
 +/* Solaris does not support /proc/pid/cmdline, but makes information
 + * similar to what ps shows available in a binary structure in the
 + * /proc/pid/psinfo file. */
 +if (snprintf(path, sizeof(path), /proc/%d/psinfo, pid)  0)
 +return;
 +fd = open(path, O_RDONLY);
 +if (fd  0)
 +{
 +ErrorF (Failed to open %s: %s\n, path, strerror(errno));
 +return;
 +}
 +else
 +{
 +psinfo_t psinfo = { 0 };
 +
 +totsize = read(fd, psinfo, sizeof(psinfo_t));
 +close(fd);
 +if (totsize = 0)
 +return;
 +
 +if (cmdname)
 +*cmdname = strndup(psinfo.pr_fname, PRFNSZ);
 +
 +if (cmdargs)
 +*cmdargs = strndup(psinfo.pr_psargs, PRARGSZ);
 +}
 +#else /* not Solaris */
 +
  /* Check if /proc/pid/cmdline exists. It's not supported on all
   * operating systems. */
  if (snprintf(path, sizeof(path), /proc/%d/cmdline, pid)  0)
 @@ -146,17 +178,20 @@ void DetermineClientCmd(pid_t pid, const char 
 **cmdname, const char **cmdargs)
  path[totsize - 1] = '\0';
  
  /* Contruct the process name without arguments. */
 -cmdsize = strlen(path) + 1;
  if (cmdname)
  {
  *cmdname = strdup(path);
  }
  
  /* Construct the arguments for client process. */
 -argsize = totsize - cmdsize;
 -if (cmdargs  (argsize  0))
 +if (cmdargs)
  {
 -char *args = malloc(argsize);
 +int cmdsize = strlen(path) + 1;
 +int argsize = totsize - cmdsize;
 +char *args = NULL;
 +
 +if (argsize  0)
 +args = malloc(argsize);
  if (args)
  {
  int i = 0;
 @@ -169,6 +204,7 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
 const char **cmdargs)
  *cmdargs = args;
  }
  }
 +#endif
  }
  
  /**
 @@ -192,9 +228,9 @@ void ReserveClientIds(struct _Client *client)
  DetermineClientCmd(client-clientIds-pid, 
 client-clientIds-cmdname, client-clientIds-cmdargs);
  
  DebugF(client(%lx): Reserved pid(%d).\n,
 -   client-clientAsMask, client-clientIds-pid);
 +   (unsigned long) client-clientAsMask, client-clientIds-pid);
  DebugF(client(%lx): Reserved cmdname(%s) and cmdargs(%s).\n,
 -   client-clientAsMask,
 +   (unsigned long) client-clientAsMask,
 client-clientIds-cmdname ? client-clientIds-cmdname : NULL,
 client-clientIds-cmdargs ? client-clientIds-cmdargs : NULL);
  #endif /* CLIENTIDS */
 @@ -216,9 +252,9 @@ void ReleaseClientIds(struct _Client *client)
  return;
  
  DebugF(client(%lx): Released pid(%d).\n,
 -   client-clientAsMask, client-clientIds-pid);
 +   (unsigned long) client-clientAsMask, client-clientIds-pid);
  DebugF(client(%lx): Released cmdline(%s) and cmdargs(%s).\n,
 -   client-clientAsMask,
 +   (unsigned long) client-clientAsMask,
 client-clientIds-cmdname ? client-clientIds-cmdname : NULL,
 client-clientIds-cmdargs ? client-clientIds-cmdargs : NULL);

[PATCH] Add Solaris support to DetermineClientCmd

2011-12-02 Thread Alan Coopersmith 
Uses /proc/pid/psinfo to read command  partial arguments.

Moves cmdsize  argsize variables into non-Solaris #else clause
to avoid unused variable warnings.

Fixes format mismatch errors when building with DEBUG defined on
a 64-bit platform (where Mask is defined as CARD32).

Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
---
 os/client.c |   56 ++--
 1 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/os/client.c b/os/client.c
index 4aec097..2081587 100644
--- a/os/client.c
+++ b/os/client.c
@@ -59,6 +59,11 @@
 #include os.h
 #include dixstruct.h
 
+#ifdef __sun
+#include errno.h
+#include procfs.h
+#endif
+
 /**
  * Try to determine a PID for a client from its connection
  * information. This should be called only once when new client has
@@ -117,8 +122,6 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 {
 char path[PATH_MAX + 1];
 int totsize = 0;
-int cmdsize = 0;
-int argsize = 0;
 int fd = 0;
 
 if (cmdname)
@@ -129,6 +132,35 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 if (pid == -1)
 return;
 
+#ifdef __sun /* Solaris */
+/* Solaris does not support /proc/pid/cmdline, but makes information
+ * similar to what ps shows available in a binary structure in the
+ * /proc/pid/psinfo file. */
+if (snprintf(path, sizeof(path), /proc/%d/psinfo, pid)  0)
+return;
+fd = open(path, O_RDONLY);
+if (fd  0)
+{
+ErrorF (Failed to open %s: %s\n, path, strerror(errno));
+return;
+}
+else
+{
+psinfo_t psinfo = { 0 };
+
+totsize = read(fd, psinfo, sizeof(psinfo_t));
+close(fd);
+if (totsize = 0)
+return;
+
+if (cmdname)
+*cmdname = strndup(psinfo.pr_fname, PRFNSZ);
+
+if (cmdargs)
+*cmdargs = strndup(psinfo.pr_psargs, PRARGSZ);
+}
+#else /* not Solaris */
+
 /* Check if /proc/pid/cmdline exists. It's not supported on all
  * operating systems. */
 if (snprintf(path, sizeof(path), /proc/%d/cmdline, pid)  0)
@@ -146,17 +178,20 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 path[totsize - 1] = '\0';
 
 /* Contruct the process name without arguments. */
-cmdsize = strlen(path) + 1;
 if (cmdname)
 {
 *cmdname = strdup(path);
 }
 
 /* Construct the arguments for client process. */
-argsize = totsize - cmdsize;
-if (cmdargs  (argsize  0))
+if (cmdargs)
 {
-char *args = malloc(argsize);
+int cmdsize = strlen(path) + 1;
+int argsize = totsize - cmdsize;
+char *args = NULL;
+
+if (argsize  0)
+args = malloc(argsize);
 if (args)
 {
 int i = 0;
@@ -169,6 +204,7 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, 
const char **cmdargs)
 *cmdargs = args;
 }
 }
+#endif
 }
 
 /**
@@ -192,9 +228,9 @@ void ReserveClientIds(struct _Client *client)
 DetermineClientCmd(client-clientIds-pid, 
client-clientIds-cmdname, client-clientIds-cmdargs);
 
 DebugF(client(%lx): Reserved pid(%d).\n,
-   client-clientAsMask, client-clientIds-pid);
+   (unsigned long) client-clientAsMask, client-clientIds-pid);
 DebugF(client(%lx): Reserved cmdname(%s) and cmdargs(%s).\n,
-   client-clientAsMask,
+   (unsigned long) client-clientAsMask,
client-clientIds-cmdname ? client-clientIds-cmdname : NULL,
client-clientIds-cmdargs ? client-clientIds-cmdargs : NULL);
 #endif /* CLIENTIDS */
@@ -216,9 +252,9 @@ void ReleaseClientIds(struct _Client *client)
 return;
 
 DebugF(client(%lx): Released pid(%d).\n,
-   client-clientAsMask, client-clientIds-pid);
+   (unsigned long) client-clientAsMask, client-clientIds-pid);
 DebugF(client(%lx): Released cmdline(%s) and cmdargs(%s).\n,
-   client-clientAsMask,
+   (unsigned long) client-clientAsMask,
client-clientIds-cmdname ? client-clientIds-cmdname : NULL,
client-clientIds-cmdargs ? client-clientIds-cmdargs : NULL);
 
-- 
1.7.3.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel