X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Fshare.h;h=20315b26bc932d1eac77efa32bf4c7129e17f02f;hb=de713d8a77cbd77e60f58537b0fc222f98fde395;hp=7bdeb5d211786deff767ad5f5b7843be1a2f6486;hpb=a09dac63957396890b1085cac0fee92ecc5db87a;p=lttng-ust.git

diff --git a/include/share.h b/include/share.h
index 7bdeb5d2..20315b26 100644
--- a/include/share.h
+++ b/include/share.h
@@ -1,81 +1,31 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+#ifndef _LTTNG_SHARE_H
+#define _LTTNG_SHARE_H
+
+/*
+ * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-#ifndef UST_SHARE_H
-#define UST_SHARE_H
-
-/* write() */
-#include <unistd.h>
-
-/* send() */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-
-/* This write is patient because it restarts if it was incomplete.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
-static __inline__ ssize_t patient_write(int fd, const void *buf, size_t count)
-{
-	const char *bufc = (const char *) buf;
-	int result;
-
-	for(;;) {
-		result = write(fd, bufc, count);
-		if(result == -1 && errno == EINTR) {
-			continue;
-		}
-		if(result <= 0) {
-			return result;
-		}
-		count -= result;
-		bufc += result;
-
-		if(count == 0) {
-			break;
-		}
-	}
-
-	return bufc-(const char *)buf;
-}
-
-static __inline__ ssize_t patient_send(int fd, const void *buf, size_t count, int flags)
-{
-	const char *bufc = (const char *) buf;
-	int result;
-
-	for(;;) {
-		result = send(fd, bufc, count, flags);
-		if(result == -1 && errno == EINTR) {
-			continue;
-		}
-		if(result <= 0) {
-			return result;
-		}
-		count -= result;
-		bufc += result;
-
-		if(count == 0) {
-			break;
-		}
-	}
+#include <stdlib.h>
 
-	return bufc-(const char *)buf;
-}
+ssize_t patient_write(int fd, const void *buf, size_t count);
+ssize_t patient_send(int fd, const void *buf, size_t count, int flags);
 
-#endif /* UST_SHARE_H */
+#endif /* _LTTNG_SHARE_H */