Changeset b678410 in mainline for uspace/app/tester/mm/malloc2.c

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/tester/mm/malloc2.c (moved) (moved from kernel/generic/include/proc/tasklet.h ) (2 diffs)

uspace/app/tester/mm/malloc2.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup genericproc
- * @{
- */
-/** @file tasklet.h
- * @brief Tasklets declarations
- */
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <malloc.h>
+#include "../tester.h"
 
-#ifndef KERN_TASKLET_H_
-#define KERN_TASKLET_H_
+const char *test_malloc2(void)
+{
+        int cnt = 0;
+        char *p;
 
-#include <adt/list.h>
+        TPRINTF("Provoking the kernel into overcommitting memory to us...\n");
+        while ((p = malloc(1024 * 1024))) {
+                TPRINTF("%dM ", ++cnt);
+                *p = 'A';
+        }
+        TPRINTF("\nWas refused more memory as expected.\n");
 
-/** Tasklet callback type */
-typedef void (* tasklet_callback_t)(void *arg);
-
-/** Tasklet state */
-typedef enum {
-        NotActive,
-        Scheduled,
-        InProgress,
-        Disabled
-} tasklet_state_t;
-
-/** Structure describing a tasklet */
-typedef struct tasklet_descriptor {
-        link_t link;
-        
-        /** Callback to call */
-        tasklet_callback_t callback;
-        
-        /** Argument passed to the callback */
-        void *arg;
-        
-        /** State of the tasklet */
-        tasklet_state_t state;
-} tasklet_descriptor_t;
-
-
-extern void tasklet_init(void);
-
-#endif
-
-/** @}
- */
+        return NULL;
+}