[Glibc-bsd-commits] r4588 - trunk/glibc-ports/fbtl

[Petr Salinger]

Author: ps-guest
Date: 2013-06-23 07:51:34 +0000 (Sun, 23 Jun 2013)
New Revision: 4588

Modified:
   trunk/glibc-ports/fbtl/nptl-init.c
   trunk/glibc-ports/fbtl/pthread_cond_signal.c
   trunk/glibc-ports/fbtl/pthread_getattr_np.c
   trunk/glibc-ports/fbtl/pthread_mutex_init.c
   trunk/glibc-ports/fbtl/sem_open.c
Log:
comment out unsuported features


Modified: trunk/glibc-ports/fbtl/nptl-init.c
===================================================================
--- trunk/glibc-ports/fbtl/nptl-init.c	2013-06-23 07:50:45 UTC (rev 4587)
+++ trunk/glibc-ports/fbtl/nptl-init.c	2013-06-23 07:51:34 UTC (rev 4588)
@@ -42,7 +42,9 @@
 size_t __static_tls_align_m1;
 
 #warning TODO whole file
-#if 0
+#if 1
+# define set_robust_list_not_avail() do { } while (0)
+#else
 #ifndef __ASSUME_SET_ROBUST_LIST
 /* Negative if we do not have the system call and we can use it.  */
 int __set_robust_list_avail;

Modified: trunk/glibc-ports/fbtl/pthread_cond_signal.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_cond_signal.c	2013-06-23 07:50:45 UTC (rev 4587)
+++ trunk/glibc-ports/fbtl/pthread_cond_signal.c	2013-06-23 07:51:34 UTC (rev 4588)
@@ -46,7 +46,9 @@
       /* Yes.  Mark one of them as woken.  */
       ++cond->__data.__wakeup_seq;
       ++cond->__data.__futex;
-
+      
+#warning TODO/rework
+#if 0
 #if (defined lll_futex_cmp_requeue_pi \
      && defined __ASSUME_REQUEUE_PI)
       int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
@@ -74,7 +76,7 @@
 						       &cond->__data.__lock,
 						       pshared), 0))
 	  return 0;
-
+#endif
       /* Fallback if neither of them work.  */
       lll_futex_wake (&cond->__data.__futex, 1, pshared);
     }

Modified: trunk/glibc-ports/fbtl/pthread_getattr_np.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_getattr_np.c	2013-06-23 07:50:45 UTC (rev 4587)
+++ trunk/glibc-ports/fbtl/pthread_getattr_np.c	2013-06-23 07:51:34 UTC (rev 4588)
@@ -167,8 +167,12 @@
 	      break;
 	    }
 	  cpuset = (cpu_set_t *) newp;
-
+#if 1
+#warning not yet pthread_getaffinity_np
+          ret = ENOSYS;
+#else          
 	  ret = __pthread_getaffinity_np (thread_id, size, cpuset);
+#endif	  
 	}
       /* Pick some ridiculous upper limit.  Is 8 million CPUs enough?  */
       while (ret == EINVAL && size < 1024 * 1024);

Modified: trunk/glibc-ports/fbtl/pthread_mutex_init.c
===================================================================
--- trunk/glibc-ports/fbtl/pthread_mutex_init.c	2013-06-23 07:50:45 UTC (rev 4587)
+++ trunk/glibc-ports/fbtl/pthread_mutex_init.c	2013-06-23 07:51:34 UTC (rev 4588)
@@ -89,6 +89,8 @@
   /* Copy the values from the attribute.  */
   mutex->__data.__kind = imutexattr->mutexkind & ~PTHREAD_MUTEXATTR_FLAG_BITS;
 
+#warning not supported protocols
+#if 0
   if ((imutexattr->mutexkind & PTHREAD_MUTEXATTR_FLAG_ROBUST) != 0)
     {
 #ifndef __ASSUME_SET_ROBUST_LIST
@@ -125,7 +127,7 @@
     default:
       break;
     }
-
+#endif
   /* The kernel when waking robust mutexes on exit never uses
      FUTEX_PRIVATE_FLAG FUTEX_WAKE.  */
   if ((imutexattr->mutexkind & (PTHREAD_MUTEXATTR_FLAG_PSHARED

Modified: trunk/glibc-ports/fbtl/sem_open.c
===================================================================
--- trunk/glibc-ports/fbtl/sem_open.c	2013-06-23 07:50:45 UTC (rev 4587)
+++ trunk/glibc-ports/fbtl/sem_open.c	2013-06-23 07:51:34 UTC (rev 4588)
@@ -49,13 +49,13 @@
 /* Protect the `mountpoint' variable above.  */
 pthread_once_t __namedsem_once attribute_hidden = PTHREAD_ONCE_INIT;
 
-#warning TODO - or ENOSYS
-#if 0
 /* Determine where the shmfs is mounted (if at all).  */
 void
 attribute_hidden
 __where_is_shmfs (void)
 {
+#warning TODO - or ENOSYS
+#if 0
   char buf[512];
   struct statfs f;
   struct mntent resmem;
@@ -122,6 +122,7 @@
 
   /* Close the stream.  */
   __endmntent (fp);
+#endif
 }
 
 
@@ -151,7 +152,7 @@
 /* Lock to protect the search tree.  */
 int __sem_mappings_lock attribute_hidden = LLL_LOCK_INITIALIZER;
 
-
+#if 0
 /* Search for existing mapping and if possible add the one provided.  */
 static sem_t *
 check_add_mapping (const char *name, size_t namelen, int fd, sem_t *existing)