Changeset 30598 in vbox

Timestamp:

Jul 5, 2010 10:23:45 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63323

Message:

crOpenGL: enable new tracking code for solaris

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/load.c (modified) (1 diff)
• Additions/common/crOpenGL/stub.h (modified) (1 diff)
• GuestHost/OpenGL/util/process.c (modified) (3 diffs)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -994 +994 @@
 #if defined(CR_NEWWINTRACK) && !defined(WINDOWS)
     /*@todo when vm boots with compiz turned on, new code causes hang in xcb_wait_for_reply in the sync thread*/
-    if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real"))
+    if (!crStrcmp(response, "compiz") || !crStrcmp(response, "compiz_real")
+        || !crStrcmp(response, "compiz-bin"))
     {
         disable_sync = 1;

trunk/src/VBox/Additions/common/crOpenGL/stub.h

@@ -46 +46 @@
 #endif
 
-#if defined(WINDOWS) || defined(Linux)
+#if defined(WINDOWS) || defined(Linux) || defined(SunOS)
 # define CR_NEWWINTRACK
 #endif

trunk/src/VBox/GuestHost/OpenGL/util/process.c

@@ -146 +146 @@
         if (!tmp)
                 return;
-
         /* pipe output of ps to temp file */
+#ifndef SunOS
         sprintf(command, "ps > %s", tmp);
+#else
+        sprintf(command, "ps -e -o 'pid tty time comm'> %s", tmp);
+#endif
         system(command);
 
@@ -154 +157 @@
         f = fopen(tmp, "r");
         if (f) {
-                char buffer[1000], cmd[1000];
+                char buffer[1000], cmd[1000], *psz, *pname;
                 while (!feof(f)) {
                         int id;
@@ -160 +163 @@
                         sscanf(buffer, "%d %*s %*s %999s", &id, cmd);
                         if (id == pid) {
-                                crStrncpy(name, cmd, maxLen);
+                                for (pname=psz=&cmd[0]; *psz!=0; psz++)
+                                {
+                                        switch (*psz)
+                                        {
+                                                case '/':
+                                                pname = psz+1;
+                                                break;
+                                        }
+                                }
+                                crStrncpy(name, pname, maxLen);
                                 break;
                         }