X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=osl.c;h=44e09d07ad20a179c111f06503ec4415c534e61e;hb=3c96f3b4f7bb1be1c630085981e83eb0260b99a7;hp=5c6f93ed60c2f7b9a1357b1aba92c7a4b827aa4d;hpb=093138ba762b3179f4d0375bbaf4250b9e016289;p=osl.git diff --git a/osl.c b/osl.c index 5c6f93e..44e09d0 100644 --- a/osl.c +++ b/osl.c @@ -8,7 +8,6 @@ #include /* readdir() */ #include - #include "log.h" #include "osl.h" #include "error.h" @@ -16,52 +15,6 @@ #include "list.h" #include "osl_core.h" -/** - * Allocate a sufficiently large string and print into it. - * - * \param fmt A usual format string. - * - * Produce output according to \p fmt. No artificial bound on the length of the - * resulting string is imposed. - * - * \return This function either returns a pointer to a string that must be - * freed by the caller or \p NULL if memory allocation failed. - * - * \sa printf(3). - */ -static __must_check __printf_1_2 __malloc char *make_message(const char *fmt, ...) -{ - int n; - size_t size = 100; - char *p = malloc(size); - - if (!p) - return NULL; - while (1) { - char *q; - va_list ap; - /* Try to print in the allocated space. */ - va_start(ap, fmt); - n = vsnprintf(p, size, fmt, ap); - va_end(ap); - /* If that worked, return the string. */ - if (n > -1 && n < size) - break; - /* Else try again with more space. */ - if (n > -1) /* glibc 2.1 */ - size = n + 1; /* precisely what is needed */ - else /* glibc 2.0 */ - size *= 2; /* twice the old size */ - q = realloc(p, size); - if (!q) { - free(p); - return NULL; - } - p = q; - } - return p; -} - /* Taken from Drepper: How to write shared libraries, Appendix B. */ #include #define MSGSTRFIELD(line) MSGSTRFIELD1(line) @@ -91,7 +44,7 @@ __export const char *osl_strerror(int num) return msgstr.str + errmsgidx[num]; } -static int loglevel; +int loglevel = 0; static void __attribute ((constructor)) init_loglevel(void) { @@ -154,88 +107,6 @@ static int __lseek(int fd, off_t *offset, int whence) return 1; } -/** - * Wrapper for the write system call. - * - * \param fd The file descriptor to write to. - * \param buf The buffer to write. - * \param size The length of \a buf in bytes. - * - * This function writes out the given buffer and retries if an interrupt - * occurred during the write. - * - * \return On success, the number of bytes written is returned, otherwise, the - * function returns \p -E_OSL_WRITE. - * - * \sa write(2). - */ -static ssize_t __write(int fd, const void *buf, size_t size) -{ - ssize_t ret; - - for (;;) { - ret = write(fd, buf, size); - if ((ret < 0) && (errno == EAGAIN || errno == EINTR)) - continue; - return ret >= 0? ret : -E_OSL_WRITE; - } -} - -/** - * Write the whole buffer to a file descriptor. - * - * \param fd The file descriptor to write to. - * \param buf The buffer to write. - * \param size The length of \a buf in bytes. - * - * This function writes the given buffer and continues on short writes and - * when interrupted by a signal. - * - * \return Positive on success, negative on errors. Possible errors: any - * errors returned by para_write(). - * - * \sa para_write(). - */ -static ssize_t write_all(int fd, const void *buf, size_t size) -{ -// DEBUG_LOG("writing %zu bytes\n", size); - const char *b = buf; - while (size) { - ssize_t ret = __write(fd, b, size); -// DEBUG_LOG("ret: %zd\n", ret); - if (ret < 0) - return ret; - b += ret; - size -= ret; - } - return 1; -} -/** - * Open a file, write the given buffer and close the file. - * - * \param filename Full path to the file to open. - * \param buf The buffer to write to the file. - * \param size The size of \a buf. - * - * \return Standard. - */ -static int write_file(const char *filename, const void *buf, size_t size) -{ - int ret, fd; - - ret = osl_open(filename, O_WRONLY | O_CREAT | O_EXCL, 0644); - if (ret < 0) - return ret; - fd = ret; - ret = write_all(fd, buf, size); - if (ret < 0) - goto out; - ret = 1; -out: - close(fd); - return ret; -} - static int append_file(const char *filename, char *header, size_t header_size, char *data, size_t data_size, uint32_t *new_pos) { @@ -247,11 +118,11 @@ static int append_file(const char *filename, char *header, size_t header_size, return ret; fd = ret; if (header && header_size) { - ret = write_all(fd, header, header_size); + ret = write_all(fd, header, &header_size); if (ret < 0) goto out; } - ret = write_all(fd, data, data_size); + ret = write_all(fd, data, &data_size); if (ret < 0) goto out; if (new_pos) { @@ -744,7 +615,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num) int ret; if (!map.data) return; - ret = para_munmap(map.data, map.size); + ret = osl_munmap(map.data, map.size); assert(ret > 0); map.data = NULL; } @@ -757,7 +628,7 @@ static void unmap_column(struct osl_table *t, unsigned col_num) * * \return Positive on success, negative on errors. * - * \sa map_table(), enum osl_close_flags, para_munmap(). + * \sa map_table(), enum osl_close_flags, osl_munmap(). */ int unmap_table(struct osl_table *t, enum osl_close_flags flags) { @@ -772,7 +643,7 @@ int unmap_table(struct osl_table *t, enum osl_close_flags flags) return -E_OSL_NOT_MAPPED; if (flags & OSL_MARK_CLEAN) mark_table_clean(t); - ret = para_munmap(t->index_map.data, t->index_map.size); + ret = osl_munmap(t->index_map.data, t->index_map.size); if (ret < 0) return ret; t->index_map.data = NULL; @@ -787,11 +658,12 @@ static int map_column(struct osl_table *t, unsigned col_num) { struct stat statbuf; char *filename = column_filename(t, col_num); - int ret = -E_OSL_STAT; + int ret; if (!filename) return -ERRNO_TO_ERROR(ENOMEM); - if (stat(filename, &statbuf) < 0) { + ret = osl_stat(filename, &statbuf); + if (ret < 0) { free(filename); return ret; } @@ -863,10 +735,10 @@ int map_table(struct osl_table *t, enum map_table_flags flags) err: /* unmap what is already mapped */ for (i--; i >= 0; i--) { struct osl_object map = t->columns[i].data_map; - para_munmap(map.data, map.size); + osl_munmap(map.data, map.size); map.data = NULL; } - para_munmap(t->index_map.data, t->index_map.size); + osl_munmap(t->index_map.data, t->index_map.size); t->index_map.data = NULL; return ret; } @@ -1307,37 +1179,6 @@ static int append_row_index(const struct osl_table *t, char *row_index) return ret; } -/** - * A wrapper for truncate(2) - * - * \param path Name of the regular file to truncate - * \param size Number of bytes to \b shave \b off - * - * Truncate the regular file named by \a path by \a size bytes. - * - * \return Standard. - * - * \sa truncate(2) - */ -int para_truncate(const char *path, off_t size) -{ - int ret; - struct stat statbuf; - - ret = -E_OSL_STAT; - if (stat(path, &statbuf) < 0) - goto out; - ret = -E_OSL_BAD_SIZE; - if (statbuf.st_size < size) - goto out; - ret = -E_OSL_TRUNC; - if (truncate(path, statbuf.st_size - size) < 0) - goto out; - ret = 1; -out: - return ret; -} - static int truncate_mapped_file(const struct osl_table *t, unsigned col_num, off_t size) { @@ -1346,7 +1187,7 @@ static int truncate_mapped_file(const struct osl_table *t, unsigned col_num, if (!filename) return -ERRNO_TO_ERROR(ENOMEM); - ret = para_truncate(filename, size); + ret = truncate_file(filename, size); free(filename); return ret; } @@ -1472,7 +1313,7 @@ __export int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects if (ret < 0) { /* truncate index and rollback changes */ char *filename = index_filename(t->desc); if (filename) - para_truncate(filename, t->row_index_size); + truncate_file(filename, t->row_index_size); free(filename); goto rollback; } @@ -1713,7 +1554,7 @@ static int rename_disk_storage_objects(struct osl_table *t, if (!old_filename || !new_filename) ret = -ERRNO_TO_ERROR(ENOMEM); else - ret = para_rename(old_filename, new_filename); + ret = osl_rename(old_filename, new_filename); free(old_filename); free(new_filename); if (ret < 0) @@ -1839,7 +1680,7 @@ __export int osl_open_disk_object(const struct osl_table *t, const struct osl_ro __export int osl_close_disk_object(struct osl_object *obj) { - return para_munmap(obj->data, obj->size); + return osl_munmap(obj->data, obj->size); } __export int osl_get_num_rows(const struct osl_table *t, unsigned *num_rows)