Browse Source

Simplify includes

master
Dirk Engling 14 years ago
parent
commit
7df4ce8fc7
  1. 2
      ot_clean.c
  2. 2
      ot_clean.h
  3. 2
      ot_iovec.h
  4. 2
      ot_mutex.c
  5. 9
      ot_sync.c
  6. 2
      ot_vector.h

2
ot_clean.c

@ -5,9 +5,11 @@
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <sys/uio.h>
/* Libowfat */
#include "byte.h"
#include "io.h"
/* Opentracker */
#include "trackerlogic.h"

2
ot_clean.h

@ -4,8 +4,6 @@
#ifndef __OT_CLEAN_H__
#define __OT_CLEAN_H__
#include "trackerlogic.h"
void clean_init( void );
void clean_deinit( void );

2
ot_iovec.h

@ -4,8 +4,6 @@
#ifndef __OT_IOVEC_H__
#define __OT_IOVEC_H__
#include <sys/uio.h>
void *iovec_increase( int *iovec_entries, struct iovec **iovector, size_t new_alloc );
void iovec_fixlast( int *iovec_entries, struct iovec **iovector, void *last_ptr );
void iovec_free( int *iovec_entries, struct iovec **iovector );

2
ot_mutex.c

@ -6,9 +6,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/uio.h>
/* Libowfat */
#include "byte.h"
#include "io.h"
/* Opentracker */
#include "trackerlogic.h"

9
ot_sync.c

@ -4,6 +4,7 @@
/* System */
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/uio.h>
#include <stdio.h>
#include <string.h>
#include <pthread.h>
@ -11,11 +12,14 @@
/* Libowfat */
#include "scan.h"
#include "byte.h"
#include "io.h"
/* Opentracker */
#include "trackerlogic.h"
#include "ot_mutex.h"
#include "ot_sync.h"
#include "ot_stats.h"
#include "ot_iovec.h"
#ifdef WANT_TRACKER_SYNC
@ -25,9 +29,9 @@
format: d4:syncd[..]ee
[..]: ( 20:01234567890abcdefghij16:XXXXYYYY )+
*/
int add_changeset_to_tracker( ot_byte *data, size_t len ) {
int add_changeset_to_tracker( uint8_t *data, size_t len ) {
ot_hash *hash;
ot_byte *end = data + len;
uint8_t *end = data + len;
unsigned long peer_count;
/* We do know, that the string is \n terminated, so it cant
@ -135,6 +139,7 @@ static void * sync_worker( void * args) {
ot_tasktype tasktype = TASK_SYNC_OUT;
ot_taskid taskid = mutex_workqueue_poptask( &tasktype );
sync_make( &iovec_entries, &iovector );
stats_issue_event( EVENT_SYNC_OUT, 1, iovec_length( &iovec_entries, &iovector) );
if( mutex_workqueue_pushresult( taskid, iovec_entries, iovector ) )
iovec_free( &iovec_entries, &iovector );
}

2
ot_vector.h

@ -4,8 +4,6 @@
#ifndef __OT_VECTOR_H__
#define __OT_VECTOR_H__
#include "trackerlogic.h"
/* These defines control vectors behaviour */
#define OT_VECTOR_MIN_MEMBERS 4
#define OT_VECTOR_GROW_RATIO 8

Loading…
Cancel
Save