Merge pull request #1686 from bthebaudeau/unified-cfs-coffee-examples
Unified CFS/Coffee examples
This commit is contained in:
commit
4334990e16
|
@ -196,7 +196,7 @@ struct file_header {
|
||||||
/* This is needed because of a buggy compiler. */
|
/* This is needed because of a buggy compiler. */
|
||||||
struct log_param {
|
struct log_param {
|
||||||
cfs_offset_t offset;
|
cfs_offset_t offset;
|
||||||
const char *buf;
|
char *buf;
|
||||||
uint16_t size;
|
uint16_t size;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1198,7 +1198,7 @@ cfs_write(int fd, const void *buf, unsigned size)
|
||||||
need_dummy_write = 0;
|
need_dummy_write = 0;
|
||||||
for(bytes_left = size; bytes_left > 0;) {
|
for(bytes_left = size; bytes_left > 0;) {
|
||||||
lp.offset = fdp->offset;
|
lp.offset = fdp->offset;
|
||||||
lp.buf = buf;
|
lp.buf = (void *)buf;
|
||||||
lp.size = bytes_left;
|
lp.size = bytes_left;
|
||||||
i = write_log_page(file, &lp);
|
i = write_log_page(file, &lp);
|
||||||
if(i < 0) {
|
if(i < 0) {
|
||||||
|
|
|
@ -115,8 +115,7 @@ CUSTOM_RULE_LINK=1
|
||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
||||||
### This rule is used to generate the correct linker script
|
### This rule is used to generate the correct linker script
|
||||||
LDGENFLAGS += $(addprefix -D,$(subst $(COMMA), ,$(DEFINES)))
|
LDGENFLAGS += $(CFLAGS)
|
||||||
LDGENFLAGS += $(addprefix -I,$(SOURCEDIRS))
|
|
||||||
LDGENFLAGS += -imacros "contiki-conf.h" -imacros "dev/cc2538-dev.h"
|
LDGENFLAGS += -imacros "contiki-conf.h" -imacros "dev/cc2538-dev.h"
|
||||||
LDGENFLAGS += -imacros "dev/flash.h" -imacros "cfs-coffee-arch.h"
|
LDGENFLAGS += -imacros "dev/flash.h" -imacros "cfs-coffee-arch.h"
|
||||||
LDGENFLAGS += -x c -P -E
|
LDGENFLAGS += -x c -P -E
|
||||||
|
|
|
@ -102,6 +102,8 @@
|
||||||
/** Maximal amount of log table entries read in one batch */
|
/** Maximal amount of log table entries read in one batch */
|
||||||
#ifdef COFFEE_CONF_LOG_TABLE_LIMIT
|
#ifdef COFFEE_CONF_LOG_TABLE_LIMIT
|
||||||
#define COFFEE_LOG_TABLE_LIMIT COFFEE_CONF_LOG_TABLE_LIMIT
|
#define COFFEE_LOG_TABLE_LIMIT COFFEE_CONF_LOG_TABLE_LIMIT
|
||||||
|
#else
|
||||||
|
#define COFFEE_LOG_TABLE_LIMIT 16
|
||||||
#endif
|
#endif
|
||||||
/** Default reserved file size */
|
/** Default reserved file size */
|
||||||
#ifdef COFFEE_CONF_DYN_SIZE
|
#ifdef COFFEE_CONF_DYN_SIZE
|
||||||
|
@ -112,6 +114,8 @@
|
||||||
/** Default micro-log size */
|
/** Default micro-log size */
|
||||||
#ifdef COFFEE_CONF_LOG_SIZE
|
#ifdef COFFEE_CONF_LOG_SIZE
|
||||||
#define COFFEE_LOG_SIZE COFFEE_CONF_LOG_SIZE
|
#define COFFEE_LOG_SIZE COFFEE_CONF_LOG_SIZE
|
||||||
|
#else
|
||||||
|
#define COFFEE_LOG_SIZE (4 * COFFEE_PAGE_SIZE)
|
||||||
#endif
|
#endif
|
||||||
/** Whether Coffee will use micro logs */
|
/** Whether Coffee will use micro logs */
|
||||||
#ifdef COFFEE_CONF_MICRO_LOGS
|
#ifdef COFFEE_CONF_MICRO_LOGS
|
||||||
|
|
12
examples/cfs-coffee/Makefile
Normal file
12
examples/cfs-coffee/Makefile
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
|
||||||
|
CONTIKI = ../..
|
||||||
|
|
||||||
|
all: test-cfs test-coffee example-coffee
|
||||||
|
|
||||||
|
CONTIKI_WITH_RIME = 1
|
||||||
|
|
||||||
|
ifeq ($(TARGET),avr-raven)
|
||||||
|
COFFEE_FILES = 4
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(CONTIKI)/Makefile.include
|
29
examples/cfs-coffee/README.md
Normal file
29
examples/cfs-coffee/README.md
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
Contiki File System (CFS) and Coffee Examples
|
||||||
|
=============================================
|
||||||
|
|
||||||
|
Coffee is a very simple, relatively small and easy to use file system that you
|
||||||
|
are most likely going to be very familiar with if you have done any C file
|
||||||
|
access in the past. The notion is the same as on a normal PC: you open a file,
|
||||||
|
read and write to it and close it. Contiki will take care of the underlying
|
||||||
|
flash memory, giving you more time to focus on the real issues.
|
||||||
|
|
||||||
|
Coffee is a full implementation of the CFS API.
|
||||||
|
|
||||||
|
An extended explanation on CFS and Coffee internals and how they work can be
|
||||||
|
found at the [CFS](https://github.com/contiki-os/contiki/wiki/File-systems) and
|
||||||
|
[Coffee](https://github.com/contiki-os/contiki/wiki/Coffee-filesystem-example)
|
||||||
|
wiki pages.
|
||||||
|
|
||||||
|
Supported Hardware (tested or known to work)
|
||||||
|
--------------------------------------------
|
||||||
|
* sky
|
||||||
|
* z1
|
||||||
|
* wismote
|
||||||
|
* avr-raven
|
||||||
|
* cc2538dk
|
||||||
|
* openmote-cc2538
|
||||||
|
* zoul
|
||||||
|
|
||||||
|
The examples are known to build for the 'avr-raven' platform. However,
|
||||||
|
some of them currently fail at runtime due to file system overflow.
|
||||||
|
Tweaking the file sizes in the examples is necessary.
|
|
@ -28,31 +28,31 @@
|
||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*/
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
/**
|
/**
|
||||||
* \file
|
* \file
|
||||||
* Example on how to use CFS/Coffee.
|
* Example on how to use CFS/Coffee.
|
||||||
* \author
|
* \author
|
||||||
* Nicolas Tsiftes <nvt@sics.se>
|
* Nicolas Tsiftes <nvt@sics.se>
|
||||||
*/
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "cfs/cfs.h"
|
#include "cfs/cfs.h"
|
||||||
#include "cfs/cfs-coffee.h"
|
#include "cfs/cfs-coffee.h"
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
PROCESS(example_coffee_process, "Coffee example");
|
PROCESS(example_coffee_process, "Coffee example");
|
||||||
AUTOSTART_PROCESSES(&example_coffee_process);
|
AUTOSTART_PROCESSES(&example_coffee_process);
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
#define FILENAME "test"
|
#define FILENAME "test"
|
||||||
|
|
||||||
/* Formatting is needed if the storage device is in an unknown state;
|
/* Formatting is needed if the storage device is in an unknown state;
|
||||||
e.g., when using Coffee on the storage device for the first time. */
|
e.g., when using Coffee on the storage device for the first time. */
|
||||||
#ifndef NEED_FORMATTING
|
#ifndef NEED_FORMATTING
|
||||||
#define NEED_FORMATTING 0
|
#define NEED_FORMATTING 0
|
||||||
#endif
|
#endif
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
static int
|
static int
|
||||||
file_test(const char *filename, char *msg)
|
file_test(const char *filename, char *msg)
|
||||||
{
|
{
|
||||||
|
@ -65,12 +65,12 @@ file_test(const char *filename, char *msg)
|
||||||
} record;
|
} record;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Coffee determines the file length by finding the last non-zero byte
|
* Coffee determines the file length by finding the last non-zero byte
|
||||||
* of the file. This I/O semantic requires that each record should end
|
* of the file. This I/O semantic requires that each record should end
|
||||||
* with a non-zero, if we are writing multiple records and closing the
|
* with a non-zero, if we are writing multiple records and closing the
|
||||||
* file descriptor in between.
|
* file descriptor in between.
|
||||||
*
|
*
|
||||||
* In this example, in which the file_test function can be called
|
* In this example, in which the file_test function can be called
|
||||||
* multiple times, we ensure that the sequence counter starts at 1.
|
* multiple times, we ensure that the sequence counter starts at 1.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ file_test(const char *filename, char *msg)
|
||||||
record.message[sizeof(record.message) - 1] = '\0';
|
record.message[sizeof(record.message) - 1] = '\0';
|
||||||
record.sequence = sequence;
|
record.sequence = sequence;
|
||||||
|
|
||||||
/* Obtain a file descriptor for the file, capable of handling both
|
/* Obtain a file descriptor for the file, capable of handling both
|
||||||
reads and writes. */
|
reads and writes. */
|
||||||
fd = cfs_open(FILENAME, CFS_WRITE | CFS_APPEND | CFS_READ);
|
fd = cfs_open(FILENAME, CFS_WRITE | CFS_APPEND | CFS_READ);
|
||||||
if(fd < 0) {
|
if(fd < 0) {
|
||||||
|
@ -103,7 +103,7 @@ file_test(const char *filename, char *msg)
|
||||||
printf("Wrote message \"%s\", sequence %u\n",
|
printf("Wrote message \"%s\", sequence %u\n",
|
||||||
record.message, record.sequence);
|
record.message, record.sequence);
|
||||||
|
|
||||||
/* To read back the message, we need to move the file pointer to the
|
/* To read back the message, we need to move the file pointer to the
|
||||||
beginning of the file. */
|
beginning of the file. */
|
||||||
if(cfs_seek(fd, 0, CFS_SEEK_SET) != 0) {
|
if(cfs_seek(fd, 0, CFS_SEEK_SET) != 0) {
|
||||||
printf("seek failed\n");
|
printf("seek failed\n");
|
||||||
|
@ -133,7 +133,7 @@ file_test(const char *filename, char *msg)
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
static int
|
static int
|
||||||
dir_test(void)
|
dir_test(void)
|
||||||
{
|
{
|
||||||
|
@ -156,7 +156,7 @@ dir_test(void)
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
PROCESS_THREAD(example_coffee_process, ev, data)
|
PROCESS_THREAD(example_coffee_process, ev, data)
|
||||||
{
|
{
|
||||||
PROCESS_BEGIN();
|
PROCESS_BEGIN();
|
40
examples/cfs-coffee/project-conf.h
Normal file
40
examples/cfs-coffee/project-conf.h
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
/*
|
||||||
|
* 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 copyright holder 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 COPYRIGHT HOLDERS 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
|
||||||
|
* COPYRIGHT HOLDER 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.
|
||||||
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
#ifndef PROJECT_CONF_H_
|
||||||
|
#define PROJECT_CONF_H_
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
#if CONTIKI_TARGET_CC2538DK || CONTIKI_TARGET_OPENMOTE_CC2538 || \
|
||||||
|
CONTIKI_TARGET_ZOUL
|
||||||
|
#define COFFEE_CONF_SIZE (CC2538_DEV_FLASH_SIZE / 2)
|
||||||
|
#define COFFEE_CONF_MICRO_LOGS 1
|
||||||
|
#define COFFEE_CONF_APPEND_ONLY 0
|
||||||
|
#endif /* CONTIKI_TARGET_CC2538DK || CONTIKI_TARGET_ZOUL */
|
||||||
|
|
||||||
|
#endif /* PROJECT_CONF_H_ */
|
||||||
|
/*---------------------------------------------------------------------------*/
|
|
@ -29,19 +29,18 @@
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
/**
|
/**
|
||||||
* \file
|
* \file
|
||||||
* A quick program for testing the CFS xmem driver
|
* A quick program for testing the CFS xmem driver
|
||||||
* \author
|
* \author
|
||||||
* Adam Dunkels <adam@sics.se>
|
* Adam Dunkels <adam@sics.se>
|
||||||
*/
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "cfs/cfs.h"
|
#include "cfs/cfs.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
PROCESS(cfs_process, "Test CFS process");
|
PROCESS(cfs_process, "Test CFS process");
|
||||||
AUTOSTART_PROCESSES(&cfs_process);
|
AUTOSTART_PROCESSES(&cfs_process);
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
@ -55,6 +54,7 @@ PROCESS_THREAD(cfs_process, ev, data)
|
||||||
uint16_t filesize = 65000;
|
uint16_t filesize = 65000;
|
||||||
#define CHUNKSIZE 128
|
#define CHUNKSIZE 128
|
||||||
|
|
||||||
|
cfs_remove("hej");
|
||||||
fd = cfs_open("hej", CFS_WRITE);
|
fd = cfs_open("hej", CFS_WRITE);
|
||||||
if(fd < 0) {
|
if(fd < 0) {
|
||||||
printf("could not open file for writing, aborting\n");
|
printf("could not open file for writing, aborting\n");
|
|
@ -29,14 +29,14 @@
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
/**
|
/**
|
||||||
* \file
|
* \file
|
||||||
* Basic test for CFS/Coffee.
|
* Basic test for CFS/Coffee.
|
||||||
* \author
|
* \author
|
||||||
* Nicolas Tsiftes <nvt@sics.se>
|
* Nicolas Tsiftes <nvt@sics.se>
|
||||||
*/
|
*/
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "cfs/cfs.h"
|
#include "cfs/cfs.h"
|
||||||
#include "cfs/cfs-coffee.h"
|
#include "cfs/cfs-coffee.h"
|
||||||
|
@ -45,14 +45,12 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
PROCESS(testcoffee_process, "Test CFS/Coffee process");
|
PROCESS(testcoffee_process, "Test CFS/Coffee process");
|
||||||
AUTOSTART_PROCESSES(&testcoffee_process);
|
AUTOSTART_PROCESSES(&testcoffee_process);
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
#define FAIL(x) error = (x); goto end;
|
#define TEST_FAIL(x) error = (x); goto end;
|
||||||
|
|
||||||
#define FILE_SIZE 4096
|
#define FILE_SIZE 4096
|
||||||
|
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
static int
|
static int
|
||||||
coffee_test_basic(void)
|
coffee_test_basic(void)
|
||||||
|
@ -62,8 +60,6 @@ coffee_test_basic(void)
|
||||||
unsigned char buf[256];
|
unsigned char buf[256];
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
cfs_remove("T1");
|
|
||||||
|
|
||||||
wfd = rfd = afd = -1;
|
wfd = rfd = afd = -1;
|
||||||
|
|
||||||
for(r = 0; r < sizeof(buf); r++) {
|
for(r = 0; r < sizeof(buf); r++) {
|
||||||
|
@ -73,64 +69,64 @@ coffee_test_basic(void)
|
||||||
/* Test 1: Open for writing. */
|
/* Test 1: Open for writing. */
|
||||||
wfd = cfs_open("T1", CFS_WRITE);
|
wfd = cfs_open("T1", CFS_WRITE);
|
||||||
if(wfd < 0) {
|
if(wfd < 0) {
|
||||||
FAIL(1);
|
TEST_FAIL(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 2 and 3: Write buffer. */
|
/* Test 2 and 3: Write buffer. */
|
||||||
r = cfs_write(wfd, buf, sizeof(buf));
|
r = cfs_write(wfd, buf, sizeof(buf));
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(2);
|
TEST_FAIL(2);
|
||||||
} else if(r < sizeof(buf)) {
|
} else if(r < sizeof(buf)) {
|
||||||
FAIL(3);
|
TEST_FAIL(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 4: Deny reading. */
|
/* Test 4: Deny reading. */
|
||||||
r = cfs_read(wfd, buf, sizeof(buf));
|
r = cfs_read(wfd, buf, sizeof(buf));
|
||||||
if(r >= 0) {
|
if(r >= 0) {
|
||||||
FAIL(4);
|
TEST_FAIL(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 5: Open for reading. */
|
/* Test 5: Open for reading. */
|
||||||
rfd = cfs_open("T1", CFS_READ);
|
rfd = cfs_open("T1", CFS_READ);
|
||||||
if(rfd < 0) {
|
if(rfd < 0) {
|
||||||
FAIL(5);
|
TEST_FAIL(5);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 6: Write to read-only file. */
|
/* Test 6: Write to read-only file. */
|
||||||
r = cfs_write(rfd, buf, sizeof(buf));
|
r = cfs_write(rfd, buf, sizeof(buf));
|
||||||
if(r >= 0) {
|
if(r >= 0) {
|
||||||
FAIL(6);
|
TEST_FAIL(6);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 7 and 8: Read the buffer written in Test 2. */
|
/* Test 7 and 8: Read the buffer written in Test 2. */
|
||||||
memset(buf, 0, sizeof(buf));
|
memset(buf, 0, sizeof(buf));
|
||||||
r = cfs_read(rfd, buf, sizeof(buf));
|
r = cfs_read(rfd, buf, sizeof(buf));
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(7);
|
TEST_FAIL(7);
|
||||||
} else if(r < sizeof(buf)) {
|
} else if(r < sizeof(buf)) {
|
||||||
printf("r=%d\n", r);
|
printf("r=%d\n", r);
|
||||||
FAIL(8);
|
TEST_FAIL(8);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 9: Verify that the buffer is correct. */
|
/* Test 9: Verify that the buffer is correct. */
|
||||||
for(r = 0; r < sizeof(buf); r++) {
|
for(r = 0; r < sizeof(buf); r++) {
|
||||||
if(buf[r] != r) {
|
if(buf[r] != r) {
|
||||||
printf("r=%d. buf[r]=%d\n", r, buf[r]);
|
printf("r=%d. buf[r]=%d\n", r, buf[r]);
|
||||||
FAIL(9);
|
TEST_FAIL(9);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 10: Seek to beginning. */
|
/* Test 10: Seek to beginning. */
|
||||||
if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
|
if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
|
||||||
FAIL(10);
|
TEST_FAIL(10);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 11 and 12: Write to the log. */
|
/* Test 11 and 12: Write to the log. */
|
||||||
r = cfs_write(wfd, buf, sizeof(buf));
|
r = cfs_write(wfd, buf, sizeof(buf));
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(11);
|
TEST_FAIL(11);
|
||||||
} else if(r < sizeof(buf)) {
|
} else if(r < sizeof(buf)) {
|
||||||
FAIL(12);
|
TEST_FAIL(12);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 13 and 14: Read the data from the log. */
|
/* Test 13 and 14: Read the data from the log. */
|
||||||
|
@ -138,15 +134,15 @@ coffee_test_basic(void)
|
||||||
memset(buf, 0, sizeof(buf));
|
memset(buf, 0, sizeof(buf));
|
||||||
r = cfs_read(rfd, buf, sizeof(buf));
|
r = cfs_read(rfd, buf, sizeof(buf));
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(14);
|
TEST_FAIL(13);
|
||||||
} else if(r < sizeof(buf)) {
|
} else if(r < sizeof(buf)) {
|
||||||
FAIL(15);
|
TEST_FAIL(14);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 16: Verify that the data is correct. */
|
/* Test 16: Verify that the data is correct. */
|
||||||
for(r = 0; r < sizeof(buf); r++) {
|
for(r = 0; r < sizeof(buf); r++) {
|
||||||
if(buf[r] != r) {
|
if(buf[r] != r) {
|
||||||
FAIL(16);
|
TEST_FAIL(15);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,16 +151,16 @@ coffee_test_basic(void)
|
||||||
buf[r] = sizeof(buf) - r - 1;
|
buf[r] = sizeof(buf) - r - 1;
|
||||||
}
|
}
|
||||||
if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
|
if(cfs_seek(wfd, 0, CFS_SEEK_SET) != 0) {
|
||||||
FAIL(17);
|
TEST_FAIL(16);
|
||||||
}
|
}
|
||||||
r = cfs_write(wfd, buf, sizeof(buf));
|
r = cfs_write(wfd, buf, sizeof(buf));
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(18);
|
TEST_FAIL(17);
|
||||||
} else if(r < sizeof(buf)) {
|
} else if(r < sizeof(buf)) {
|
||||||
FAIL(19);
|
TEST_FAIL(18);
|
||||||
}
|
}
|
||||||
if(cfs_seek(rfd, 0, CFS_SEEK_SET) != 0) {
|
if(cfs_seek(rfd, 0, CFS_SEEK_SET) != 0) {
|
||||||
FAIL(20);
|
TEST_FAIL(19);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 21 and 22: Read the reversed buffer. */
|
/* Test 21 and 22: Read the reversed buffer. */
|
||||||
|
@ -172,16 +168,16 @@ coffee_test_basic(void)
|
||||||
memset(buf, 0, sizeof(buf));
|
memset(buf, 0, sizeof(buf));
|
||||||
r = cfs_read(rfd, buf, sizeof(buf));
|
r = cfs_read(rfd, buf, sizeof(buf));
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(21);
|
TEST_FAIL(20);
|
||||||
} else if(r < sizeof(buf)) {
|
} else if(r < sizeof(buf)) {
|
||||||
printf("r = %d\n", r);
|
printf("r = %d\n", r);
|
||||||
FAIL(22);
|
TEST_FAIL(21);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 23: Verify that the data is correct. */
|
/* Test 23: Verify that the data is correct. */
|
||||||
for(r = 0; r < sizeof(buf); r++) {
|
for(r = 0; r < sizeof(buf); r++) {
|
||||||
if(buf[r] != sizeof(buf) - r - 1) {
|
if(buf[r] != sizeof(buf) - r - 1) {
|
||||||
FAIL(23);
|
TEST_FAIL(22);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -189,6 +185,7 @@ coffee_test_basic(void)
|
||||||
end:
|
end:
|
||||||
cfs_close(wfd);
|
cfs_close(wfd);
|
||||||
cfs_close(rfd);
|
cfs_close(rfd);
|
||||||
|
cfs_remove("T1");
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
@ -202,50 +199,49 @@ coffee_test_append(void)
|
||||||
#define APPEND_BYTES 1000
|
#define APPEND_BYTES 1000
|
||||||
#define BULK_SIZE 10
|
#define BULK_SIZE 10
|
||||||
|
|
||||||
cfs_remove("T2");
|
|
||||||
|
|
||||||
/* Test 1 and 2: Append data to the same file many times. */
|
/* Test 1 and 2: Append data to the same file many times. */
|
||||||
for(i = 0; i < APPEND_BYTES; i += BULK_SIZE) {
|
for(i = 0; i < APPEND_BYTES; i += BULK_SIZE) {
|
||||||
afd = cfs_open("T3", CFS_WRITE | CFS_APPEND);
|
afd = cfs_open("T2", CFS_WRITE | CFS_APPEND);
|
||||||
if(afd < 0) {
|
if(afd < 0) {
|
||||||
FAIL(1);
|
TEST_FAIL(1);
|
||||||
}
|
}
|
||||||
for(j = 0; j < BULK_SIZE; j++) {
|
for(j = 0; j < BULK_SIZE; j++) {
|
||||||
buf[j] = 1 + ((i + j) & 0x7f);
|
buf[j] = 1 + ((i + j) & 0x7f);
|
||||||
}
|
}
|
||||||
if((r = cfs_write(afd, buf, BULK_SIZE)) != BULK_SIZE) {
|
if((r = cfs_write(afd, buf, BULK_SIZE)) != BULK_SIZE) {
|
||||||
printf("r=%d\n", r);
|
printf("r=%d\n", r);
|
||||||
FAIL(2);
|
TEST_FAIL(2);
|
||||||
}
|
}
|
||||||
cfs_close(afd);
|
cfs_close(afd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 3-6: Read back the data written previously and verify that it
|
/* Test 3-6: Read back the data written previously and verify that it
|
||||||
is correct. */
|
is correct. */
|
||||||
afd = cfs_open("T3", CFS_READ);
|
afd = cfs_open("T2", CFS_READ);
|
||||||
if(afd < 0) {
|
if(afd < 0) {
|
||||||
FAIL(3);
|
TEST_FAIL(3);
|
||||||
}
|
}
|
||||||
total_read = 0;
|
total_read = 0;
|
||||||
while((r = cfs_read(afd, buf2, sizeof(buf2))) > 0) {
|
while((r = cfs_read(afd, buf2, sizeof(buf2))) > 0) {
|
||||||
for(j = 0; j < r; j++) {
|
for(j = 0; j < r; j++) {
|
||||||
if(buf2[j] != 1 + ((total_read + j) & 0x7f)) {
|
if(buf2[j] != 1 + ((total_read + j) & 0x7f)) {
|
||||||
FAIL(4);
|
TEST_FAIL(4);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
total_read += r;
|
total_read += r;
|
||||||
}
|
}
|
||||||
if(r < 0) {
|
if(r < 0) {
|
||||||
FAIL(5);
|
TEST_FAIL(5);
|
||||||
}
|
}
|
||||||
if(total_read != APPEND_BYTES) {
|
if(total_read != APPEND_BYTES) {
|
||||||
FAIL(6);
|
TEST_FAIL(6);
|
||||||
}
|
}
|
||||||
cfs_close(afd);
|
cfs_close(afd);
|
||||||
|
|
||||||
error = 0;
|
error = 0;
|
||||||
end:
|
end:
|
||||||
cfs_close(afd);
|
cfs_close(afd);
|
||||||
|
cfs_remove("T2");
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
@ -258,58 +254,60 @@ coffee_test_modify(void)
|
||||||
int r, i;
|
int r, i;
|
||||||
unsigned offset;
|
unsigned offset;
|
||||||
|
|
||||||
cfs_remove("T3");
|
|
||||||
wfd = -1;
|
wfd = -1;
|
||||||
|
|
||||||
if(cfs_coffee_reserve("T3", FILE_SIZE) < 0) {
|
if(cfs_coffee_reserve("T3", FILE_SIZE) < 0) {
|
||||||
FAIL(1);
|
TEST_FAIL(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cfs_coffee_configure_log("T3", FILE_SIZE / 2, 11) < 0) {
|
if(cfs_coffee_configure_log("T3", FILE_SIZE / 2, 11) < 0) {
|
||||||
FAIL(2);
|
TEST_FAIL(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Test 16: Test multiple writes at random offset. */
|
/* Test 16: Test multiple writes at random offset. */
|
||||||
for(r = 0; r < 100; r++) {
|
for(r = 0; r < 100; r++) {
|
||||||
wfd = cfs_open("T2", CFS_WRITE | CFS_READ);
|
wfd = cfs_open("T3", CFS_WRITE | CFS_READ);
|
||||||
if(wfd < 0) {
|
if(wfd < 0) {
|
||||||
FAIL(3);
|
TEST_FAIL(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
offset = random_rand() % FILE_SIZE;
|
offset = random_rand() % FILE_SIZE;
|
||||||
|
|
||||||
for(r = 0; r < sizeof(buf); r++) {
|
for(i = 0; i < sizeof(buf); i++) {
|
||||||
buf[r] = r;
|
buf[i] = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
|
if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
|
||||||
FAIL(4);
|
TEST_FAIL(4);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cfs_write(wfd, buf, sizeof(buf)) != sizeof(buf)) {
|
if(cfs_write(wfd, buf, sizeof(buf)) != sizeof(buf)) {
|
||||||
FAIL(5);
|
TEST_FAIL(5);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
|
if(cfs_seek(wfd, offset, CFS_SEEK_SET) != offset) {
|
||||||
FAIL(6);
|
TEST_FAIL(6);
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(buf, 0, sizeof(buf));
|
memset(buf, 0, sizeof(buf));
|
||||||
if(cfs_read(wfd, buf, sizeof(buf)) != sizeof(buf)) {
|
if(cfs_read(wfd, buf, sizeof(buf)) != sizeof(buf)) {
|
||||||
FAIL(7);
|
TEST_FAIL(7);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < sizeof(buf); i++) {
|
for(i = 0; i < sizeof(buf); i++) {
|
||||||
if(buf[i] != i) {
|
if(buf[i] != i) {
|
||||||
printf("buf[%d] != %d\n", i, buf[i]);
|
printf("buf[%d] != %d\n", i, buf[i]);
|
||||||
FAIL(8);
|
TEST_FAIL(8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cfs_close(wfd);
|
||||||
}
|
}
|
||||||
|
|
||||||
error = 0;
|
error = 0;
|
||||||
end:
|
end:
|
||||||
cfs_close(wfd);
|
cfs_close(wfd);
|
||||||
|
cfs_remove("T3");
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
@ -318,21 +316,17 @@ coffee_test_gc(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
cfs_remove("alpha");
|
|
||||||
cfs_remove("beta");
|
|
||||||
|
|
||||||
|
|
||||||
for (i = 0; i < 100; i++) {
|
for (i = 0; i < 100; i++) {
|
||||||
if (i & 1) {
|
if (i & 1) {
|
||||||
if(cfs_coffee_reserve("alpha", random_rand() & 0xffff) < 0) {
|
if(cfs_coffee_reserve("beta", random_rand() & 0xffff) < 0) {
|
||||||
return i;
|
|
||||||
}
|
|
||||||
cfs_remove("beta");
|
|
||||||
} else {
|
|
||||||
if(cfs_coffee_reserve("beta", 93171) < 0) {
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
cfs_remove("alpha");
|
cfs_remove("alpha");
|
||||||
|
} else {
|
||||||
|
if(cfs_coffee_reserve("alpha", 93171) < 0) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
cfs_remove("beta");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -376,7 +370,7 @@ PROCESS_THREAD(testcoffee_process, ev, data)
|
||||||
result = coffee_test_gc();
|
result = coffee_test_gc();
|
||||||
print_result("Garbage collection", result);
|
print_result("Garbage collection", result);
|
||||||
|
|
||||||
printf("Coffee test finished. Duration: %d seconds\n",
|
printf("Coffee test finished. Duration: %d seconds\n",
|
||||||
(int)(clock_seconds() - start));
|
(int)(clock_seconds() - start));
|
||||||
|
|
||||||
PROCESS_END();
|
PROCESS_END();
|
|
@ -3,7 +3,7 @@ ifndef TARGET
|
||||||
TARGET=sky
|
TARGET=sky
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all: blink sky-collect #rt-leds test-button test-cfs tcprudolph0
|
all: blink sky-collect #rt-leds test-button tcprudolph0
|
||||||
|
|
||||||
%.tgz: %.ihex
|
%.tgz: %.ihex
|
||||||
mkdir $(basename $<) ; \
|
mkdir $(basename $<) ; \
|
||||||
|
|
|
@ -101,7 +101,9 @@ typedef uint32_t rtimer_clock_t;
|
||||||
*
|
*
|
||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
#ifndef COFFEE_CONF_SIZE
|
||||||
#define COFFEE_CONF_SIZE (4 * COFFEE_SECTOR_SIZE)
|
#define COFFEE_CONF_SIZE (4 * COFFEE_SECTOR_SIZE)
|
||||||
|
#endif
|
||||||
/** @} */
|
/** @} */
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -37,8 +37,11 @@ settings-example/avr-raven \
|
||||||
ipv6/multicast/sky \
|
ipv6/multicast/sky \
|
||||||
ipv6/rpl-tsch/z1 \
|
ipv6/rpl-tsch/z1 \
|
||||||
ipv6/rpl-tsch/z1:MAKE_WITH_ORCHESTRA=1 \
|
ipv6/rpl-tsch/z1:MAKE_WITH_ORCHESTRA=1 \
|
||||||
ipv6/rpl-tsch/z1:MAKE_WITH_SECURITY=1
|
ipv6/rpl-tsch/z1:MAKE_WITH_SECURITY=1 \
|
||||||
|
cfs-coffee/sky \
|
||||||
|
cfs-coffee/z1 \
|
||||||
|
cfs-coffee/wismote \
|
||||||
|
cfs-coffee/avr-raven
|
||||||
|
|
||||||
TOOLS=
|
TOOLS=
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,10 @@
|
||||||
org.contikios.cooja.mspmote.SkyMoteType
|
org.contikios.cooja.mspmote.SkyMoteType
|
||||||
<identifier>sky1</identifier>
|
<identifier>sky1</identifier>
|
||||||
<description>Sky Mote Type #1</description>
|
<description>Sky Mote Type #1</description>
|
||||||
<source EXPORT="discard">[CONTIKI_DIR]/examples/sky/test-coffee.c</source>
|
<source EXPORT="discard">[CONTIKI_DIR]/examples/cfs-coffee/test-coffee.c</source>
|
||||||
<commands EXPORT="discard">make clean TARGET=sky
|
<commands EXPORT="discard">make clean TARGET=sky
|
||||||
make test-coffee.sky TARGET=sky</commands>
|
make test-coffee.sky TARGET=sky</commands>
|
||||||
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky/test-coffee.sky</firmware>
|
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/cfs-coffee/test-coffee.sky</firmware>
|
||||||
<moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
|
<moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
|
||||||
<moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
|
<moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
|
||||||
<moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
<moteinterface>org.contikios.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
||||||
|
@ -89,7 +89,7 @@ make test-coffee.sky TARGET=sky</commands>
|
||||||
<plugin>
|
<plugin>
|
||||||
org.contikios.cooja.plugins.ScriptRunner
|
org.contikios.cooja.plugins.ScriptRunner
|
||||||
<plugin_config>
|
<plugin_config>
|
||||||
<script>TIMEOUT(80000);
|
<script>TIMEOUT(180000);
|
||||||
|
|
||||||
fileOK = null;
|
fileOK = null;
|
||||||
gcOK = null;
|
gcOK = null;
|
||||||
|
|
|
@ -46,6 +46,9 @@ stm32nucleo-spirit1/sensor-demo/stm32nucleo-spirit1 \
|
||||||
ipv6/multicast/stm32nucleo-spirit1 \
|
ipv6/multicast/stm32nucleo-spirit1 \
|
||||||
udp-ipv6/stm32nucleo-spirit1 \
|
udp-ipv6/stm32nucleo-spirit1 \
|
||||||
hello-world/stm32nucleo-spirit1 \
|
hello-world/stm32nucleo-spirit1 \
|
||||||
|
cfs-coffee/cc2538dk \
|
||||||
|
cfs-coffee/openmote-cc2538 \
|
||||||
|
cfs-coffee/zoul
|
||||||
|
|
||||||
TOOLS=
|
TOOLS=
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue