Merge pull request #4 from grupoudea/feature/rotacion

Feature/rotacion

Author: berracode

kernel-data-structure-lab1/README.md

@@ -37,6 +37,8 @@ gcc -o clientBridge clientBridge.c
 
 gcc -o clientBridge clientBridge.c utilsClientBridge.c
 
+gcc -o clientBridge clientBridge.c utilsClientBridge.c moduleImplement/bridgeLink.c moduleImplement/bridgeIO.c
+
 ```
 
 ### Up module

kernel-data-structure-lab1/bridgeOwn.c

@@ -89,15 +89,15 @@ static long bridge_ioctl(struct file *f, unsigned int cmd, unsigned long arg){
 	    printk(KERN_INFO "Stack succesfully created\n");
 	    break;
 	case BRIDGE_W_S:
-			printk(KERN_INFO "Creando");
+			printk(KERN_INFO "Creating\n");
             raw_copy_from_user(message, (char *)arg, 100);
 	    	add_element_to_stack(message);
             printk(KERN_INFO "Element succesfully added to the stack\n");
 	    break;
 	case BRIDGE_R_S:
-		printk(KERN_INFO "Leyendo");
-	    tmp_element = list_last_entry(&stack, struct string_node, list);
-            list_del(&(tmp_element->list));
+		printk(KERN_INFO "Reading\n");
+	    tmp_element = list_first_entry(&stack, struct string_node, list);
+        list_del(&(tmp_element->list));
 	    raw_copy_to_user((char *)arg, tmp_element->message, 100);
 	    kfree(tmp_element);
 	    break;

kernel-data-structure-lab1/clientBridge.c

@@ -3,86 +3,14 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <stdlib.h>
-#include "clientBridge.h"
+#include "moduleImplement/bridgeLink.h"
 #include "constants.h"
 #include "utilsClientBridge.h"
 
 char** argsv;
 int argsc;
 
-void write_message(int fd, unsigned long command, char * message){
-    if (ioctl(fd, command, message) == -1){
-        perror("Write message error at ioctl");
-    }
-}
-
-void read_message(int fd, unsigned long command, char * message){
-    if(ioctl(fd, command, message) == -1){
-	perror("Read message error at ioctl");
-    }else{
-	printf("Copy the messsage from the kernel\n");
-    }
-}
-
-void read_message_param(int fd, unsigned long command, int * value){
-    if(ioctl(fd, command, value) == -1){
-        perror("Read message param error at ioctl");
-    }else{
-        printf("Copy the messsage from the kernel\n");
-    }
-}
-
-void write_int(int fd, unsigned long command, int * value){
-    if (ioctl(fd, command, value) == -1){
-        perror("Write int error at ioctl");
-    }
-}
-
-void read_int(int fd, unsigned long command, int * value){
-    if(ioctl(fd, command, value) == -1){
-        perror("Read int error at ioctl");
-    }else{
-        printf("Copy the int from the kernel\n");
-    }
-}
-
-int send_empty_command(int fd, unsigned long command){
-    int result = ioctl(fd, command);
-    if( result == -1){
-       perror("Send command error at ioctl");
-    }else{
-        printf("Command OK to the kernel\n");
-    }
-    return result;
-}
-
-void write_several_messages(int fd){
-    write_message(fd, BRIDGE_W_S, "Message 1");
-    write_message(fd, BRIDGE_W_S, "Message 2");
-    write_message(fd, BRIDGE_W_S, "Message 3");
-}
-
-void read_all_messages(int fd){
-	char message[100];
-	while( send_empty_command(fd, BRIDGE_STATE_S) > 0){
-	    read_message(fd, BRIDGE_R_S, message);
-	    printf("Message: %s\n", message);
-	}
-}
-
-int callModule(){
-    const char *file_name = "/dev/bridgeOwn"; //used by ioctl
-    int fd;
-
-    fd = open(file_name, O_RDWR);
-    if (fd == -1){
-        perror("Bridge ioctl file open");
-        return 2;
-    }
-}
-
 void usageMenu(){
     printf("uso: clientBridge [--help] \n");
     printf("\n");
@@ -109,26 +37,19 @@ char* getPathFile(){
     return pathfile;
 }
 
-void validarSimetria(int fd,char **file,int numOfLines){
-    char test[100];
-    ioctl(fd, BRIDGE_W_S, "Hola este es un mensaje a la pila \n");
-    ioctl(fd, BRIDGE_R_S, test);
-    printf("%s\n",test);
-}
-
 void chooseOption(char* option){
 
-    int fd = callModule();
     char* pathfile = getPathFile();
     int numOfLines = 0;
     char **linesArray = readFile(pathfile,&numOfLines);
 
     if(strcmp(ORDEN_INVERSO, option) == 0){
+        ordenInverso(linesArray, numOfLines);
 
     }else if(strcmp(RANDOM, option) == 0){
 
     }else if(strcmp(VALIDAR_SIMETRIA, option) == 0){
-      validarSimetria(fd,linesArray,numOfLines);
+      validarSimetria(linesArray, numOfLines);
 
     }else if(strcmp(COLA_PRIORIDAD, option) == 0){
 
@@ -139,7 +60,7 @@ void chooseOption(char* option){
     }else if(strcmp(CONCATENAR, option) == 0){
 
     }else if(strcmp(ROTACION, option) == 0){
-
+        rotateToRight(5);
     }else if(strcmp(LIMPIAR_LISTA, option) == 0){
 
     }else if(strcmp(MAYOR, option) == 0){

kernel-data-structure-lab1/files/file01

@@ -1,9 +1,10 @@
-hola hola hola
-mundo
-como
-van
-bien
-o
-nooooooooooooooooooooo
-mundo
-nuevo
+one
+two
+three
+four
+five
+six
+seven
+eight
+nine
+ten

kernel-data-structure-lab1/moduleImplement/bridgeIO.c

@@ -0,0 +1,63 @@
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include "bridgeIO.h"
+
+void write_message(int fd, unsigned long command, char * message){
+    if (ioctl(fd, command, message) == -1){
+        perror("Write message error at ioctl");
+    }
+}
+
+void read_message(int fd, unsigned long command, char * message){
+    if(ioctl(fd, command, message) == -1){
+	perror("Read message error at ioctl");
+    }else{
+	printf("Copy the messsage from the kernel\n");
+    }
+}
+
+void read_message_param(int fd, unsigned long command, int * value){
+    if(ioctl(fd, command, value) == -1){
+        perror("Read message param error at ioctl");
+    }else{
+        printf("Copy the messsage from the kernel\n");
+    }
+}
+
+void write_int(int fd, unsigned long command, int * value){
+    if (ioctl(fd, command, value) == -1){
+        perror("Write int error at ioctl");
+    }
+}
+
+void read_int(int fd, unsigned long command, int * value){
+    if(ioctl(fd, command, value) == -1){
+        perror("Read int error at ioctl");
+    }else{
+        printf("Copy the int from the kernel\n");
+    }
+}
+
+int send_empty_command(int fd, unsigned long command){
+    int result = ioctl(fd, command);
+    if( result == -1){
+       perror("Send command error at ioctl");
+    }else{
+        printf("Command OK to the kernel\n");
+    }
+    return result;
+}
+
+void write_several_messages(int fd){
+    write_message(fd, BRIDGE_W_S, "Message 1");
+    write_message(fd, BRIDGE_W_S, "Message 2");
+    write_message(fd, BRIDGE_W_S, "Message 3");
+}
+
+void read_all_messages(int fd){
+	char message[100];
+	while( send_empty_command(fd, BRIDGE_STATE_S) > 0){
+	    read_message(fd, BRIDGE_R_S, message);
+	    printf("Message: %s\n", message);
+	}
+}

kernel-data-structure-lab1/moduleImplement/bridgeIO.h

@@ -0,0 +1,47 @@
+#ifndef CLIENT_BRIDGE_H
+#define CLIENT_BRIDGE_H
+#include <linux/ioctl.h>
+
+// cmd ‘BRIDGE_DATA_VAR’ to send a message to the module
+
+#define BRIDGE_CREATE_Q _IO('p', 1) 			//Create a queue
+#define BRIDGE_W_HIGH_PRIOR_Q _IOW('p', 2, char *)
+#define BRIDGE_W_MIDDLE_PRIOR_Q _IOW('p', 3, char *)
+#define BRIDGE_W_LOW_PRIOR_Q _IOW('p', 4, char *)
+#define BRIDGE_R_HIGH_PRIOR_Q _IOR('p', 5, char *)
+#define BRIDGE_R_MIDDLE_PRIOR_Q _IOR('p', 6, char *)
+#define BRIDGE_R_LOW_PRIOR_Q _IOR('p', 7, char *)
+#define BRIDGE_STATE_Q _IO('p', 8)
+#define BRIDGE_DESTROY_Q _IO('p', 9)
+
+#define BRIDGE_CREATE_S _IO('p', 10) 			//Create a stack
+#define BRIDGE_W_S _IOW('p', 11, char *)
+#define BRIDGE_R_S _IOR('p', 12, char *)
+#define BRIDGE_STATE_S _IO('p', 13)
+#define BRIDGE_DESTROY_S _IO('p', 14)
+
+#define BRIDGE_CREATE_L _IO('p', 15)			//Create a list
+#define BRIDGE_W_L _IOW('p', 16, char *)
+#define BRIDGE_R_L _IOR('p', 17, char *)
+#define BRIDGE_INVERT_L _IO('p', 18)
+#define BRIDGE_ROTATE_L _IOW('p', 19, int *)
+#define BRIDGE_CLEAN_L _IO('p', 20)
+#define BRIDGE_GREATER_VAL_L _IOR('p', 21, char *)
+#define BRIDGE_END_L _IO('p', 22)
+#define BRIDGE_CONCAT_L _IO('p', 23)
+#define BRIDGE_STATE_L _IO('p', 24)
+#define BRIDGE_DESTROY_L _IO('p', 25)
+
+#endif
+
+
+void write_message(int fd, unsigned long command, char * message);
+void read_message(int fd, unsigned long command, char * message);
+void read_message_param(int fd, unsigned long command, int * value);
+
+void write_int(int fd, unsigned long command, int * value);
+void read_int(int fd, unsigned long command, int * value);
+
+int send_empty_command(int fd, unsigned long command);
+void write_several_messages(int fd);
+void read_all_messages(int fd);

kernel-data-structure-lab1/moduleImplement/bridgeLink.c

@@ -0,0 +1,45 @@
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include "bridgeIO.h"
+#include "bridgeLink.h"
+
+int callModule(){
+    const char *file_name = "/dev/bridgeOwn"; //used by ioctl
+    int fd;
+
+    fd = open(file_name, O_RDWR);
+    if (fd == -1){
+        perror("Bridge ioctl file open");
+        return 2;
+    }
+}
+
+void validarSimetria(char **file,int numOfLines){
+    char test[100];
+    int fd = callModule();
+    ioctl(fd, BRIDGE_W_S, "Hola este es un mensaje a la pila \n");
+    ioctl(fd, BRIDGE_R_S, test);
+    printf("%s\n",test);
+}
+
+void ordenInverso(char** arrayLines, int numOfLines){
+    printf("\n######  Lineas del archivo orden original   ######\n");
+    int fd = callModule();
+    for (int i = 0; i < numOfLines; i++){
+        printf("%s",arrayLines[i]);
+        write_message(fd, BRIDGE_W_S, arrayLines[i]);
+    }
+    char test[100];
+    printf("\n######  Lineas del archivo orden inverso   ######\n");
+    for (int i = 0; i < numOfLines; i++){
+        write_message(fd, BRIDGE_R_S, test);
+        printf("%s",test);
+    }
+}
+
+void rotateToRight(int numberRotations){
+    int fd = callModule();
+    write_message(fd, BRIDGE_ROTATE_L, "a");
+}
+

kernel-data-structure-lab1/moduleImplement/bridgeLink.h

@@ -0,0 +1,5 @@
+void validarSimetria(char** file, int numOfLines);
+
+void ordenInverso(char** file, int numOfLines);
+
+void rotateToRight(int numberRotations);