Merge pull request #12 from grupoudea/develop

Develop

Author: berracode

kernel-data-structure-lab1/README.md

@@ -19,6 +19,43 @@ Esta práctica también nos permitirá aprender a utilizar ciertas funciones que
 
 ## Commands
 
+### Other way to compile module bridgeOwn and clientBridge
+
+firstly, go to the folder /**kernel-data-structure-lab1** inside the project, run the command **sudo ./scripts/run_it_run**, this command will create symbolic links or just links to access in an easier way to commands like: bridge_load, bridge_reset also to clientBridge executable easier.
+
+Now, if you want execute clientBridge you just to write:
+
+```sh
+sudo clientBridge
+```
+
+Here, command list:
+
+```sh
+sudo bridge_status
+```
+=> show if the module is on.
+```sh
+sudo bridge_load
+```
+=> load the module.
+```sh
+sudo bridge_reset
+```
+=> reset the module, but before, unload the module, it execute the make command and finally load the module again.
+```sh
+sudo bridge_syslog_clean
+```
+=> clean the syslog in /var/log/syslog. Don't worry it will make a backup.
+
+```sh
+sudo compile_client
+```
+=> compile the clientBridge from **kernel-data-structure-lab1** only. It will replace with Makefile in future versions.
+
+Note: Some of these commands work just if you are in the **kernel-data-structure-lab1** path in his terminal or console.
+
+
 
 ### To compile module bridgeOwn
 
@@ -33,9 +70,6 @@ make
 ### To compile client
 
 ```sh
-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
 

kernel-data-structure-lab1/bridgeOwn.c

@@ -118,7 +118,7 @@ static long bridge_ioctl(struct file *f, unsigned int cmd, unsigned long arg){
 	    break;
 	case BRIDGE_W_L:
 		raw_copy_from_user(message, (char *)arg, 100);
-		printk(KERN_INFO "AGREGANDO ELEMENTO A LA LISTA STACK: message = %s\n", message);
+		//printk(KERN_INFO "AGREGANDO ELEMENTO A LA LISTA STACK: message = %s\n", message);
 	  	add_element_to_stack(message, &stack);
 	    break;
 	case BRIDGE_R_L:
@@ -172,6 +172,26 @@ static long bridge_ioctl(struct file *f, unsigned int cmd, unsigned long arg){
 	case BRIDGE_STATE_L:
         printk(KERN_INFO "message %s\n", "bla23");
 	    break;
+	case BRIDGE_RANDOM_L:
+		printk(KERN_INFO "------------ BRIDGE_RANDOM_L REVOLVER LA LISTA \n");
+		long numberRandom;
+		raw_copy_from_user(message, (char* )arg, 20);
+		kstrtol(message, 10, &numberRandom);
+        printk(KERN_INFO "message BRIDGE_RANDOM_L numberRandom = %d\n", numberRandom);
+		printk(KERN_INFO "------------------------------------------------------------------\n\n");
+		int iteratorRandom = 0;
+
+		struct string_node *tmp_element;
+		struct list_head *watch, *next;
+		list_for_each_safe(watch, next, &stack){
+			tmp_element = list_entry(watch, struct string_node, list);
+			if(numberRandom>0 && iteratorRandom == numberRandom){
+				list_swap(watch, watch->next);
+				break;
+			}
+			iteratorRandom++;
+		}
+	    break;
 	case BRIDGE_DESTROY_L:
         printk(KERN_INFO "message %s\n", "bla24");
     }

kernel-data-structure-lab1/bridgeOwn.h

@@ -36,6 +36,8 @@
 #define BRIDGE_CONCAT_L _IO('p', 23)
 #define BRIDGE_STATE_L _IO('p', 24)
 #define BRIDGE_DESTROY_L _IO('p', 25)
+#define BRIDGE_RANDOM_L _IO('p', 26)
+
 
 #include <linux/list.h>
 

kernel-data-structure-lab1/bridge_reset

@@ -66,9 +66,10 @@ void chooseOption(char* option){
         ordenInverso(linesArray, numOfLines);
 
     }else if(strcmp(RANDOM, option) == 0){
+        randomLines(linesArray, numOfLines, pathfile);
 
     }else if(strcmp(VALIDAR_SIMETRIA, option) == 0){
-      validarSimetria(linesArray, numOfLines);
+        validarSimetria(linesArray, numOfLines);
 
     }else if(strcmp(COLA_PRIORIDAD, option) == 0){
 

kernel-data-structure-lab1/clientBridge.c

@@ -8,6 +8,12 @@ void write_message(int fd, unsigned long command, char * message){
     }
 }
 
+void write_message_array(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");
@@ -54,10 +60,10 @@ void write_several_messages(int fd){
     write_message(fd, BRIDGE_W_S, "Message 3");
 }
 
-void read_all_messages(int fd){
+void read_all_messages(int fd, unsigned long command){
 	char message[100];
 	while( send_empty_command(fd, BRIDGE_STATE_S) > 0){
-	    read_message(fd, BRIDGE_R_S, message);
+	    read_message(fd, command, message);
 	    printf("Message: %s\n", message);
 	}
 }

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

@@ -31,6 +31,8 @@
 #define BRIDGE_CONCAT_L _IO('p', 23)
 #define BRIDGE_STATE_L _IO('p', 24)
 #define BRIDGE_DESTROY_L _IO('p', 25)
+#define BRIDGE_RANDOM_L _IO('p', 26)
+
 
 #endif
 
@@ -44,4 +46,4 @@ 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);
+void read_all_messages(int fd, unsigned long command);

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

@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#include <stdlib.h>
+#include <time.h>
 #include "bridgeIO.h"
 #include "bridgeLink.h"
 #include "../constants.h"
@@ -39,6 +41,42 @@ void ordenInverso(char** arrayLines, int numOfLines){
     }
 }
 
+int randomNumber(int maxNumber, int seed){
+    int time1 = time(NULL)-((seed+1)*RAND_MAX);
+    srand(time1);// numero aleatorio entre 0 y maxNumber
+    int numberGenerate = (rand() % maxNumber);
+    return numberGenerate;
+}
+
+
+void randomLines(char** arrayLines, const int numOfLines, char* fileName){
+    int fd = callModule();
+
+    for (int i = 0; i < numOfLines; i++){
+        write_message(fd, BRIDGE_W_L, arrayLines[i]);
+    }
+
+    if(numOfLines>=2){
+        int maxRandom = numOfLines;
+        if(numOfLines==2){
+            maxRandom = 2;
+        }
+        for (int i = 0; i < maxRandom; i++){
+            int randomNumberInt = randomNumber(maxRandom,(i));
+            char randomNumberChar[20];
+            sprintf(randomNumberChar, "%d", randomNumberInt);
+            write_message(fd, BRIDGE_RANDOM_L, randomNumberChar);
+        }
+    }
+
+    char fileLine[MAX_LENGTH_CHAR_BRIDGE];
+    for (int i = 0; i < numOfLines; i++){
+        write_message(fd, BRIDGE_R_L, fileLine);
+        printf("Random Lines: %s\n",fileLine);
+    }
+
+}
+
 void rotateToRight(char* numberRotations, char** arrayLines, int numOfLines){
     printf("ROTAR A LA DERECHA\n\n");
     int fd = callModule();

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

@@ -4,8 +4,8 @@ void ordenInverso(char** file, int numOfLines);
 
 void rotateToRight(char* numberRotations, char** arrayLines, int numOfLines);
 
-void randomLines(char* pathFile);
+void randomLines(char** arrayLines, int numOfLines, char* fileName);
 
 void concatTwoLists(char** firstList, int numFirstList, char** secondList, int numSecondList);
 
-void cleanList(char** arrayLines, int numOfLines);
+void cleanList(char** arrayLines, int numOfLines);

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

@@ -8,7 +8,7 @@ group="sudo"
 echo "     Loading module from Load Script"
 # invoke insmod with all arguments we got
 # and use a pathname, as insmod doesn't look in . by default
-/sbin/insmod ./$module.ko $* || exit 1
+/sbin/insmod ../$module.ko $* || exit 1
 
 # retrieve major number
 major=$(awk "\$2==\"$module\" {print \$1}" /proc/devices)