Synched local and repos

os/ass1/interval.c

 /*
-   Author: G.D. van Albada
-   Date:   August 26, 2009
-   (c) Universiteit van Amsterdam
+Author: G.D. van Albada
+Date:   August 26, 2009
+(c) Universiteit van Amsterdam
 
-   In this file the data types and some of the functions declared
-   in the file interval.h for the first assignment in the OS course
-   for 2009 are defined.
+In this file the data types and some of the functions declared
+in the file interval.h for the first assignment in the OS course
+for 2009 are defined.
 */
 
 /*

os/ass1/interval.h

 /*
-   Author: G.D. van Albada
-   Date:   August 26, 2009
-   (c) Universiteit van Amsterdam
+Author: G.D. van Albada
+Date:   August 26, 2009
+(c) Universiteit van Amsterdam
 
-   In this file the data types and functions exported by the file
-   interval.c for the first assignment in the OS course for 2009
-   are defined.
+In this file the data types and functions exported by the file
+interval.c for the first assignment in the OS course for 2009
+are defined.
 */
 
 /* interval is a pointer to a struct used by the functions

os/ass2/mem_alloc.h

@@ -45,11 +45,11 @@ void mem_available(long *empty, long *large, long *n_holes);
 
 /* mem_available vertelt de gebruiker hoeveel geheugen er nog
    beschikbaar is
-   empty:	totale hoeveelheid vrije ruimte
-   large:	omvang van het grootste gat, gecorrigeerd voor
-		administratie
-   n_holes:	het aantal gaten
-   */
+empty:	totale hoeveelheid vrije ruimte
+large:	omvang van het grootste gat, gecorrigeerd voor
+administratie
+n_holes:	het aantal gaten
+*/
 
 void mem_exit();
 

os/ass2/mt19937.h

@@ -38,8 +38,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto@math.keio.ac.jp
+http://www.math.keio.ac.jp/matumoto/emt.html
+email: matumoto@math.keio.ac.jp
 */
 
 /* initializes mt[N] with a seed */

os/ass2/mt19937ar.c

@@ -37,8 +37,8 @@
 
 
    Any feedback is very welcome.
-   http://www.math.keio.ac.jp/matumoto/emt.html
-   email: matumoto@math.keio.ac.jp
+http://www.math.keio.ac.jp/matumoto/emt.html
+email: matumoto@math.keio.ac.jp
 */
 
 #include <stdio.h>
@@ -73,7 +73,7 @@ void init_genrand(unsigned long s)
 /* init_key is the array for initializing keys */
 /* key_length is its length */
 void init_by_array(init_key, key_length)
