Permalink
Browse files

Merge branch 'lukas/erts/bucket_mask_fix/OTP-10374' into maint

* lukas/erts/bucket_mask_fix/OTP-10374:
  Add comment about eproviderfailedinit error
  Increase sbct for win64 as block alignment is 16
  • Loading branch information...
2 parents ab151d0 + df013a7 commit f667680342e7fba3b5c8316f73a872147d502e01 @garazdawi garazdawi committed Oct 9, 2012
Showing with 10 additions and 1 deletion.
  1. +1 −0 erts/emulator/beam/erl_posix_str.c
  2. +9 −1 erts/emulator/test/alloc_SUITE_data/bucket_mask.c
@@ -619,6 +619,7 @@ erl_errno_id(error)
case WSAEINVALIDPROVIDER: return "einvalidprovider";
#endif
#ifdef WSAEPROVIDERFAILEDINIT
+ /* You could get this if SYSTEMROOT env variable is set incorrectly */
case WSAEPROVIDERFAILEDINIT: return "eproviderfailedinit";
#endif
#ifdef WSASYSCALLFAILURE
@@ -16,11 +16,19 @@
* $Id$
*/
+#include "erl_int_sizes_config.h"
+
#include "testcase_driver.h"
#include "allocator_test.h"
#include <stdio.h>
-#define SBCT (512*1024)
+#ifdef __WIN32__ && SIZEOF_VOID_P == 8
+/* Use larger threashold for win64 as block alignment
+ is 16 bytes and not 8 */
+#define SBCT ((1024*1024))
+#else
+#define SBCT ((512*1024))
+#endif
char *
testcase_name(void)

0 comments on commit f667680

Please sign in to comment.