1. 06 Nov, 2006 1 commit
    • Per Cederqvist's avatar
      Introduce datafile format version 3. A textstat contains · c1ef8d5b
      Per Cederqvist authored
      "generation" and "reclamation" fields.
      * src/include/kom-types.h (Text_stat): Added fields generation
      and reclamation.
      * src/server/simple-cache.c (cached_get_text): Handle text file
      generation 0 in the old-fashioned way.  Added a #warning about
      other generations.  Check return value of fseek.
      (cached_create_text): Added a #warning about nonzero generations
      of the text file.
      (cached_create_text): Initialize generation and reclamation.
      (save_one_conf): Do a file copy only if the formats of file A and
      B are the same.  Otherwise, parse the object into a temporary
      object and re-serialize it.
      (save_one_pers): Ditto.
      (save_one_text): Ditto.
      (init_cache): Handle data file format 3.
      * src/server/ram-parse.c (fparse_text_stat_3): New static function.
      (fparse_text_stat_2): Set generation and reclamation to 0.
      (fparse_text_stat_0): Ditto.
      (fparse_info): Handle data file format 3.
      (fparse_conference): Ditto.
      (fparse_person): Ditto.
      (fparse_membership): Ditto.
      (fparse_membership_list): Ditto.
      (fparse_text_stat): Ditto.
      (fparse_member): Ditto.
      * src/server/ram-output.c (foutput_info): Handle data file format 3.
      (foutput_text_stat_3): New static function.
      (foutput_person): Ditto.
      (foutput_conference): Ditto.
      (foutput_text_stat): Ditto.
      (foutput_membership): Ditto.
      (foutput_membership_list): Ditto.
      (foutput_member): Ditto.
      (foutput_conf_type): Ditto.
      * src/server/ram-io.c (output_format): Initialize it to 3.
      (dbfile_open_read): Handle data file format 3.
      * src/server/memory.c (copy_text_stat): Handle generation and
      reclamation.
      (init_text_stat): Initialize generation and reclamation.
      * src/server/membership.c (read_ranges_postcondition): Use data
      file format 3 when dumping a membership to stderr.
      * src/server/dbck.c (main): Handle data file format 3.
      * src/server/dbck-cache.c (cached_get_text): Handle text file
      generation 0 in the old-fashioned way.  Added a #warning about
      other generations.
      (cached_flush_text): Flush a generation 0 text file.  Added a
      #warning about other generations.
      (sync_output_header): Handle data file format 3.
      (cache_sync_all): Ditto.
      (init_cache): Ditto.
      * src/server/testsuite/test-l2g.c (main): Use data
      file format 3 when reading an Local2Global structure from stdin,
      or writing it to stdout.
      c1ef8d5b
  2. 20 Oct, 2006 1 commit
    • Per Cederqvist's avatar
      Wrap all file pointers that refer to the database files inside a · 554e4c59
      Per Cederqvist authored
      "struct dbfile".  Add a database version field to that struct, and
      remove the global database format variables.  This allows lyskomd
      to have files in different versions open at the same time, so that
      it can convert format X to format X+1 on the fly.  (This is more
      preparation for bug 1616.)
      * src/server/ram-io.h (struct dbfile): New struct.
      (dbfile_delete): New function.
      (set_output_format): New function.
      (dbfile_open_write): New function.
      (dbfile_open_read): New function.
      (dump_dbfile_stats): New function.
      (dbfile_ftell): The argument is now a struct dbfile*, not FILE*.
      (dbfile_getc): Ditto.
      (dbfile_ungetc): Ditto.
      * src/server/ram-io.c (output_format): Moved from ram-output.c and
      made static variable.  This defines the output format of all
      struct dbfile objects created after a change to the variable.
      (nr_dbfile_objects): New static statistics variable.
      (nr_dbfile_files): New static statistics variable.
      (dbfile_new): New static function.
      (dbfile_delete): New function.
      (set_output_format): Moved from ram-output.c.
      (get_version): Moved from simple-cache.c.  Changed return type to
      int.  The argument is an open dbfile, not a file name.  Use
      dbfile_getc() instead of getc().
      (dbfile_open_read): New function.
      (dbfile_open_write): New function.
      (dump_dbfile_stats): New function.
      (dbfile_ftell): The argument is now a struct dbfile*, not FILE*.
      (dbfile_getc): Ditto.
      (dbfile_ungetc): Ditto.
      * src/server/conference.c: Include ram-io.h, since
      local-to-global.h needs it.
      * src/server/memory.c: Ditto.
      * src/server/person.c: Ditto.
      * src/server/prot-a-output.c: Ditto.
      * src/server/text.c: Ditto.
      * src/server/membership.c: Include ram-io.h.
      (read_ranges_postcondition): Set up a dbfile wrapper around stderr
      for the report created if check_membership() fails.
      * src/server/local-to-global.h, src/server/local-to-global.c
      (l2g_read): The fp argument is now a struct dbfile*, not a FILE*.
      * src/server/dbck.c (oformat): Removed.  The format is stored
      inside the dbfile struct instead.
      (main): Report an error message if an attempt to use an undefined
      output format is detected.
      * src/server/dbck-cache.c: Change all FILE* that refer to the
      status files to struct dbfile* in all functions, and made
      appropriate changes.  Use fp->format instead of the global
      variable oformat or data_file_version.
      (get_version): Moved to ram-io.c.
      (sync_output_header): Removed the oformat argument.  Use
      fp->format instead.  All callers updated.
      (cache_sync_all): Use dbfile_open_write() instead of i_fopen(),
      and dbfile_delete() instead of i_fclose().
      (init_cache): Removed the data_file_version variable, as the
      format is now stored inside the dbfile struct.  Use
      dbfile_open_read() instead of i_fopen(), and dbfile_delete()
      instead of i_fclose().
      * doc/lyskomd.texi (Modifying Stored Types): The default database
      format is now defined in ram-io.c, and nowhere else.  It is
      preferrable if lyskomd is able to convert an old format to a new
      one after an upgrade.
      * src/server/testsuite/test-l2g.c (main): Added a dbfile wrapper
      around stdin in call to l2g_read(), and another around stderr in
      call to l2g_write().
      * src/server/testsuite/Makefile.am (test_l2g_LDADD): Include
      libeintr.a.
      * src/server/simple-cache.c: Change all FILE* that refer to the
      status files to struct dbfile* in all functions, and made
      appropriate changes.
      (pre_sync): Use dbfile_delete() instead of i_fclose(), and
      dbfile_open_write() instead of i_fopen().
      (post_sync): Use dbfile_delete() instead of i_fclose(), and
      dbfile_open_read() instead of i_fopen().
      (save_one_text): Use dbfile_delete() instead of i_fclose(), and
      dbfile_open_read() instead of i_fopen().
      (sync_part): Use dbfile_delete() instead of i_fclose().
      (init_cache): Removed local variable datafile_version; use
      fp->format instead.  Use dbfile_open_read() instead of i_fopen().
      Removed call to set_input_format(), as dbfile_open_read() does
      the same thing.
      (free_all_cache): Use dbfile_delete() instead of i_fclose().
      * src/server/ramkomd.c (dump_exit_statistics): Dump dbfile stats.
      * src/server/ram-parse.h, src/server/ram-parse.c: Change all
      FILE* that refer to the status files to struct dbfile* in all
      functions, and made appropriate changes.
      (set_input_format): Removed.
      * src/server/ram-parse.c (input_format): Removed.  All users
      changed to use fp->format instead, so that lyskomd can read files
      with different versions at the same time.
      (fparse_text_stat_2): Code cleanup.
      (fparse_text_stat_0): Use dbfile_ungetc() instead of ungetc().
      * src/server/ram-output.h, src/server/ram-output.c: Change all
      FILE* that refer to the status files to struct dbfile* in all
      functions, and made appropriate changes.
      (output_format): Moved to ram-io.c and made static.
      (set_output_format): Moved to ram-io.c.
      554e4c59
  3. 17 Oct, 2006 1 commit
    • Per Cederqvist's avatar
      Added functions wrapper functions around a few stdio functions, · d7498aeb
      Per Cederqvist authored
      and use them when accessing database files.  This is a preparatory
      step for introducing "struct dbfile", which will enable lyskomd to
      manipulate more than one database file format at the same time.
      That ability is needed for solving bug 1616.
      * src/server/ram-io.c, src/server/ram-io.h: New files.
      (dbfile_ftell): New function.
      (dbfile_getc): New function.
      (dbfile_ungetc): New function.
      * src/server/Makefile.am (libcheck_a_SOURCES): Added ram-io.c.
      (lyskomd_SOURCES): Added ram-io.h and ram-io.c.
      (DBCK): Added ram-io.h and ram-io.c.
      * src/server/simple-cache.c (read_person): Check the return value
      from fparse_set_pos().
      (read_conference): Ditto.
      (read_text_stat): Ditto.
      (write_conf): New static function.
      (save_one_conf): Use it to simplify code.
      (write_text): New static function.
      (save_one_text): Use it to simplify code.
      * src/server/ram-parse.h, src/server/ram-parse.c
      (fparse_set_pos): New function.
      * src/server/ram-output.c: Include ram-io.h.
      (foutput_space): New static function.  Use it where appropriate.
      (foutput_bool): Ditto.
      (foutput_array_start): Ditto.
      (foutput_array_end): Ditto.
      (foutput_array_nodata): Ditto.
      * src/server/ram-output.h, src/server/ram-output.c
      (foutput_atsign): New function.
      (foutput_newline): New function.
      * src/server/dbck-cache.c: Include ram-io.h.  Use dbfile_getc()
      instead of getc(), dbfile_ungetc() instead of ungetc(), and
      dbfile_ftell() instead of ftell(), when accessing the database
      file.  Use foutput_atsign and foutput_newline when appropriate.
      * src/server/local-to-global.c: Ditto.
      * src/server/ram-parse.c: Ditto.
      * src/server/simple-cache.c: Ditto.
      d7498aeb
  4. 23 Aug, 2003 1 commit
  5. 16 Aug, 2003 1 commit
  6. 29 Mar, 2002 2 commits
  7. 11 Nov, 2001 2 commits
  8. 24 May, 1999 2 commits
  9. 02 Nov, 1995 1 commit
  10. 01 Jan, 1995 2 commits
  11. 05 Apr, 1994 1 commit
  12. 22 Nov, 1993 1 commit
  13. 12 Oct, 1993 1 commit
  14. 10 Oct, 1993 1 commit
  15. 07 Oct, 1993 1 commit
  16. 16 Jan, 1993 1 commit
  17. 11 Jun, 1992 1 commit
  18. 26 Feb, 1992 1 commit
  19. 15 Sep, 1991 1 commit
  20. 04 Sep, 1991 1 commit
  21. 30 Aug, 1991 2 commits
  22. 12 Aug, 1991 1 commit