Commit 4619de34 authored by Willy Tarreau's avatar Willy Tarreau Committed by Paul E. McKenney
Browse files

tools/nolibc/unistd: extract msleep(), sleep(), tcsetpgrp() to unistd.h 



These functions are normally provided by unistd.h. For ease of porting,
let's create the file and move them there.

Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 45a794bf

tools/include/nolibc/nolibc.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#include "stdio.h"

#include "stdlib.h"

#include "string.h"

#include "unistd.h"



/* Used by programs to avoid std includes */

#define NOLIBC

tools/include/nolibc/stdlib.h

+0 −30
Original line number Diff line number Diff line
@@ -300,19 +300,6 @@ char *u64toa(uint64_t in) 
	return itoa_buffer;

}



static __attribute__((unused))

int msleep(unsigned int msecs)

{

	struct timeval my_timeval = { msecs / 1000, (msecs % 1000) * 1000 };



	if (sys_select(0, 0, 0, 0, &my_timeval) < 0)

		return (my_timeval.tv_sec * 1000) +

			(my_timeval.tv_usec / 1000) +

			!!(my_timeval.tv_usec % 1000);

	else

		return 0;

}



/* This one is not marked static as it's needed by libgcc for divide by zero */

__attribute__((weak,unused,section(".text.nolibc_raise")))

int raise(int signal)
@@ -320,21 +307,4 @@ int raise(int signal) 
	return sys_kill(sys_getpid(), signal);

}



static __attribute__((unused))

unsigned int sleep(unsigned int seconds)

{

	struct timeval my_timeval = { seconds, 0 };



	if (sys_select(0, 0, 0, 0, &my_timeval) < 0)

		return my_timeval.tv_sec + !!my_timeval.tv_usec;

	else

		return 0;

}



static __attribute__((unused))

int tcsetpgrp(int fd, pid_t pid)

{

	return ioctl(fd, TIOCSPGRP, &pid);

}



#endif /* _NOLIBC_STDLIB_H */

tools/include/nolibc/unistd.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */

/*

 * unistd function definitions for NOLIBC

 * Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>

 */



#ifndef _NOLIBC_UNISTD_H

#define _NOLIBC_UNISTD_H



#include "std.h"

#include "arch.h"

#include "types.h"

#include "sys.h"





static __attribute__((unused))

int msleep(unsigned int msecs)

{

	struct timeval my_timeval = { msecs / 1000, (msecs % 1000) * 1000 };



	if (sys_select(0, 0, 0, 0, &my_timeval) < 0)

		return (my_timeval.tv_sec * 1000) +

			(my_timeval.tv_usec / 1000) +

			!!(my_timeval.tv_usec % 1000);

	else

		return 0;

}



static __attribute__((unused))

unsigned int sleep(unsigned int seconds)

{

	struct timeval my_timeval = { seconds, 0 };



	if (sys_select(0, 0, 0, 0, &my_timeval) < 0)

		return my_timeval.tv_sec + !!my_timeval.tv_usec;

	else

		return 0;

}



static __attribute__((unused))

int tcsetpgrp(int fd, pid_t pid)

{

	return ioctl(fd, TIOCSPGRP, &pid);

}



#endif /* _NOLIBC_UNISTD_H */