Commit: 8b1b6ca38f46316944122c9a8186973556089da9 - seikananthy (git)

Anthyを正かなづかひの入力と變換に對應させるパッチの作成作業リポジトリ。<git://git.debian.org/git/collab-maint/anthy.git>のmasterブランチからフォーク。

Commit MetaInfo

• Revision: 8b1b6ca38f46316944122c9a8186973556089da9 (tree)
• Time: 2010-08-03 10:10:13
• Author: NIIBE Yutaka <gniibe@fsij...>
• Commiter: NIIBE Yutaka

Log Message

kill filemap.c, just mmap inside file_dic.c.
2010-08-03 NIIBE Yutaka <[e-mail]>

* anthy/Makefile.am (noinst_HEADERS): Removed filemap.h.
* anthy/filemap.h: Removed.

* src-diclib/Makefile.am (libdiclib_la_SOURCES): Removed

filemap.c.

* src-diclib/filemap.c: Removed.
* src-diclib/file_dic.c (struct file_dic): Directly have PTR

ans SIZE.

(anthy_mmap): Moved here (was: filemap.c).
(anthy_quit_file_dic): Call munmap directly.

* src-splitter/depgraph.c: Delete #include <anthy/filemap.h>.

Change Summary

• modified: AUTHORS
• modified: ChangeLog
• modified: anthy/Makefile.am
• delete: anthy/filemap.h
• modified: src-diclib/Makefile.am
• modified: src-diclib/file_dic.c
• delete: src-diclib/filemap.c
• modified: src-splitter/depgraph.c

Incremental Difference

--- a/AUTHORS
+++ b/AUTHORS
@@ -7,7 +7,6 @@ TABATA Yusuke: wrote
        	mkworddic/writewords.c
        	src-diclib/alloc.c
        	src-diclib/conf.c
-       	src-diclib/filemap.c
        	src-diclib/ruleparser.c
        	src-diclib/xchar.c
        	src-diclib/xstr.c

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
[phone]  NIIBE Yutaka  <[e-mail]>
+
+	* anthy/Makefile.am (noinst_HEADERS): Removed filemap.h.
+	* anthy/filemap.h: Removed.
+
+	* src-diclib/Makefile.am (libdiclib_la_SOURCES): Removed
+          filemap.c.
+	* src-diclib/filemap.c: Removed.
+	* src-diclib/file_dic.c (struct file_dic): Directly have PTR
+          ans SIZE.
+	(anthy_mmap): Moved here (was: filemap.c).
+	(anthy_quit_file_dic): Call munmap directly.
+
+	* src-splitter/depgraph.c: Delete #include <anthy/filemap.h>.
+
[phone]  NIIBE Yutaka  <[e-mail]>
+
+	* anthy/texttrie.h: Removed.
+	* anthy/Makefile.am (noinst_HEADERS): Remove texttrie.h.
+
+	* src-worddic/Makefile.am (libanthydic_la_SOURCES): Remove
+          texttrie.c.
+
+	* src-worddic/dic_util.c (anthy_private_tt_dic, find_next_key)
+        (delete_prefix, encoding_prefix, find_same_word): Removed.
+	(struct iterate_contex): Removed in_tt and key_buf.
+
+	(anthy_dic_util_init, select_first_entry_in_textdic): Don't
+	access to in_tt field.
+	(anthy_priv_dic_delete): Don't call delete_prefix.
+	(anthy_priv_dic_select_first_entry): Just call
+	select_first_entry_in_textdic.
+	(anthy_priv_dic_select_next_entry): Don't call find_next_key.
+	(anthy_priv_dic_get_index): Don't access in_tt and key_buf.
+	(anthy_priv_dic_get_freq): Just call anthy_parse_word_line.
+	(anthy_priv_dic_get_wtype, anthy_priv_dic_get_word): Don't
+	call anthy_trie_find.
+	(add_word_to_textdic): Don't call anthy_trie_delete.
+
+	* src-worddic/priv_dic.c (anthy_private_tt_dic, open_tt_dic)
+     	(copy_words_from_tt): Removed.
+	(anthy_priv_dic_update): Don't call anthy_trie_update_mapping.
+	(anthy_copy_words_from_private_dic): Don't call copy_words_from_tt.
+	(anthy_init_private_dic): Dont' call open_tt_dic and anthy_trie_close.
+	(anthy_release_private_dic): Don't call anthy_trie_close.
+
+	* src-worddic/texttrie.c: Removed.
+
+	* src-worddic/word_dic.c: Comment fix.
+
+	* src-worddic/dic_main.h (anthy_priv_dic_update): Removed.
+	* src-worddic/priv_dic.c: Likewise.
+	* src-worddic/word_dic.c (anthy_lock_dic): Don't call
+	  anthy_priv_dic_update.
+
 2010-08-02  NIIBE Yutaka  <[e-mail]>
 
 	* src-worddic/record.c (read_session): Don't change

