[jbossnative-commits] JBoss Native SVN: r1051 - in trunk/sight: native/os/linux and 1 other directory.

[jbossnative-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2007-09-27 03:41:01 -0400 (Thu, 27 Sep 2007)
New Revision: 1051

Modified:
   trunk/sight/java/org/jboss/sight/LibraryLoader.java
   trunk/sight/native/os/linux/service.c
Log:
Add sparc->sparcv9 translation

Modified: trunk/sight/java/org/jboss/sight/LibraryLoader.java
===================================================================
--- trunk/sight/java/org/jboss/sight/LibraryLoader.java	2007-09-27 07:05:27 UTC (rev 1050)
+++ trunk/sight/java/org/jboss/sight/LibraryLoader.java	2007-09-27 07:41:01 UTC (rev 1051)
@@ -76,6 +76,8 @@
             cpu = "parisc2";
         else if (arch.startsWith("IA64"))
             cpu = "ia64";
+        else if (arch.startsWith("sparc"))
+            cpu = "sparcv9";
         else if (arch.equals("x86_64"))
             cpu = "amd64";
         else

Modified: trunk/sight/native/os/linux/service.c
===================================================================
--- trunk/sight/native/os/linux/service.c	2007-09-27 07:05:27 UTC (rev 1050)
+++ trunk/sight/native/os/linux/service.c	2007-09-27 07:41:01 UTC (rev 1051)
@@ -163,8 +163,7 @@
     sprintf(rlpath, si->rlpath, si->what);
     if ((rd = opendir(rlpath))) {
         struct dirent *sent, sbuf;
-        int found = 0;
-        int state = SIGHT_SS_UNKNOWN;
+        int state = SIGHT_SS_DISABLED;
         while (!readdir_r(rd, &sbuf, &sent)) {
             char sname[PATH_MAX];
             char smatch[PATH_MAX];
@@ -183,18 +182,12 @@
                 /* TODO: Launch script with status param
                  * to figure out the state.
                  */
-                found = 1;
+                state = SIGHT_SS_UNKNOWN;
                 break;
             }
         }
         closedir(rd);
-        if (found) {
-            /* Populate the fields */
-            CALL_METHOD1(0000, thiz, state);
-        }
-        else {
-            CALL_METHOD1(0000, thiz, SIGHT_SS_DISABLED);
-        }
+        CALL_METHOD1(0000, thiz, state);
     }
     SIGHT_FREE_CSTRING(name);
     return APR_FROM_OS_ERROR(rc);