Changeset 3915 for trunk

Timestamp:

Oct 24, 2014, 8:27:59 PM (11 years ago)

Author:

bird

Message:

0.6/locale.c: Rewrote the locale commiting code to not temporarily leave members with invalid NULL pointers and to prefer old string allocations if the value didn't change. Also, postpone the freeing of old locale resources till we're done comitting all. This effort is to reduce potential trouble with setlocale() being called on one thread while another is using it, however, this is not claiming to fix these kind of issues.

File:

• trunk/libc/tests/libc/smoketests/setlocale-1.c (modified) (2 diffs)

trunk/libc/tests/libc/smoketests/setlocale-1.c

@@ -61 +61 @@
 {
     char   *psz1;
+    char   *psz1Copy;
     char   *psz2;
     int     rc = 0;
@@ -66 +67 @@
     setlocale(LC_ALL, "en_US");
     psz1 = setlocale(LC_CTYPE, "de_DE");
+    psz1Copy = psz1 ? strdup(psz1) : NULL;
+
     psz2 = setlocale(LC_CTYPE, "de_DE");
-    if (psz1 && psz2 && !strcmp(psz1, psz2))
-        printf("2nd setlocale returns the same. %s errno=%d\n", psz1, errno);
+    if (psz1 == psz2 && psz2 && !strcmp(psz1Copy, psz2))
+        printf("2nd setlocale returns the same pointer, great (%s). errno=%d\n", psz1, errno);
+    else if (psz1 && psz2 && !strcmp(psz1Copy, psz2))
+    {
+#if 1 /* kLibC behaviour */
+        printf("error: 2nd setlocale returns different points, but same value (%s): %p != %p errno=%d\n",
+               psz2, psz1, psz2, errno);
+        rc++;
+#else
+        printf("2nd setlocale returns the same value. %s errno=%d\n", psz2, errno);
+#endif
+    }
     else
     {
-        printf("error: 2nd setlocale returns differntly. %s != %s errno=%d\n", psz1, psz2, errno);
+        printf("error: 2nd setlocale returns differntly. %s != %s (%p, %p) errno=%d\n", psz1, psz2, psz1, psz2, errno);
         rc++;
     }
+    free(psz1Copy);
 
     return rc;