Mercurial > hg > xemacs-beta
view lisp/package-net.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Feb 2010 20:51:18 -0600 |
parents | 44de306310b8 |
children | 308d34e9f07d |
line wrap: on
line source
;;; package-net.el --- Installation and Maintenance of XEmacs packages ;; Copyright (C) 2000 Andy Piper. ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs 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 ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not in FSF ;;; Commentary: ;; Manipulate packages for the netinstall setup utility ;; The process should be so: ;; 1. The package maintainer or release manager makes a release ;; announcement. ;; ;; 2. For a new package releases the netinstall maintainer simply ;; needs to update `ftp://ftp.xemacs.org/pub/xemacs/setup.ini'. This is ;; harder than it sounds because the file also includes information ;; about the binary releases. At the moment going to the netinstall ;; directory and typing: ;; ;; `make XEMACS=<current executable location> setup.ini' ;; ;; will do the right thing provided that: ;; ;; (a) `package-net-cygwin32-binary-size' and ;; `package-net-win32-binary-size' are set correctly. ;; ;; (b) The binary pointed to by `XEMACS' has a current ;; `package-index.LATEST.pgp' file. If you don't specify the XEMACS= ;; part then you will get whatever is current for your build tree - ;; which is probably not what you want. ;; ;; You can run `package-net-convert-index-to-ini' manually and specify ;; REMOTE but I generally found that to be inconvenient and error-prone. ;; ;; 3. For package releases that's all you need to do. For binary ;; releases you need to build both cygwin and win32 binaries and put ;; them in appropriate tarballs: This can be achieved by running ;; build-msw-release.sh ;; (require 'package-admin) (require 'package-get) ;; What path should we use from the myriad available? ;; For netinstall we just want something simple, and anyway this is only to ;; bootstrap the process. This will be: ;; <root>/setup/ for native windows ;; <root>/lib/xemacs/setup for cygwin. ;; ;;; To Do: ;; ;; 1. Package update functions should also update the installed ;; database so that running setup.exe again does not reinstall ;; packages. ;; ;; 2. Generating setup.ini should be more automatic. (defvar package-net-cygwin32-binary-size 0 "The size in bytes of the cygwin32 binary distribution.") (defvar package-net-win32-binary-size 0 "The size in bytes of the win32 binary distribution.") (defvar package-net-kit-version "" "XEmacs kitting revision, usually empty.") (defvar package-net-setup-version "1.0" "The version string of setup.") ;;;###autoload (defun package-net-setup-directory () (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32) "xemacs/setup/" "setup/")))) (defun package-net-generate-bin-ini (&optional version) "Convert the package index to ini file format in the current directory." (let ((buf (get-buffer-create "*setup-bin.ini*"))) (unwind-protect (save-excursion (set-buffer buf) (erase-buffer buf) (goto-char (point-min)) (insert "# This file is automatically generated. If you edit it, your\n") (insert "# edits will be discarded next time the file is generated.\n") (insert "#\n\n") (insert (format "setup-timestamp: %d\n" (+ (* (car (current-time)) 65536) (car (cdr (current-time)))))) (insert (format "setup-version: %s\n\n" (or version "1.0"))) ;; Native version (insert (format "@ %s\n" "xemacs-i586-pc-win32")) (insert (format "version: %s%s\n" emacs-program-version package-net-kit-version)) (insert "type: native\n") (insert (format "install: win32/%s %d\n\n" (concat emacs-program-name "-i586-pc-win32-" emacs-program-version package-net-kit-version ".tar.gz") package-net-win32-binary-size)) ;; Cygwin version (insert (format "@ %s\n" "xemacs-i686-pc-cygwin")) (insert (format "version: %s%s\n" emacs-program-version package-net-kit-version)) (insert "type: cygwin\n") (insert (format "install: cygwin32/%s %d\n\n" (concat emacs-program-name "-i686-pc-cygwin-" emacs-program-version package-net-kit-version ".tar.gz") package-net-cygwin32-binary-size)) (insert "# setup.ini file ends here\n") (write-region (point-min) (point-max) "setup-bin.ini"))) (kill-buffer buf))) (defun package-net-batch-generate-bin-ini () "Convert the package index to ini file format." (unless noninteractive (error 'invalid-operation "`package-net-batch-generate-bin-ini' is to be used only with -batch")) (package-net-generate-bin-ini package-net-setup-version)) ;;;###autoload (defun package-net-update-installed-db (&optional destdir) "Write out the installed package index in a net install suitable format. If DESTDIR is non-nil then use that as the destination directory. DESTDIR defaults to the value of `package-net-setup-directory'." (when (or (eq system-type 'cygwin32) (eq system-type 'window-nt)) (setq destdir (file-name-as-directory (or destdir (package-net-setup-directory)))) (let ((buf (get-buffer-create "*installed.db*"))) (unwind-protect (save-excursion (set-buffer buf) (erase-buffer buf) (goto-char (point-min)) ;; we use packages-package-list here as we actually want to ;; update relative to the installed reality (let ((entries packages-package-list) entry version) (while entries (setq entry (car entries)) (setq version (plist-get (cdr entry) :version)) ;; Unfortunately we can't read the size from this (insert (format "%s %s-%3.2f-pkg.tar.gz 0\n" (symbol-name (car entry)) (symbol-name (car entry)) version)) (setq entries (cdr entries)))) (make-directory-path destdir) (write-region (point-min) (point-max) (concat destdir "installed.db"))) (kill-buffer buf))))) (defun package-net-convert-download-sites-to-mirrors (&optional destdir) "Write out the download site list in a net install suitable format. If DESTDIR is non-nil then use that as the destination directory. DESTDIR defaults to the value of `data-directory'." (setq destdir (file-name-as-directory (or destdir data-directory))) (let ((buf (get-buffer-create "*mirrors.lst*"))) (unwind-protect (save-excursion (set-buffer buf) (erase-buffer buf) (goto-char (point-min)) (let ((entries package-get-download-sites) entry) (while entries (setq entry (car entries)) (insert (format "ftp://%s/%s;%s;%s\n" (nth 1 entry) (substring (nth 2 entry) 0 -9) (nth 0 entry) (nth 0 entry))) (setq entries (cdr entries)))) (write-region (point-min) (point-max) (concat destdir "mirrors.lst"))) (kill-buffer buf))))