--- a/anthy/Makefile.am
+++ b/anthy/Makefile.am
@@ -3,7 +3,6 @@ noinst_HEADERS = xstr.h xchar.h dic.h wtype.h\
  conf.h record.h alloc.h\
  ruleparser.h splitter.h \
  segment.h ordering.h \
- filemap.h \
  logger.h segclass.h \
  depgraph.h \
  textdic.h matrix.h \

--- a/anthy/filemap.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* mmapを抽象化する */
-#ifndef _filemap_h_included_
-#define _filemap_h_included_
-
-/* メモリ上にmapされたファイルのハンドル */
-struct filemapping;
-
-struct filemapping *anthy_mmap(const char *fn, int wr);
-void *anthy_mmap_address(struct filemapping *m);
-int anthy_mmap_size(struct filemapping *m);
-int anthy_mmap_is_writable(struct filemapping *m);
-void anthy_munmap(struct filemapping *m);
-
-#endif

--- a/src-diclib/Makefile.am
+++ b/src-diclib/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/ -DCONF_DIR=\"$(sysconfdir)\"
 
 libdiclib_la_SOURCES = \
 	diclib.c \
-	file_dic.c filemap.c \
+	file_dic.c \
 	xstr.c xchar.c \
 	alloc.c conf.c \
 	logger.c \

--- a/src-diclib/file_dic.c
+++ b/src-diclib/file_dic.c
@@ -1,8 +1,12 @@
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
 
 #include <anthy/diclib.h>
-#include <anthy/filemap.h>
 #include <anthy/alloc.h>
 #include <anthy/conf.h>
 #include <anthy/logger.h>
@@ -13,7 +17,8 @@
  */
 struct file_dic
 {
-  struct filemapping *mapping;
+  void *ptr;
+  size_t size;
 };
 
 static struct file_dic fdic;
@@ -22,7 +27,7 @@ void*
 anthy_file_dic_get_section(const char* section_name)
 {
   int i;
-  char* head = anthy_mmap_address(fdic.mapping);
+  char* head = (char *)fdic.ptr;
   int* p = (int*)head;
   int entry_num = anthy_dic_ntohl(*p++);
   
@@ -37,6 +42,42 @@ anthy_file_dic_get_section(const char* section_name)
   return NULL;
 }
 
+static int
+anthy_mmap (const char *fn)
+{
+  int fd;
+  void *ptr;
+  struct stat st;
+
+  fd = open (fn, O_RDONLY);
+  if (fd == -1) {
+    anthy_log(0, "Failed to open (%s).\n", fn);
+    return -1;
+  }
+
+  if (fstat(fd, &st) < 0) {
+    anthy_log(0, "Failed to stat() (%s).\n", fn);
+    close(fd);
+    return -1;
+  }
+  if (st.st_size == 0) {
+    anthy_log(0, "Failed to mmap 0size file (%s).\n", fn);
+    close(fd);
+    return -1;
+  }
+
+  ptr = mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+  close(fd);
+  if (ptr == MAP_FAILED) {
+    anthy_log(0, "Failed to mmap() (%s).\n", fn);
+    return -1;
+  }
+
+  fdic.ptr = ptr;
+  fdic.size = st.st_size;
+  return 0;
+}
+
 int
 anthy_init_file_dic(void)
 {
@@ -48,8 +89,7 @@ anthy_init_file_dic(void)
   }
 
   /* 辞書をメモリ上にmapする */
