deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Splitted POSIX based cfs implementation to avoid pulling in potentially large POSIX directory I/O functions without needing them at all.

Browse source
This commit is contained in:
oliverschmidt 2007-12-21 01:36:01 +00:00
parent 102e3e2a24
commit 0564cc50fd
5 changed files with 90 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
core/cfs/cfs-posix-dir.c Normal file
View file

@ -0,0 +1,83 @@
/*
* Copyright (c) 2004, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: cfs-posix-dir.c,v 1.1 2007/12/21 01:36:01 oliverschmidt Exp $
*/
#include <stdio.h>
#include <dirent.h>
#include <string.h>
#include "cfs/cfs.h"
struct cfs_posix_dir {
DIR *dirp;
};
/*---------------------------------------------------------------------------*/
int
cfs_opendir(struct cfs_dir *p, const char *n)
{
struct cfs_posix_dir *dir = (struct cfs_posix_dir *)p;
dir->dirp = opendir(n);
return dir->dirp == NULL;
}
/*---------------------------------------------------------------------------*/
int
cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
{
struct cfs_posix_dir *dir = (struct cfs_posix_dir *)p;
struct dirent *res;
if(dir->dirp == NULL) {
return -1;
}
res = readdir(dir->dirp);
if(res == NULL) {
return -1;
}
strncpy(e->name, res->d_name, sizeof(e->name));
e->size = 0;
return 0;
}
/*---------------------------------------------------------------------------*/
void
cfs_closedir(struct cfs_dir *p)
{
struct cfs_posix_dir *dir = (struct cfs_posix_dir *)p;
if(dir->dirp != NULL) {
closedir(dir->dirp);
}
}
/*---------------------------------------------------------------------------*/

45
core/cfs/cfs-posix.c
View file

@ -30,21 +30,15 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: cfs-posix.c,v 1.6 2007/11/22 11:37:34 oliverschmidt Exp $
* $Id: cfs-posix.c,v 1.7 2007/12/21 01:36:01 oliverschmidt Exp $
*/
#include <stdio.h>
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
#include <string.h>
#include "cfs/cfs.h"
struct cfs_posix_dir {
DIR *dirp;
};
/*---------------------------------------------------------------------------*/
int
cfs_open(const char *n, int f)
@ -76,40 +70,3 @@ cfs_seek(int f, unsigned int o)
return lseek(f, o, SEEK_SET);
}
/*---------------------------------------------------------------------------*/
int
cfs_opendir(struct cfs_dir *p, const char *n)
{
struct cfs_posix_dir *dir = (struct cfs_posix_dir *)p;
dir->dirp = opendir(n);
return dir->dirp == NULL;
}
/*---------------------------------------------------------------------------*/
int
cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
{
struct cfs_posix_dir *dir = (struct cfs_posix_dir *)p;
struct dirent *res;
if(dir->dirp == NULL) {
return -1;
}
res = readdir(dir->dirp);
if(res == NULL) {
return -1;
}
strncpy(e->name, res->d_name, sizeof(e->name));
e->size = 0;
return 0;
}
/*---------------------------------------------------------------------------*/
void
cfs_closedir(struct cfs_dir *p)
{
struct cfs_posix_dir *dir = (struct cfs_posix_dir *)p;
if(dir->dirp != NULL) {
closedir(dir->dirp);
}
}
/*---------------------------------------------------------------------------*/

5
cpu/6502/Makefile.6502
View file

@ -30,7 +30,7 @@
#
# Author: Oliver Schmidt <ol.sc@web.de>
#
# $Id: Makefile.6502,v 1.23 2007/12/20 22:48:29 oliverschmidt Exp $
# $Id: Makefile.6502,v 1.24 2007/12/21 01:36:35 oliverschmidt Exp $
#
ifndef CONTIKI
@ -60,7 +60,8 @@ CONTIKI_CPU_SOURCEFILES = log.c error.c config.c clock.c ctk-mouse.c \
mtarch.c mtarch-asm.S lc-asm.S \
uip_arch.c ethernet-drv.c ethernet.c
CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c cfs-posix.c petsciiconv.c \
CONTIKI_SOURCEFILES += cfs-posix.c cfs-posix-dir.c \
$(CTK) ctk-conio.c petsciiconv.c \
$(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES)
TARGET_STARTFILES = $(TARGET).o --start-group

3
platform/gtk/Makefile.gtk
View file

@ -12,7 +12,8 @@ CTKGTK = $(CTK) ctk-gtksim.c ctk-draw.c ctk-gtksim-service.c libconio.c \
ctk-gtksim-draw.c
CONTIKI_TARGET_SOURCEFILES = tapdev-drv.c tapdev.c contiki-main.c \
dlloader.c clock.c $(CTK) $(CTKGTK) cfs-posix.c
dlloader.c clock.c $(CTK) $(CTKGTK) \
cfs-posix.c cfs-posix-dir.c
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)

2
platform/minimal-net/Makefile.minimal-net
View file

@ -6,7 +6,7 @@ CONTIKI_TARGET_DIRS = .
CONTIKI_TARGET_MAIN = ${addprefix $(OBJECTDIR)/,contiki-main.o}
CONTIKI_TARGET_SOURCEFILES = contiki-main.c dlloader.c clock.c \
leds.c leds-arch.c cfs-posix.c
leds.c leds-arch.c cfs-posix.c cfs-posix-dir.c
ifeq ($(OS),Windows_NT)
CONTIKI_TARGET_SOURCEFILES += wpcap-drv.c wpcap.c