Subversion Repositories HelenOS-historic

Rev

Rev 1653 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1653 Rev 1719
Line 24... Line 24...
24 
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 24 
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 25 
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 26 
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 
 */
 27 
 */
28 
 
 28 
 
29 
 /** @addtogroup libc
 29 
/** @addtogroup libc
30 
 * @{
 30 
 * @{
31 
 */
 31 
 */
32 
/** @file
 32 
/** @file
33 
 */
 33 
 */
34 
 
 34 
 
Line 73... Line 73...
73 
{
 73 
{
74 
    return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t ) address);
 74 
    return __SYSCALL1(SYS_AS_AREA_DESTROY, (sysarg_t ) address);
75 
}
 75 
}
76 
 
 76 
 
77 
static size_t heapsize = 0;
 77 
static size_t heapsize = 0;
78 
static size_t maxheapsize = (size_t)(-1);
 78 
static size_t maxheapsize = (size_t) (-1);
79 
 
 79 
 
80 
static void * last_allocated = 0;
 80 
static void * last_allocated = 0;
81 
 
 81 
 
82 
/* Start of heap linker symbol */
 82 
/* Start of heap linker symbol */
83 
extern char _heap;
 83 
extern char _heap;
Line 90... Line 90...
90 
 */
 90 
 */
91 
void *sbrk(ssize_t incr)
 91 
void *sbrk(ssize_t incr)
92 
{
 92 
{
93 
    int rc;
 93 
    int rc;
94 
    void *res;
 94 
    void *res;
- 
 
 95 
   
95 
    /* Check for invalid values */
 96 
    /* Check for invalid values */
96 
    if (incr < 0 && -incr > heapsize)
 97 
    if (incr < 0 && -incr > heapsize)
97 
        return NULL;
 98 
        return NULL;
- 
 
 99 
   
98 
    /* Check for too large value */
 100 
    /* Check for too large value */
99 
    if (incr > 0 && incr+heapsize < heapsize)
 101 
    if (incr > 0 && incr+heapsize < heapsize)
100 
        return NULL;
 102 
        return NULL;
- 
 
 103 
   
101 
    /* Check for too small values */
 104 
    /* Check for too small values */
102 
    if (incr < 0 && incr+heapsize > heapsize)
 105 
    if (incr < 0 && incr+heapsize > heapsize)
103 
        return NULL;
 106 
        return NULL;
- 
 
 107 
   
104 
    /* Check for user limit */
 108 
    /* Check for user limit */
105 
    if ((maxheapsize!=(size_t)(-1)) && (heapsize + incr)>maxheapsize) return NULL;
 109 
    if ((maxheapsize != (size_t) (-1)) && (heapsize + incr) > maxheapsize)
- 
 
 110 
        return NULL;
106 
 
 111 
   
107 
    rc = as_area_resize(&_heap, heapsize + incr,0);
 112 
    rc = as_area_resize(&_heap, heapsize + incr, 0);
108 
    if (rc != 0)
 113 
    if (rc != 0)
109 
        return NULL;
 114 
        return NULL;
110 
   
 115 
   
111 
    /* Compute start of new area */
 116 
    /* Compute start of new area */
112 
    res = (void *)&_heap + heapsize;
 117 
    res = (void *) &_heap + heapsize;
113 
 
 118 
 
114 
    heapsize += incr;
 119 
    heapsize += incr;
115 
 
 120 
 
116 
    return res;
 121 
    return res;
117 
}
 122 
}
118 
 
 123 
 
119 
/** Set maximum heap size and return pointer just after the heap */
 124 
/** Set maximum heap size and return pointer just after the heap */
120 
void *set_maxheapsize(size_t mhs)
 125 
void *set_maxheapsize(size_t mhs)
121 
{
 126 
{
122 
    maxheapsize=mhs;
 127 
    maxheapsize = mhs;
123 
    /* Return pointer to area not managed by sbrk */
 128 
    /* Return pointer to area not managed by sbrk */
124 
    return (void *)&_heap + maxheapsize;
 129 
    return ((void *) &_heap + maxheapsize);
125 
 
 130 
 
126 
}
 131 
}
127 
 
 132 
 
128 
/** Return pointer to some unmapped area, where fits new as_area
 133 
/** Return pointer to some unmapped area, where fits new as_area
129 
 *
 134 
 *
Line 134... Line 139...
134 
{
 139 
{
135 
    void *res;
 140 
    void *res;
136 
 
 141 
 
137 
    /* Set heapsize to some meaningful value */
 142 
    /* Set heapsize to some meaningful value */
138 
    if (maxheapsize == -1)
 143 
    if (maxheapsize == -1)
139 
        set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH>>1,PAGE_SIZE));
 144 
        set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH >> 1, PAGE_SIZE));
- 
 
 145 
   
140 
    if (!last_allocated)
 146 
    if (!last_allocated)
141 
        last_allocated = ALIGN_UP((void *)&_heap + maxheapsize, PAGE_SIZE);
 147 
        last_allocated = (void *) ALIGN_UP((void *) &_heap + maxheapsize, PAGE_SIZE);
142 
   
 148 
   
143 
    sz = ALIGN_UP(sz, PAGE_SIZE);
 149 
    sz = ALIGN_UP(sz, PAGE_SIZE);
144 
    res = last_allocated;
 150 
    res = last_allocated;
145 
    last_allocated += sz;
 151 
    last_allocated += sz;
146 
 
 152 
 
147 
    return res;
 153 
    return res;
148 
}
 154 
}
149 
 
 155 
 
150 
 
 - 
 
151 
 /** @}
 156 
/** @}
152 
 */
 157 
 */
153 
 
 - 
 
154 
 
 -