Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga at b53d5ae [master] Use "Iu" for size_t on Windows

Kouhei Sutou null+****@clear*****
Thu Oct 23 20:28:00 JST 2014

• Previous message: [Groonga-commit] groonga/grnxx at 9dd1108 [master] Update unary assignment operators of Bool.
• Next message: [Groonga-commit] groonga/grnxx at 415233e [master] Add operators to the new Int.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2014-10-23 20:28:00 +0900 (Thu, 23 Oct 2014)

  New Revision: b53d5aed2bdbfce9629e53a86b1a0df647cd78e1
  https://github.com/groonga/groonga/commit/b53d5aed2bdbfce9629e53a86b1a0df647cd78e1

  Message:
    Use "Iu" for size_t on Windows

  Modified files:
    lib/ctx.c
    lib/expr.c
    lib/groonga_in.h
    lib/ii.c
    lib/io.c

  Modified: lib/ctx.c (+7 -5)
===================================================================
--- lib/ctx.c    2014-10-22 10:14:20 +0900 (a419081)
+++ lib/ctx.c    2014-10-23 20:28:00 +0900 (98194cd)
@@ -2220,7 +2220,7 @@ grn_ctx_alloc(grn_ctx *ctx, size_t size, int flags,
     if (size > GRN_CTX_SEGMENT_SIZE) {
       uint64_t npages = (size + (grn_pagesize - 1)) / grn_pagesize;
       if (npages >= (1LL<<32)) {
-        MERR("too long request size=%zu", size);
+        MERR("too long request size=%" GRN_FMT_SIZE, size);
         goto exit;
       }
       for (i = 0, mi = ctx->impl->segs;; i++, mi++) {
@@ -2425,7 +2425,7 @@ grn_ctx_alloc_lifo(grn_ctx *ctx, size_t size,
     if (size > GRN_CTX_SEGMENT_SIZE) {
       uint64_t npages = (size + (grn_pagesize - 1)) / grn_pagesize;
       if (npages >= (1LL<<32)) {
-        MERR("too long request size=%zu", size);
+        MERR("too long request size=%" GRN_FMT_SIZE, size);
         return NULL;
       }
       for (;;) {
@@ -2614,7 +2614,7 @@ grn_malloc_default(grn_ctx *ctx, size_t size, const char* file, int line, const
       grn_alloc_info_add(res);
     } else {
       if (!(res = malloc(size))) {
-        MERR("malloc fail (%zu)=%p (%s:%d) <%d>",
+        MERR("malloc fail (%" GRN_FMT_SIZE ")=%p (%s:%d) <%d>",
              size, res, file, line, alloc_count);
       } else {
         GRN_ADD_ALLOC_COUNT(1);
@@ -2671,7 +2671,8 @@ grn_realloc_default(grn_ctx *ctx, void *ptr, size_t size, const char* file, int
   if (size) {
     if (!(res = realloc(ptr, size))) {
       if (!(res = realloc(ptr, size))) {
-        MERR("realloc fail (%p,%zu)=%p (%s:%d) <%d>", ptr, size, res, file, line, alloc_count);
+        MERR("realloc fail (%p,%" GRN_FMT_SIZE ")=%p (%s:%d) <%d>",
+             ptr, size, res, file, line, alloc_count);
         return NULL;
       }
     }
@@ -2758,7 +2759,8 @@ grn_realloc_fail(grn_ctx *ctx, void *ptr, size_t size, const char* file, int lin
   if (grn_fail_malloc_check(size, file, line, func)) {
     return grn_realloc_default(ctx, ptr, size, file, line, func);
   } else {
-    MERR("fail_realloc (%p,%zu) (%s:%d@%s) <%d>", ptr, size, file, line, func, alloc_count);
+    MERR("fail_realloc (%p,%" GRN_FMT_SIZE ") (%s:%d@%s) <%d>",
+         ptr, size, file, line, func, alloc_count);
     return NULL;
   }
 }

  Modified: lib/expr.c (+3 -1)
===================================================================
--- lib/expr.c    2014-10-22 10:14:20 +0900 (dd70ebe)
+++ lib/expr.c    2014-10-23 20:28:00 +0900 (94bbafa)
@@ -2667,7 +2667,9 @@ grn_proc_call(grn_ctx *ctx, grn_obj *proc, int nargs, grn_obj *caller)
   }                                                                     \
   if (GRN_BULK_VSIZE(var) != (sizeof(grn_obj *) + sizeof(grn_id))) {    \
     ERR(GRN_INVALID_ARGUMENT,                                           \
-        "invalid variable size: expected: %zu, actual: %zu",            \
+        "invalid variable size: "                                       \
+        "expected: %" GRN_FMT_SIZE                                      \
+        "actual: %" GRN_FMT_SIZE,                                       \
         (sizeof(grn_obj *) + sizeof(grn_id)), GRN_BULK_VSIZE(var));     \
     goto exit;                                                          \
   }                                                                     \

  Modified: lib/groonga_in.h (+8 -0)
===================================================================
--- lib/groonga_in.h    2014-10-22 10:14:20 +0900 (d7ecff2)
+++ lib/groonga_in.h    2014-10-23 20:28:00 +0900 (a0e658d)
@@ -454,6 +454,14 @@ typedef int grn_cond;
 # endif /* WIN32 */
 #endif /* HAVE_INTTYPES_H */
 
+#ifdef WIN32
+# define GRN_FMT_SIZE  "Iu"
+# define GRN_FMT_SSIZE "Id"
+#else /* WIN32 */
+# define GRN_FMT_SIZE  "zu"
+# define GRN_FMT_SSIZE "zd"
+#endif /* WIN32 */
+
 #ifdef __GNUC__
 # if (defined(__i386__) || defined(__x86_64__)) /* ATOMIC ADD */
 /*

  Modified: lib/ii.c (+5 -5)
===================================================================
--- lib/ii.c    2014-10-22 10:14:20 +0900 (5dc2038)
+++ lib/ii.c    2014-10-23 20:28:00 +0900 (9110817)
@@ -6521,7 +6521,7 @@ allocate_outbuf(grn_ctx *ctx, grn_ii_buffer *ii_buffer)
       bufsize_ = bufsize;
     }
   }
-  GRN_LOG(ctx, GRN_LOG_INFO, "flushing:%d bufsize:%zu",
+  GRN_LOG(ctx, GRN_LOG_INFO, "flushing:%d bufsize:%" GRN_FMT_SIZE,
           ii_buffer->nblocks, bufsize);
   return (uint8_t *)GRN_MALLOC(bufsize);
 }
@@ -6679,7 +6679,7 @@ grn_ii_buffer_flush(grn_ctx *ctx, grn_ii_buffer *ii_buffer)
   size_t encsize;
   uint8_t *outbuf;
   ii_buffer_block *block;
-  GRN_LOG(ctx, GRN_LOG_NOTICE, "flushing:%d npostings:%zu",
+  GRN_LOG(ctx, GRN_LOG_NOTICE, "flushing:%d npostings:%" GRN_FMT_SIZE,
           ii_buffer->nblocks, ii_buffer->block_pos);
   if (!(block = block_new(ctx, ii_buffer))) { return; }
   if (!(outbuf = allocate_outbuf(ctx, ii_buffer))) { return; }
@@ -6701,7 +6701,7 @@ grn_ii_buffer_flush(grn_ctx *ctx, grn_ii_buffer *ii_buffer)
          grn_table_size(ctx, ii_buffer->tmp_lexicon) *
          sizeof(ii_buffer_counter));
   grn_obj_close(ctx, ii_buffer->tmp_lexicon);
-  GRN_LOG(ctx, GRN_LOG_NOTICE, "flushed: %d encsize:%zu",
+  GRN_LOG(ctx, GRN_LOG_NOTICE, "flushed: %d encsize:%" GRN_FMT_SIZE,
           ii_buffer->nblocks, encsize);
   ii_buffer->tmp_lexicon = NULL;
   ii_buffer->nblocks++;
@@ -6899,7 +6899,7 @@ grn_ii_buffer_chunk_flush(grn_ctx *ctx, grn_ii_buffer *ii_buffer)
   grn_io_win io_win;
   uint32_t chunk_number;
   chunk_new(ctx, ii_buffer->ii, &chunk_number, ii_buffer->packed_len);
-  GRN_LOG(ctx, GRN_LOG_INFO, "chunk:%d, packed_len:%zu",
+  GRN_LOG(ctx, GRN_LOG_INFO, "chunk:%d, packed_len:%" GRN_FMT_SIZE,
           chunk_number, ii_buffer->packed_len);
   fake_map2(ctx, ii_buffer->ii->chunk, &io_win, ii_buffer->packed_buf,
             chunk_number, ii_buffer->packed_len);
@@ -7283,7 +7283,7 @@ grn_ii_buffer_commit(grn_ctx *ctx, grn_ii_buffer *ii_buffer)
   }
   datavec_fin(ctx, ii_buffer->data_vectors);
   GRN_LOG(ctx, GRN_LOG_NOTICE,
-          "tmpfile_size:%jd > total_chunk_size:%" GRN_FMT_INT64U,
+          "tmpfile_size:%jd > total_chunk_size:%" GRN_FMT_SIZE,
           ii_buffer->filepos, ii_buffer->total_chunk_size);
   GRN_CLOSE(ii_buffer->tmpfd);
   unlink(ii_buffer->tmpfpath);

  Modified: lib/io.c (+15 -6)
===================================================================
--- lib/io.c    2014-10-22 10:14:20 +0900 (067832e)
+++ lib/io.c    2014-10-23 20:28:00 +0900 (87761da)
@@ -1406,7 +1406,8 @@ grn_mmap(grn_ctx *ctx, HANDLE *fmo, fileinfo *fi, off_t offset, size_t length)
   if (!*fmo) { return NULL; }
   res = MapViewOfFile(*fmo, FILE_MAP_WRITE, 0, (DWORD)offset, (SIZE_T)length);
   if (!res) {
-    MERR("MapViewOfFile failed #%d <%zu>", GetLastError(), mmap_size);
+    MERR("MapViewOfFile failed #%d <%" GRN_FMT_SIZE ">",
+         GetLastError(), mmap_size);
     return NULL;
   }
   /* CRITICAL_SECTION_LEAVE(fi->cs); */
@@ -1426,12 +1427,16 @@ grn_munmap(grn_ctx *ctx, HANDLE *fmo, void *start, size_t length)
       mmap_size -= length;
     } else {
       SERR("UnmapViewOfFile");
-      GRN_LOG(ctx, GRN_LOG_ERROR, "UnmapViewOfFile(%p,%d) failed <%zu>", start, length, mmap_size);
+      GRN_LOG(ctx, GRN_LOG_ERROR,
+              "UnmapViewOfFile(%p,%d) failed <%" GRN_FMT_SIZE ">",
+              start, length, mmap_size);
       r = -1;
     }
     if (!CloseHandle(*fmo)) {
       SERR("CloseHandle");
-      GRN_LOG(ctx, GRN_LOG_ERROR, "CloseHandle(%p,%d) failed <%zu>", start, length, mmap_size);
+      GRN_LOG(ctx, GRN_LOG_ERROR,
+              "CloseHandle(%p,%d) failed <%" GRN_FMT_SIZE ">",
+              start, length, mmap_size);
     }
     *fmo = NULL;
   } else {
@@ -1549,7 +1554,8 @@ grn_mmap(grn_ctx *ctx, fileinfo *fi, off_t offset, size_t length)
   */
   res = MapViewOfFile(fi->fmo, FILE_MAP_WRITE, 0, (DWORD)offset, (SIZE_T)length);
   if (!res) {
-    MERR("MapViewOfFile failed #%d  <%zu>", GetLastError(), mmap_size);
+    MERR("MapViewOfFile failed #%d <%" GRN_FMT_SIZE ">",
+         GetLastError(), mmap_size);
     return NULL;
   }
   mmap_size += length;
@@ -1564,7 +1570,9 @@ grn_munmap(grn_ctx *ctx, void *start, size_t length)
     return 0;
   } else {
     SERR("UnmapViewOfFile");
-    GRN_LOG(ctx, GRN_LOG_ERROR, "UnmapViewOfFile(%p,%d) failed <%zu>", start, length, mmap_size);
+    GRN_LOG(ctx, GRN_LOG_ERROR,
+            "UnmapViewOfFile(%p,%d) failed <%" GRN_FMT_SIZE ">",
+            start, length, mmap_size);
     return -1;
   }
 }
@@ -1734,7 +1742,8 @@ grn_fail_mmap(grn_ctx *ctx, fileinfo *fi, off_t offset, size_t length,
   if (grn_fail_malloc_check(length, file, line, func)) {
     return grn_mmap(ctx, fi, offset, length);
   } else {
-    MERR("fail_mmap(%zu,%d,%" GRN_FMT_LLU ") (%s:%d@%s) <%zu>",
+    MERR("fail_mmap(%" GRN_FMT_SIZE ",%d,%" GRN_FMT_LLU ") "
+         "(%s:%d@%s) <%" GRN_FMT_SIZE ">",
           length, fi ? fi->fd : 0, offset, file, line, func, mmap_size);
     return NULL;
   }
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/grnxx at 9dd1108 [master] Update unary assignment operators of Bool.
• Next message: [Groonga-commit] groonga/grnxx at 415233e [master] Add operators to the new Int.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]