Changeset 2faa57e for lib/format_dag25.c

Timestamp:

03/14/08 16:50:58 (14 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

e632f2f

Parents:

a9a91d1

Message:

• Added a separate .h file for the various ERF types as newer ERF types aren't specified in the DAG 2.4 drivers
• ERF traces should now return a Option Unavailable error for any unsupported cconfig options, rather than Unknown Option
• Added a bit of extra documentation to the new thread/mutex related code added to format_dag25.c

File:

• lib/format_dag25.c (modified) (5 diffs)

lib/format_dag25.c

@@ -46 +46 @@
 
 #include <sys/mman.h>
+/* XXX: Windows doesn't have pthreads, but this code doesn't compile under
+ * Windows anyway so we'll worry about this more later :] */
+#include <pthread.h>
 
 
@@ -59 +62 @@
 #  endif
 #  include <sys/ioctl.h>
-#  include <pthread.h>
 #endif
 
@@ -97 +99 @@
 struct dag_dev_t *open_dags = NULL;
 
+/* NOTE: This function assumes the open_dag_mutex is held by the caller */
 static struct dag_dev_t *dag_find_open_device(char *dev_name) {
         struct dag_dev_t *dag_dev;
@@ -117 +120 @@
 }
 
+/* NOTE: This function assumes the open_dag_mutex is held by the caller */
 static void dag_close_device(struct dag_dev_t *dev) {
         /* Need to remove from the device list */
@@ -138 +142 @@
 }
 
+/* NOTE: This function assumes the open_dag_mutex is held by the caller */
 static struct dag_dev_t *dag_open_device(libtrace_t *libtrace, char *dev_name) {
         struct stat buf;