-unsigned long init_key[], key_length;
+    unsigned long init_key[], key_length;
 {
     int i, j, k;
     init_genrand(19650218UL);

os/ass2/scheduler.h

@@ -2,17 +2,17 @@
   Deze header file bevat de voor de opgave over high-level scheduling en
   geheugen-allocatie benodigde definities
 
-   Auteur:	Dick van Albada
-		Vakgroep Computersystemen
-		Kruislaan 403
-   Datum:	7 september 2003
-   Versie:	0.3
-  
-   Student name .... Sander van Veen & Taddeus Kroes
-   Student email ... sandervv@gmail.com & taddeuskroes@hotmail.com
-   Collegekaart .... 6167969 & 6054129
-   Date ............ 10.10.2010
-****************************************************************************/
+Auteur:	Dick van Albada
+Vakgroep Computersystemen
+Kruislaan 403
+Datum:	7 september 2003
+Versie:	0.3
+
+Student name .... Sander van Veen & Taddeus Kroes
+Student email ... sandervv@gmail.com & taddeuskroes@hotmail.com
+Collegekaart .... 6167969 & 6054129
+Date ............ 10.10.2010
+ ****************************************************************************/
 
 /****************************************************************************
   De verschillende soorten events:
@@ -29,7 +29,7 @@
   de io_proc queue of in de ready queue wil aanpassen, kan dat nu.
   Finish_event - het lopende proces is beeindigd en in de defunct_proc rij
   geplaatst. Een goede gelegenheid om nieuwe processen toe te laten.
-****************************************************************************/
+ ****************************************************************************/
 
 typedef enum EVENT {NewProcess_event, Time_event, Ready_event, IO_event,
     Finish_event} event_type;
@@ -53,7 +53,7 @@ typedef enum EVENT {NewProcess_event, Time_event, Ready_event, IO_event,
   geheugen-array. Door jouw scheduler een maal te veranderen.
   proc_num is het volgnummer van het proces en wordt door de simulator
   gevuld. Niet veranderen.
-****************************************************************************/
+ ****************************************************************************/
 
 typedef struct PCB
 {
@@ -90,14 +90,14 @@ pcb *new_proc,
 
 /****************************************************************************
   De door de practicum-leiding aangeleverde fucties
-*****************************************************************************/
+ *****************************************************************************/
 
 double sim_time();
 
 /****************************************************************************
   sim_time geeft de gesimuleerde "wall-clock time" terug. Gebruik
   naar het je goeddunkt
-*****************************************************************************/
+ *****************************************************************************/
 
 extern void set_slice(double slice);
 
@@ -111,7 +111,7 @@ extern void set_slice(double slice);
   een set_slice(9.9e12) gedaan om te voorkomen dat de simulator daarop kan
   blijven hangen.
   Gebruik voor deze opgave is niet nodig.
-*****************************************************************************/
+ *****************************************************************************/
 
 long    rm_process(pcb **proces);
 
@@ -123,7 +123,7 @@ long    rm_process(pcb **proces);
   rm_process ruimt de eventueel door "your_admin" gebruikte ruimte
   niet op en geeft ook het gereserveerde geheugen niet vrij. Dat
   moet je bij een "Finish_event" zelf doen.
-****************************************************************************/
+ ****************************************************************************/
 
 /***************************************************************************
   De functie variabele finale wordt door het hoofdprogramma geinitialiseerd
@@ -137,7 +137,7 @@ long    rm_process(pcb **proces);
   Een interessante mogelijkheid is b.v. de samenhang tussen de wachttijd op
   geheugen en de grootte van het aangevraagde geheugen te onderzoeken.
   Treedt er starvation op, en zo ja, voor welke processen?
-****************************************************************************/
+ ****************************************************************************/
 
 typedef void function();
 
@@ -148,13 +148,13 @@ function *finale;
   queues te vullen. Daarna worden de statistieken weer op nul gezet.
   Definieer zelf een functie waar je reset_stats naar laat wijzen
   om dat ook eventueel voor je eigen statistieken te doen.
-****************************************************************************e */
+ ****************************************************************************e */
 
 function *reset_stats;
 
 /****************************************************************************
   De door de practicanten te schrijven routine
-****************************************************************************e */
+ ****************************************************************************e */
 
 void   schedule(event_type event);
 

os/ass3/fishbones.c

@@ -107,7 +107,7 @@ static void gup(FILE * log1, FILE * log2, int pipe_id[2], int myNumber)
 /*
  * Signal handler for SIGINT, SIGTERM and SIGCHLD.
  */
-void
+    void
 signal_handler(int signum)
 {
     char * sig = "TERM";
@@ -141,7 +141,7 @@ signal_handler(int signum)
 /*
  * Main funtion, initiates the program.
  */
-int
+    int
 main(void)
 {
     FILE * log1;

os/ass4/main.c

@@ -28,14 +28,14 @@ int diner_finished = 0;
 /*
  * Release fork taken by a philosopher.
  */
-static inline void release_fork(diner_stats *stats, int f) {
+    static inline void release_fork(diner_stats *stats, int f) {
         if(diner_finished)
             return;
 
         // Unlock left or right fork.
         stats->locked ^= 1 << (f % 2);
         pthread_mutex_unlock(forks+f);
-}
+    }
 
 /*
  * Try to claim a fork, but do not wait if the fork cannot be claimed.
@@ -55,7 +55,7 @@ static inline int try_take_fork(diner_stats *stats, int f) {
 /*
  * Claim a fork, and wait (blocking) if the fork is already taken.
  */
-static inline void take_fork(diner_stats *stats, int f) {
+    static inline void take_fork(diner_stats *stats, int f) {
         if(diner_finished)
             return;
 
@@ -63,13 +63,13 @@ static inline void take_fork(diner_stats *stats, int f) {
         pthread_mutex_lock(forks+f);
         stats->locked |= 1 << (f % 2);
         stats->forks++;
-}
+    }
 
 #define PHILO_EATING \
     if(diner_finished) \
-        return 1; \
-    \
-    stats->meals++;
+return 1; \
+\
+stats->meals++;
 
 static const char *philo_type_names[] = {"left", "right", "optimistic", "shy",
     "random"};

os/ass5/index.c

@@ -93,7 +93,7 @@ int index_error = 0;
  * characterised by Nblocks (the maximum number of entries in the index)
  * and KeyLength (the length of the key strings).
  */
-in_core *
+    in_core *
 index_makeNew(unsigned long Nblocks, unsigned long KeyLength)
 {
     unsigned long iRecordLength = sizeof(indexRecord) - sizeof(char[8]) +
@@ -263,7 +263,7 @@ in_core *index_readFromDisk(int fid)
  * it will return -1. (Zero is a valid index value) It needs as input: The
  * sought key The index record The length of the keys.
  */
-static long
+    static long
 key_to_index(indexRecord * rec, const char *key, unsigned long KeyLength)
 {
     int rv;

os/ass5/index.h

@@ -2,17 +2,17 @@
 #define INDEX_H
 
 /* -------------------------------------------------------------------------
-   Author: G.D. van Albada
-   University of Amsterdam
-   Faculty of Science
-   Informatics Institute
-   Copyright (C) Universiteit van Amsterdam
-   dick at science.uva.nl
-   Version: 0.1
-   Date: December 2001 / January 2002 / November 2004
-   Goal: Part of an assignment on file system structure for the operating
-         systems course. It demonstrates many of the administrative and 
-         layering structures that are also used in normal file systems.
+Author: G.D. van Albada
+University of Amsterdam
+Faculty of Science
+Informatics Institute
+Copyright (C) Universiteit van Amsterdam
+dick at science.uva.nl
+Version: 0.1
+Date: December 2001 / January 2002 / November 2004
+Goal: Part of an assignment on file system structure for the operating
+systems course. It demonstrates many of the administrative and
+layering structures that are also used in normal file systems.
 ----------------------------------------------------------------------------*/
 
 extern int index_error;

os/ass5/isam.c

@@ -69,24 +69,24 @@
  *  A case in point is the very first record in the file. In order to
  *  allow for the insertion of records with low key values, this record
  *  necessarily must have the minimum key value. Luckily, this is well
- *  defined: it is the empty string "". This record will be created and
- *  marked "reserved" right at the start.
- *
- *  When creating the file, every Nth (N = NrecPB - 1) record's key will
- *  be inserted into the index.
- *
- *  The index will be a tree where every node has up to four children.
- *  The leaf nodes point to the records. The reason for not using a more
- *  sophisticated tree structure are that not all keys searched for need
- *  appear in the tree.
- *
- *  So the structure will be:
- *                              1 17 33 49
- *              1 5 9 13                        17 ..
- *    1 2 3 4   5 6 7 8   9 10 11 12   13 14 15 16   17 18 19 20 ....
- *
+*  defined: it is the empty string "". This record will be created and
+*  marked "reserved" right at the start.
+*
+*  When creating the file, every Nth (N = NrecPB - 1) record's key will
+*  be inserted into the index.
+*
+*  The index will be a tree where every node has up to four children.
+*  The leaf nodes point to the records. The reason for not using a more
+*  sophisticated tree structure are that not all keys searched for need
+*  appear in the tree.
+*
+*  So the structure will be:
+*                              1 17 33 49
+*              1 5 9 13                        17 ..
+*    1 2 3 4   5 6 7 8   9 10 11 12   13 14 15 16   17 18 19 20 ....
+*
     *  The depth of the tree will be determined by Nblocks
- *    (D = ceil(log4(Nblocks)))
+*    (D = ceil(log4(Nblocks)))
     */
 
 #include <stdio.h>
@@ -97,37 +97,37 @@
 #include <fcntl.h>
 #include <string.h>
 
-/*
+    /*
      * Use assert to pinpoint fatal errors - should be removed later
      */
 #include <assert.h>
 #include "isam.h"
 #include "index.h"
 
-/*
+    /*
      * Compile a static structure to store cache statistics
      */
-static struct ISAM_CACHE_STATS cstat;
+    static struct ISAM_CACHE_STATS cstat;
 
-/*
+    /*
      * Just one flag value describing the state of the file for now
      */
 
 #define ISAM_STATE_UPDATING     (1024)
 
-/*
+    /*
      * Catch any calls to debugRecord, so we don't have any warnings :)
      */
 #ifndef DEBUG
 #   define debugRecord(alpha, beta, gamma) __placeholder()
-static void __placeholder(void) {return;}
+    static void __placeholder(void) {return;}
 #endif
 
-/*
+    /*
      * An isam file will start with an information block that is described in
      * the following typedef.
      */
-typedef struct
+    typedef struct
 {
     unsigned long magic;     /* Make sure this is an isam file   */
     unsigned long version;   /* Allow for later versions         */
@@ -223,7 +223,7 @@ enum isam_error isam_error = ISAM_NO_ERROR;
  * makeIsamPtr creates an isamPtr given a file header, fills in some data
  * and initialises the cache
  */
-static isamPtr
+    static isamPtr
 makeIsamPtr(fileHead * fHead)
 {
     isamPtr ipt = (isamPtr) calloc(1, sizeof(isam));
@@ -246,7 +246,7 @@ makeIsamPtr(fileHead * fHead)
     return ipt;
 }
 
-static void
+    static void
 dumpMaxKey(isamPtr f)
 {
     unsigned int i;
@@ -263,7 +263,7 @@ dumpMaxKey(isamPtr f)
 /*
  * Write the file header to disk (again)
  */
-static int
+    static int
 writeHead(isamPtr f)
 {
 #ifdef DEBUG
@@ -294,7 +294,7 @@ writeHead(isamPtr f)
 /*
  * You never can predict what junk you get as a file pointer...
  */
-static int
+    static int
 testPtr(isamPtr f)
 {
     if ((!f) || (f->fHead.magic != isamMagic)) {
@@ -309,7 +309,7 @@ testPtr(isamPtr f)
  * In the remainder of the code, we should not need to worry about how and
  * where to write a given block from the cache
  */
-static int
+    static int
 write_cache_block(isamPtr isam_ident, int iCache)
 {
     unsigned long block_no = isam_ident->blockInCache[iCache];
@@ -346,7 +346,7 @@ write_cache_block(isamPtr isam_ident, int iCache)
  * in an EOF error anyway); we just zero the cache block (corresponding to
  * an empty record).
  */
-static int
+    static int
 isam_cache_block(isamPtr isam_ident, unsigned long block_no)
 {
     int iCache;
@@ -446,7 +446,7 @@ isam_cache_block(isamPtr isam_ident, unsigned long block_no)
  * function) We'll use the latter approach - it also has the advantage
  * that we only need to return a single value.
  */
-static int
+    static int
 free_record_in_block(isamPtr isam_ident, int iCache)
 {
     unsigned int    iFree;
@@ -485,7 +485,7 @@ free_record_in_block(isamPtr isam_ident, int iCache)
  * Strictly for debugging - print some information about a record
  */
 #ifdef DEBUG
-static void
+    static void
 debugRecord(isamPtr f, unsigned long n, char *from)
 {
     int ib = n / f->fHead.NrecPB;
@@ -510,7 +510,7 @@ debugRecord(isamPtr f, unsigned long n, char *from)
  * yet.
  */
 
-isamPtr
+    isamPtr
 isam_create(const char *name, unsigned long KeyLen,
         unsigned long DataLen, unsigned long NrecPB,
         unsigned long Nblocks)
@@ -622,7 +622,7 @@ error_open:
     return NULL;
 }
 
-isamPtr
+    isamPtr
 isam_open(const char *name, int update)
 {
     struct stat buf;
@@ -733,7 +733,7 @@ error_file:
 /*
  * Close an isam file and release the memory used
  */
-int
+    int
 isam_close(isamPtr f)
 {
     int i;
@@ -771,7 +771,7 @@ isam_close(isamPtr f)
  * record with that key (if it exists), or the next higher key (if that
  * exists)
  */
-int
+    int
 isam_setKey(isamPtr isam_ident, const char *key)
 {
     int           block_no;
@@ -885,7 +885,7 @@ isam_setKey(isamPtr isam_ident, const char *key)
  * isam_readNext will read the next valid record (from cur_recno and
  * cur_id), if such a record exists
  */
-int
+    int
 isam_readNext(isamPtr isam_ident, char *key, void *data)
 {
     int             block_no;
@@ -934,7 +934,7 @@ isam_readNext(isamPtr isam_ident, char *key, void *data)
  * isam_readPrev will read the current record, if it is valid, and then
  * reposition the file to the preceding valid record (if that exists).
  */
-int
+    int
 isam_readPrev(isamPtr isam_ident, char *key, void *data)
 {
     int block_no;
@@ -987,7 +987,7 @@ isam_readPrev(isamPtr isam_ident, char *key, void *data)
  * isam_readByKey will attempt to read a record with the requested key
  */
 
-int
+    int
 isam_readByKey(isamPtr isam_ident, const char *key, void *data)
 {
 #ifdef OPTIMISED
@@ -1060,7 +1060,7 @@ isam_readByKey(isamPtr isam_ident, const char *key, void *data)
     memcpy(data, data((*isam_ident),iCache,rec_no), isam_ident->fHead.DataLen);
     return 0;
 #else
-/*
+    /*
      * STEP 5: This implementation is inefficient, and I have not verified
      * that it really works according to its specification For one thing, it
      * does not test for a valid isam_ident before use. It is probably better
@@ -1111,7 +1111,7 @@ key_error:
  * overflow record position (last block in a record, or a free slot in an
  * overflow block)
  */
-static int
+    static int
 isam_append(isamPtr isam_ident, const char *key, const void *data)
 {
     int block_no;
@@ -1332,7 +1332,7 @@ isam_append(isamPtr isam_ident, const char *key, const void *data)
     return writeHead(isam_ident);
 }
 
-int
+    int
 isam_writeNew(isamPtr isam_ident, const char *key, const void *data)
 {
     int block_no;
@@ -1669,7 +1669,7 @@ int isam_perror(const char *str)
  * isam_delete will delete a record if - it exists, - is valid - key and
  * data match
  */
-int
+    int
 isam_delete(isamPtr isam_ident, const char *key, const void *data)
 {
     unsigned long block_no;
@@ -1886,7 +1886,7 @@ isam_delete(isamPtr isam_ident, const char *key, const void *data)
  * implementation, where far fewer records need to be written, is left as
  * an exercise.
  */
-int
+    int
 isam_update(isamPtr isam_ident, const char *key, const void *old_data,
         const void *new_data)
 {
@@ -2003,7 +2003,7 @@ isam_update(isamPtr isam_ident, const char *key, const void *old_data,
  * Like strlen, but with a maximum length allowed.  There is "strnlen" in
  * GNU libc, but it's non-standard, hence we provide our own version.
  */
-static long
+    static long
 my_strnlen(const char *str, int maxLen)
 {
     const char *s = str;
@@ -2020,7 +2020,7 @@ my_strnlen(const char *str, int maxLen)
  * and complete blocks, separately for sequential part and for overflow
  * part. Also collect statistics on the key length used.
  */
-int
+    int
 isam_fileStats(isamPtr isam_ident, struct ISAM_FILE_STATS *stats)
 {
     int           iCache;

os/ass5/isam.h

@@ -2,17 +2,17 @@
 #define ISAM_H
 
 /* -------------------------------------------------------------------------
-    Author: G.D. van Albada
-    University of Amsterdam
-    Faculty of Science
-    Informatics Institute
-    Copyright (C) Universiteit van Amsterdam
-    dick at science.uva.nl
-    Version: 0.1
-    Date: December 2001 / January 2002 / November 2004
-    Goal: Part of an assignment on file system structure for the operating
-        systems course. It demonstrates many of the administrative and layering
-        structures that are also used in normal file systems.
+Author: G.D. van Albada
+University of Amsterdam
+Faculty of Science
+Informatics Institute
+Copyright (C) Universiteit van Amsterdam
+dick at science.uva.nl
+Version: 0.1
+Date: December 2001 / January 2002 / November 2004
+Goal: Part of an assignment on file system structure for the operating
+systems course. It demonstrates many of the administrative and layering
+structures that are also used in normal file systems.
 --------------------------------------------------------------------------*/
 
 typedef struct ISAM *isamPtr;
@@ -23,34 +23,34 @@ struct ISAM_CACHE_STATS;
 /* isam_create will create an isam_file, but only if a file of that name
    does not yet exist.
    The parameters are:
-   name:     name of the file, possibly including directory information
-   key_len:  maximum length of the (character string) key.
-   data_len: length of the data field
-   NrecPB:   number of records that should be put into one block (including
-         one overflow record per block).
-   Nblocks:  The number of regular data blocks = number of entries in the
-         index
-   isam_create will return an isamPtr on success, NULL on failure
- */
+name:     name of the file, possibly including directory information
+key_len:  maximum length of the (character string) key.
+data_len: length of the data field
+NrecPB:   number of records that should be put into one block (including
+one overflow record per block).
+Nblocks:  The number of regular data blocks = number of entries in the
+index
+isam_create will return an isamPtr on success, NULL on failure
+*/
 
 isamPtr isam_create(const char *name, unsigned long key_len,
         unsigned long data_len, unsigned long NrecPB, unsigned long Nblocks);
 
 /* isam_open will open an existing isam file.
    The parameters are:
-   name:     name of the file, possibly including directory information
-   update:   (not used) when != 0 the file is opened for reading and writing
-             (it actually always is).
-   isam_open will return an isamPtr on success, NULL on failure
- */
+name:     name of the file, possibly including directory information
+update:   (not used) when != 0 the file is opened for reading and writing
+(it actually always is).
+isam_open will return an isamPtr on success, NULL on failure
+*/
 
 isamPtr isam_open(const char *name, int update);
 
 /* isam_close will close a previously opened/created isam_file
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   isam_close will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+isam_close will return 0 on success, -1 on failure.
+*/
 
 int isam_close(isamPtr isam_ident);
 
@@ -60,30 +60,30 @@ int isam_close(isamPtr isam_ident);
    If no such record exists, the first record with a larger key will
    be returned, if that exists.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a string containing the requested key.
-   isam_setKey will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a string containing the requested key.
+isam_setKey will return 0 on success, -1 on failure.
+*/
 
 int isam_setKey(isamPtr isam_ident, const char *key);
 
 /* isam_readNext will read the next valid record, if that exists.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a character array where the key will be stored.
-   data:       pointer to the location where the data are to be stored.
-   isam_readNext will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a character array where the key will be stored.
+data:       pointer to the location where the data are to be stored.
+isam_readNext will return 0 on success, -1 on failure.
+*/
 int isam_readNext(isamPtr isam_ident, char *key, void *data);
 
 /* isam_readPrev will read the current record, if that exists and is valid and
    afterwards position the file at the preceding valid record, if that exists.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a character array where the key will be stored.
-   data:       pointer to the location where the data are to be stored.
-   isam_readPrev will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a character array where the key will be stored.
+data:       pointer to the location where the data are to be stored.
+isam_readPrev will return 0 on success, -1 on failure.
+*/
 
 int isam_readPrev(isamPtr isam_ident, char *key, void *data);
 
@@ -91,11 +91,11 @@ int isam_readPrev(isamPtr isam_ident, char *key, void *data);
    like an isam_setKey followed by an isam_readNext plus a check that the
    requested key and the retrieved key are the same.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a string containing the requested key.
-   data:       pointer to the location where the data are to be stored.
-   isam_readByKey will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a string containing the requested key.
+data:       pointer to the location where the data are to be stored.
+isam_readByKey will return 0 on success, -1 on failure.
+*/
 
 int isam_readByKey(isamPtr isam_ident, const char *key, void *data);
 
@@ -103,13 +103,13 @@ int isam_readByKey(isamPtr isam_ident, const char *key, void *data);
    if such a record exists. As a security measure, it will verify that the
    user has the correct original data.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a string containing the requested key.
-   old_data:   a pointer to a location containing a copy of the data that
-           the record should contain before modification.
-   new_data:   the new data to be stored in the record.
-   isam_update will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a string containing the requested key.
+old_data:   a pointer to a location containing a copy of the data that
+the record should contain before modification.
+new_data:   the new data to be stored in the record.
+isam_update will return 0 on success, -1 on failure.
+*/
 
 int isam_update(isamPtr isam_ident, const char *key, const void *old_data,
         const void *new_data);
@@ -117,32 +117,32 @@ int isam_update(isamPtr isam_ident, const char *key, const void *old_data,
 /* isam_writeNew will write a new record to the file, but only if the key is
    not yet in use.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a string containing the new key.
-   data:       the data to be stored in the new record.
-   isam_writeNew will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a string containing the new key.
+data:       the data to be stored in the new record.
+isam_writeNew will return 0 on success, -1 on failure.
+*/
 
 int isam_writeNew(isamPtr isam_ident, const char *key, const void *data);
 
 /* isam_delete will delete the record with the given key. As a security
    measure, it will verify that the user has the correct original data.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   key:        a string containing the key of the record to be deleted.
-   data:       a pointer to a location containing a copy of the data that
-           the record should contain before deletion.
-   isam_delete will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+key:        a string containing the key of the record to be deleted.
+data:       a pointer to a location containing a copy of the data that
+the record should contain before deletion.
+isam_delete will return 0 on success, -1 on failure.
+*/
 
 int isam_delete(isamPtr isam_ident, const char *key, const void *data);
 
 /* isam_fileStats will collect statistics about a given ISAM file.
    The parameters are:
-   isam_ident: the isamPtr for the file.
-   stats:      the structure to fill in with statistics.
-   isam_fileStats will return 0 on success, -1 on failure.
- */
+isam_ident: the isamPtr for the file.
+stats:      the structure to fill in with statistics.
+isam_fileStats will return 0 on success, -1 on failure.
+*/
 
 int isam_fileStats(isamPtr isam_ident, struct ISAM_FILE_STATS* stats);
 

os/ass5/isam_bench.c

@@ -48,7 +48,7 @@ static int report = 0;
  * Bereken dagnummer met 1/1/1900 == 1
  * Routine faalt op en na 1/3/2100
  */
-static long
+    static long
 berekenDag(int dag, int maand, int jaar)
 {
     long dagen;
@@ -91,7 +91,7 @@ berekenDag(int dag, int maand, int jaar)
 /*
  * Print klant-informatie
  */
-static void
+    static void
 printKlant(FILE * log, char *kop, char *sleutel, klant * Klant)
 {
     if (kop) {
@@ -107,7 +107,7 @@ printKlant(FILE * log, char *kop, char *sleutel, klant * Klant)
 /*
  * Maak een random klant
  */
-static void
+    static void
 maakKlant(klant *nieuweKlant)
 {
     int i, dag, maand, jaar;
@@ -147,7 +147,7 @@ static int code = 1000;
  * Maak een random sleutel, dichtbij de postcode in "code". Verhoog code.
  * Sleutel is een postcode plus huisnummer.
  */
-static int
+    static int
 maakSleutel(char *sleutel)
 {
     int huisnummer;
@@ -169,7 +169,7 @@ maakSleutel(char *sleutel)
 /*
  * Schrijf een nieuw record op een willekeurige plek in het bestand
  */
-static int
+    static int
 randomNieuwRecord(isamPtr ip)
 {
     char  sleutel[20];
@@ -201,7 +201,7 @@ randomNieuwRecord(isamPtr ip)
  * Lees sequentieel alle records in bepaald sleutelbereik, en pleeg een
  * bewerking
  */
-static int
+    static int
 leesBereik(isamPtr ip, char *minSleutel, char *maxSleutel, int datum)
 {
     char  sleutel[20];
@@ -265,7 +265,7 @@ leesBereik(isamPtr ip, char *minSleutel, char *maxSleutel, int datum)
 }
 
 
-int
+    int
 leesBestaandRecord(isamPtr ip, int sleutelNr)
 {
     klant klantRecord;
@@ -283,7 +283,7 @@ leesBestaandRecord(isamPtr ip, int sleutelNr)
     return rv;
 }
 
-int
+    int
 poetsBestaandRecord(isamPtr ip, int sleutelNr)
 {
     klant klantRecord;
@@ -310,7 +310,7 @@ poetsBestaandRecord(isamPtr ip, int sleutelNr)
     return rv;
 }
 
-int
+    int
 main(int argc, char *argv[])
 {
     isamPtr ip;

os/ass5/isam_test.c

@@ -24,7 +24,7 @@ code - it lacks comments, naming is ad-hoc, etc.
 #include <string.h>
 #include "isam.h"
 
-void
+    void
 instruct(void)
 {
     char str[256];
@@ -65,7 +65,7 @@ instruct(void)
     printf("\n");
 }
 
-int
+    int
 main(int argc, char *argv[])
 {
     int     rv, i;

portfolio/vcs/vcs.tex

@@ -360,8 +360,9 @@ fill in the names of files you expect to show up in the directory.
 
 In Git, it is not necessary to mention the renaming of files (since Git tracks
 content, not files). However, it is required to add the renamed file to Git's
-index, otherwise the file is marked as ``deleted''. Git provides a command to
-move (or rename) files and directories: \texttt{git mv foo bar}.
+index, otherwise the file is marked as ``deleted''. Also, Git provides a command to
+move (or rename) files and directories: \texttt{git mv foo bar}. This will save
+you one command to type, compared to \texttt{mv foo bar; git add bar}.
 
 % }}}
 
@@ -369,9 +370,10 @@ move (or rename) files and directories: \texttt{git mv foo bar}.
 \label{sub:discarding-changes}
 
 If you suddenly think your changes are not necessary or not the right solution,
-you can discard those changes in Git using \texttt{git checkout -- baz.txt}. Or you
-could reset your source tree to the last commit (thus discarding all changes in
-all tracked files made since the last commit) using \texttt{git reset --hard HEAD}.
+you can discard those changes in Git using \texttt{git checkout -- baz.txt} for
+a single file or directory. Or you could reset your entire source tree to the
+last commit (thus discarding all changes in all tracked files made since the
+last commit) using \texttt{git reset --hard HEAD}.
 
 % }}}
 
@@ -454,10 +456,10 @@ developers. Git is designed to handle large branches and merging those branches
 efficiently. Also notice when pulling from a Git repository, Git will
 automatically merge two branches (your repository and the public repository).
 
-Consider the situation where we need to create a branch. The following commands
+Imagine the situation where we need to create a branch. The following commands
 will create a branch of the master branch, commit some changes in both branches
-and then merging the two branches. In this after the merge, only master branch
-is available.
+and then merge the two branches. In this example after the merge, only the
+``master'' branch is available.
 
 \begin{verbatim}
 $ git branch
@@ -559,6 +561,77 @@ Finished one cherry-pick.
  create mode 100644 def.txt
 \end{verbatim}
 
+You can also pick multiple commits, for example, by using \texttt{git
+cherry-pick master\~{}4 master\~{}2} (two tildes). This will apply the changes
+introduced by the fifth and third last commits pointed to by master and create 2
+new commits with these changes. And it is possible to give a range: \texttt{git
+rev-list --reverse master -- README | git cherry-pick -n --stdin}. This will
+apply the changes introduced by all commits on the master branch that touched
+\texttt{README} to the working tree and index. Notice the \texttt{-n} flag, so
+the result can be inspected and made into a single new commit if suitable.
+
+% }}}
+
+\subsection{Hooks in Git} % {{{
+\label{sub:hooks-in-git}
+
+All hooks are stored in your \texttt{.git}-directory, and saved as
+\texttt{.git/hooks/HOOKNAME}, where \texttt{HOOKNAME} is in
+$\{$\texttt{applypatch-msg}, \texttt{commit-msg}, \texttt{post-commit},
+\texttt{post-receive}, \texttt{post-update}, \texttt{pre-applypatch},
+\texttt{pre-commit}, \texttt{prepare-commit-msg}, \texttt{pre-rebase},
+\texttt{update}$\}$. Example hooks (\texttt{*.sample}) can be found in the
+hooks-directory in your \texttt{.git}-directory.
+
+I'll demonstrate the use of a \texttt{pre-commit} hook. This hook is invoked by
+'git-commit', and can be bypassed with the \texttt{--no-verify} option. It takes
+no parameter, and is invoked before obtaining the proposed commit log message
+and making a commit. Exiting with non-zero status from this script causes the
+'git-commit' to abort. Aborting on a non-zero status enables a developer to run,
+for example, a set of test cases before committing to the ``main'' Git server
+(if you're working with a team of developers). In this example hook for
+pre-commit, I'll check if the file \texttt{conflict.txt} contains the
+(sub)string \texttt{abc}.
+
+\begin{verbatim}
+$ cat <<EOF > /tmp/uva-git/a/.git/hooks/pre-commit
+#!/bin/bash
+[ ! -f Makefile ] || make
+EOF
+$ chmod +x /tmp/uva-git/a/.git/hooks/pre-commit
+$ cat <<EOF > /tmp/uva-git/a/Makefile
+all:
+$(printf '\t')grep abc conflict.txt
+EOF
+$ git add Makefile && git commit -m "Added example Makefile."
+[master 78f6e33] Added example Makefile.
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+create mode 100644 Makefile
+$ git pull && git push
+$ echo "wrong" > conflict.txt
+$ git commit -am "Added 'wrong' text to 'conflict.txt'"
+grep abc conflict.txt
+make: *** [all] Error 1
+\end{verbatim}
+
+\noindent The pre-commit hook works as expected (since \texttt{abc} is not found
+in conflict.txt due to the commit). Now, I'll demonstrate forcing the commit,
+which will bypass the pre-commit hook:
+
+\begin{verbatim}
+$ git commit --no-verify -am "Added 'wrong' text to 'conflict' (forced)"
+[master 9fc290e] Added 'wrong' text to 'conflict' (forced)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+\end{verbatim}
+
+\noindent Although the used check (\texttt{grep abc conflict.txt}) in the
+example Makefile is pretty useless, the example clearly shows the possibilities
+of a pre-commit hook. In this example, I also used here strings (\texttt{<<EOF}
+and \texttt{EOF}) to show what data is stored in which file. Here strings allows
+a user to paste file content to a file without the need to escape all bash-related
+built-in commands (since escaping is normally required to prevent bash from
+performing shell expansion).
+
 % }}}
 
 % }}}