Changeset 40501 in vbox for trunk

Timestamp:

Mar 16, 2012 3:04:26 PM (13 years ago)

Author:

vboxsync

Message:

Additions/VBoxGuest: next drop of the Solaris STREAMS code.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris-streams.c

-              r40488
+              r40501
+}
+/** Resets (zeroes) a member in our open node state array in an IRQ-safe way.
+ */
 static void vbgr0SolResetSoftState(PVBGR0STATE pState)
+{
 …
+    }
     qprocsoff(pState->pWriteQueue);
+    pState->pWriteQueue = NULL;
+    pSession = pState->pSession;
+    vbgr0SolResetSoftState(pState);
     pReadQueue->q_ptr = NULL;
-    pSession = pState->pSession;
-    pState->pSession = NULL;
     Log((DEVICE_NAME "::Close: pSession=%p pState=%p\n", pSession, pState));
-    vbgr0SolResetSoftState(pState);
     if (!pSession)
+    {
 …
     return 0;
+}
+#ifdef TESTCASE
+/** Simple test of vbgr0SolOpen and vbgr0SolClose. */
+void testOpenClose(RTTEST hTest)
+{
+    queue_t aQueues[4];
+    dev_t device = 0;
+    int rc;
+    RTTestSub(hTest, "Testing vbgr0SolOpen and vbgr0SolClose");
+    RT_ZERO(g_aOpenNodeStates);
+    RT_ZERO(aQueues);
+    doInitQueues(&aQueues[0]);
+    doInitQueues(&aQueues[2]);
+    rc = vbgr0SolOpen(RD(&aQueues[0]), &device, 0, 0, NULL);
+    RTTEST_CHECK(hTest, rc == 0);
+    RTTEST_CHECK(hTest, g_aOpenNodeStates[1].pWriteQueue == WR(&aQueues[0]));
+    rc = vbgr0SolOpen(RD(&aQueues[2]), &device, 0, 0, NULL);
+    RTTEST_CHECK(hTest, rc == 0);
+    RTTEST_CHECK(hTest, g_aOpenNodeStates[2].pWriteQueue == WR(&aQueues[2]));
+    vbgr0SolClose(RD(&aQueues[0]), 0, NULL);
+    vbgr0SolClose(RD(&aQueues[1]), 0, NULL);
+}
+#endif

-              r40488
+              r40501
 #include <time.h>  /* struct timeval */
+/* Const#define MOD_NOAUTOUNLOAD        0x1ants */
+/* Overrides */
+#define dev_t unsigned
+/* Constants */
 #define DDI_FAILURE (-1)
 #define DDI_SUCCESS (0)
 …
 #define mod_remove(...) 0
 #define mod_info(...) 0
-#define makedevice(...) 0
-#define getmajor(...) 0
 #define RTR0Init(...) VINF_SUCCESS
 #define RTR0Term(...) do {} while(0)
 …
 #define mod_install(linkage) (s_pvLinkage && ((linkage) == s_pvLinkage) ? 0 : EINVAL)
 #define QREADR          0x00000010
 #define         WR(q)          ((q)->q_flag & QREADR ? (q) + 1 : (q))
 #define         RD(q)          ((q)->q_flag & QREADR ? (q) : (q) - 1)
+/* Basic initialisation of a queue structure pair for testing. */
+static inline void doInitQueues(queue_t aQueues[2])
+{
+    aQueues[0].q_flag = QREADR;
+}
+static inline dev_t makedevice(unsigned cMajor, unsigned cMinor)
+{
+    return cMajor * 4096 + cMinor;
+}
+static inline unsigned getmajor(dev_t device)
+{
+    return device / 4096;
+}
 /* API stubs with controllable logic */

r40488	r40501
25	25
26	26	extern void test_init(RTTEST hTest);
	27	extern void testOpenClose(RTTEST hTest);
27	28
28	29	RT_C_DECLS_END

Note: See TracChangeset for help on using the changeset viewer.