-  fdic.mapping = anthy_mmap(fn, 0);
-  if (!fdic.mapping) {
+  if (anthy_mmap (fn) < 0) {
     anthy_log(0, "failed to init file dic.\n");
     return -1;
   }
@@ -60,6 +100,6 @@ anthy_init_file_dic(void)
 void
 anthy_quit_file_dic(void)
 {
-  anthy_munmap(fdic.mapping);  
+  munmap (fdic.ptr, fdic.size);
 }
 

--- a/src-diclib/filemap.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* mmapを抽象化する
- *
- * *Unix系のシステムコールをソース中に散らさないため
- * *将来的には一つのファイルを複数の目的にmapすることも考慮
- *
- * Copyright (C) 2005 TABATA Yusuke
- *
- */
-/*
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- */
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-
-#include <anthy/filemap.h>
-#include <anthy/logger.h>
-
-struct filemapping {
-  /* 書き込みモード */
-  int wr;
-  /* mmapしたアドレス */
-  void *ptr;
-  /* mmapした領域の長さ */
-  size_t size;
-};
-
-struct filemapping *
-anthy_mmap(const char *fn, int wr)
-{
-  int fd;
-  void *ptr;
-  int r;
-  struct filemapping *m;
-  struct stat st;
-  int prot;
-  int flags;
-  mode_t mode;
-
-  if (wr) {
-    prot = PROT_READ | PROT_WRITE;
-    flags = O_RDWR;
-    mode = S_IRUSR | S_IWUSR;
-  } else {
-    prot = PROT_READ;
-    flags = O_RDONLY;
-    mode = S_IRUSR;
-  }
-
-  fd = open(fn, flags, mode);
-
-  if (fd == -1) {
-    anthy_log(0, "Failed to open (%s).\n", fn);
-    return NULL;
-  }
-
-  r = fstat(fd, &st);
-  if (r == -1) {
-    anthy_log(0, "Failed to stat() (%s).\n", fn);
-    close(fd);
-    return NULL;
-  }
-  if (st.st_size == 0) {
-    anthy_log(0, "Failed to mmap 0size file (%s).\n", fn);
-    close(fd);
-    return NULL;
-  }
-
-  ptr = mmap(NULL, st.st_size, prot, MAP_SHARED, fd, 0);
-  close(fd);
-  if (ptr == MAP_FAILED) {
-    anthy_log(0, "Failed to mmap() (%s).\n", fn);
-    return NULL;
-  }
-
-  /* mmapに成功したので情報を返す */
-  m = malloc(sizeof(struct filemapping));
-  m->size = st.st_size;
-  m->ptr = ptr;
-  m->wr = wr;
-
-  return m;
-}
-
-void *
-anthy_mmap_address(struct filemapping *m)
-{
-  if (!m) {
-    return NULL;
-  }
-  return m->ptr;
-}
-
-int
-anthy_mmap_size(struct filemapping *m)
-{
-  if (!m) {
-    return 0;
-  }
-  return m->size;
-}
-
-int
-anthy_mmap_is_writable(struct filemapping *m)
-{
-  if (!m) {
-    return 0;
-  }
-  return m->wr;
-}
-
-void
-anthy_munmap(struct filemapping *m)
-{
-  if (!m) {
-    return ;
-  }
-  munmap(m->ptr, m->size);
-  free(m);
-}

--- a/src-splitter/depgraph.c
+++ b/src-splitter/depgraph.c
@@ -29,7 +29,6 @@
 #include <anthy/conf.h>
 #include <anthy/ruleparser.h>
 #include <anthy/xstr.h>
-#include <anthy/filemap.h>
 #include <anthy/logger.h>
 #include <anthy/segclass.h>
 #include <anthy/splitter.h>