Ver código fonte

pthread: indent files properly `-kr -i8`

cmte 5 anos atrás
pai
commit
048c402aaa
5 arquivos alterados com 96 adições e 103 exclusões
  1. 8 10
      pthread/example.c
  2. 2 4
      pthread/example.h
  3. 47 50
      pthread/example2.c
  4. 10 11
      pthread/example2.h
  5. 29 28
      pthread/foo.c

+ 8 - 10
pthread/example.c

@@ -1,21 +1,19 @@
 #include "example.h"
 
-int 
-fib(int n)
+int fib(int n)
 {
-	int i=0;
-	if (n==1 || n==0) return 1;
-	for(i=0;i<n;i++){
-		return (fib(n-1) + fib(n-2));
+	int i = 0;
+	if (n == 1 || n == 0)
+		return 1;
+	for (i = 0; i < n; i++) {
+		return (fib(n - 1) + fib(n - 2));
 	}
 	return (-1);
 }
 
-void*
-runner1(void* arg)
+void *runner1(void *arg)
 {
-	struct fibo* fibl = (struct fibo*) arg;
+	struct fibo *fibl = (struct fibo *) arg;
 	fibl->answer = fib(fibl->limit);
 	pthread_exit(0);
 }
-

+ 2 - 4
pthread/example.h

@@ -7,8 +7,6 @@ struct fibo {
 	int answer;
 };
 
-int 
-fib(int n);
+int fib(int n);
 
-void*
-runner1(void* arg);
+void *runner1(void *arg);

+ 47 - 50
pthread/example2.c

@@ -1,63 +1,60 @@
 #include "example2.h"
 
-void * produce(void *buf)
+void *produce(void *buf)
 {
-    buffer *buff;
-    buff = (buffer *)buf;
-    printf("\nproducer started");
-
-    for (int i=0;i<20;i++)
-    {
-        sem_wait(&buff->full);
-        pthread_mutex_lock(&buff->mutex);
-        
-        buff->data[buff->pos] = 0;
-        buff->pos = buff->pos + 1;
-        printf("\nproduced");
-
-        sem_post(&buff->empty);
-        pthread_mutex_unlock(&buff->mutex);
-
-        sleep(1);
-    }
-
-    pthread_exit(0);
+	buffer *buff;
+	buff = (buffer *) buf;
+	printf("\nproducer started");
+
+	for (int i = 0; i < 20; i++) {
+		sem_wait(&buff->full);
+		pthread_mutex_lock(&buff->mutex);
+
+		buff->data[buff->pos] = 0;
+		buff->pos = buff->pos + 1;
+		printf("\nproduced");
+
+		sem_post(&buff->empty);
+		pthread_mutex_unlock(&buff->mutex);
+
+		sleep(1);
+	}
+
+	pthread_exit(0);
 }
 
-void * consume(void *buf)
+void *consume(void *buf)
 {
 
-    buffer * buff;
-    buff = (buffer *)buf;
-    printf("\nconsumer started");
-    for (int i=0;i<20;i++)
-    {
-        sem_wait(&buff->empty);
-        pthread_mutex_lock(&buff->mutex);
-
-        buff->pos = buff->pos - 1;
-        printf("\ngot value %d", buff->data[buff->pos]);
-        
-        printf("\nconsumed");
-
-        sem_post(&buff->full);
-        
-        pthread_mutex_unlock(&buff->mutex);
-        sleep(2);
-    }
-    pthread_exit(0);
+	buffer *buff;
+	buff = (buffer *) buf;
+	printf("\nconsumer started");
+	for (int i = 0; i < 20; i++) {
+		sem_wait(&buff->empty);
+		pthread_mutex_lock(&buff->mutex);
+
+		buff->pos = buff->pos - 1;
+		printf("\ngot value %d", buff->data[buff->pos]);
+
+		printf("\nconsumed");
+
+		sem_post(&buff->full);
+
+		pthread_mutex_unlock(&buff->mutex);
+		sleep(2);
+	}
+	pthread_exit(0);
 }
 
-void init_buffer(buffer *buf)
+void init_buffer(buffer * buf)
 {
 
-    sem_init(&buf->empty, 0, 0);
-    sem_init(&buf->full, 0, BUFFER_SIZE);
-    pthread_mutex_init(&buf->mutex, NULL);
-    buf->pos = 0;
+	sem_init(&buf->empty, 0, 0);
+	sem_init(&buf->full, 0, BUFFER_SIZE);
+	pthread_mutex_init(&buf->mutex, NULL);
+	buf->pos = 0;
 
-    for (int i=0; i<BUFFER_SIZE;i++){
-        buf->data[i] = -1;
-    }
+	for (int i = 0; i < BUFFER_SIZE; i++) {
+		buf->data[i] = -1;
+	}
 }
-

+ 10 - 11
pthread/example2.h

@@ -7,16 +7,15 @@
 
 #define BUFFER_SIZE 10
 
-typedef struct buffer
-{
-    sem_t empty;
-    sem_t full;
-    pthread_mutex_t mutex;
-    int pos;
-    int data[BUFFER_SIZE];
+typedef struct buffer {
+	sem_t empty;
+	sem_t full;
+	pthread_mutex_t mutex;
+	int pos;
+	int data[BUFFER_SIZE];
 
-} buffer; 
+} buffer;
 
-void * produce(void *buf);
-void * consume(void *buf);
-void init_buffer(buffer *buf);
+void *produce(void *buf);
+void *consume(void *buf);
+void init_buffer(buffer * buf);

+ 29 - 28
pthread/foo.c

@@ -5,10 +5,9 @@
 #include "example.h"
 #include "example2.h"
 
-int
-example1 (int argc, char** argv)
+int example1(int argc, char **argv)
 {
-	
+
 	int i;
 	pthread_t id[argc];
 	pthread_attr_t attr;
@@ -19,20 +18,21 @@ example1 (int argc, char** argv)
 		return (1);
 	}
 
-	
+
 
 	pthread_attr_init(&attr);
-	for (i=1; i<argc;i++){
-		d[i-1].limit = atoi(argv[i]);
-		d[i-1].answer = 0;
-		pthread_create(&id[i-1], &attr, runner1, &d[i-1]);
+	for (i = 1; i < argc; i++) {
+		d[i - 1].limit = atoi(argv[i]);
+		d[i - 1].answer = 0;
+		pthread_create(&id[i - 1], &attr, runner1, &d[i - 1]);
 	}
 
-	for (i=0;i<argc-1;i++){
-		
+	for (i = 0; i < argc - 1; i++) {
+
 		pthread_join(id[i], NULL);
-		printf("\n\nFib of limit: %d is %d", d[i].limit, d[i].answer);
-		
+		printf("\n\nFib of limit: %d is %d", d[i].limit,
+		       d[i].answer);
+
 	}
 
 	return (0);
@@ -43,26 +43,27 @@ example1 (int argc, char** argv)
 int example2(int argc, char **argv)
 {
 
-    pthread_t id[2];
-    pthread_attr_t attr;
-    buffer buf;
+	pthread_t id[2];
+	pthread_attr_t attr;
+	buffer buf;
 
-    init_buffer(&buf);
+	init_buffer(&buf);
 
-    pthread_attr_init(&attr);
-    pthread_create(&id[0], &attr, produce, &buf);
-    pthread_create(&id[1], &attr, consume, &buf);
+	pthread_attr_init(&attr);
+	pthread_create(&id[0], &attr, produce, &buf);
+	pthread_create(&id[1], &attr, consume, &buf);
 
-    pthread_join(id[0], NULL);
-    pthread_join(id[1], NULL);
+	pthread_join(id[0], NULL);
+	pthread_join(id[1], NULL);
 
-    sem_destroy(&buf.empty);
-    pthread_mutex_destroy(&buf.mutex);
+	sem_destroy(&buf.empty);
+	pthread_mutex_destroy(&buf.mutex);
 
-    printf("\nProgram finished");
-    return (EXIT_SUCCESS);
+	printf("\nProgram finished");
+	return (EXIT_SUCCESS);
 }
 
-int main(int argc, char **argv){
-    example2(argc, argv);
-}
+int main(int argc, char **argv)
+{
+	example2(argc, argv);
+}