Mercurial Mercurial > upstream > oracle > userland-gate / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/open-fabrics/libibverbs/patches/base.patch
branchs11-update
changeset 3679 c058dce9610f
parent 2871 899d41b03a8e
child 4996 739983ef315c
equal deleted inserted replaced
3678:96c88473320c 3679:c058dce9610f 
       
     1 # This patch was developed in-house. Since it is Solaris-specific,
 
       
     2 # it is not suitable for upstream.
 
       
     3 #
 
     1 diff -r -u /tmp/846623/libibverbs-1.1.4/Makefile.am libibverbs-1.1.4/Makefile.am
 
     4 diff -r -u /tmp/846623/libibverbs-1.1.4/Makefile.am libibverbs-1.1.4/Makefile.am
 
     2 --- /tmp/846623/libibverbs-1.1.4/Makefile.am	Thu Feb  3 01:53:17 2011
 
     5 --- /tmp/846623/libibverbs-1.1.4/Makefile.am	Thu Feb  3 01:53:17 2011
 
     3 +++ libibverbs-1.1.4/Makefile.am	Fri Feb 11 04:02:12 2011
 
     6 +++ libibverbs-1.1.4/Makefile.am	Fri Feb 11 04:02:12 2011
 
     4 @@ -4,13 +4,13 @@
 
     7 @@ -4,13 +4,13 @@
 
     5  
     8  
  2522  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asyncwatch.obj `if test -f 'examples/asyncwatch.c'; then $(CYGPATH_W) 'examples/asyncwatch.c'; else $(CYGPATH_W) '$(srcdir)/examples/asyncwatch.c'; fi`
 
  2525  @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o asyncwatch.obj `if test -f 'examples/asyncwatch.c'; then $(CYGPATH_W) 'examples/asyncwatch.c'; else $(CYGPATH_W) '$(srcdir)/examples/asyncwatch.c'; fi`
 
  2523 -
 
  2526 -
 
  2524  device_list.o: examples/device_list.c
 
  2527  device_list.o: examples/device_list.c
 
  2525  @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT device_list.o -MD -MP -MF $(DEPDIR)/device_list.Tpo -c -o device_list.o `test -f 'examples/device_list.c' || echo '$(srcdir)/'`examples/device_list.c
 
  2528  @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT device_list.o -MD -MP -MF $(DEPDIR)/device_list.Tpo -c -o device_list.o `test -f 'examples/device_list.c' || echo '$(srcdir)/'`examples/device_list.c
 
  2526  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/device_list.Tpo $(DEPDIR)/device_list.Po
 
  2529  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/device_list.Tpo $(DEPDIR)/device_list.Po
 
       
  2530 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/uc_pingpong.c libibverbs-1.1.4/examples/uc_pingpong.c
 
       
  2531 --- /tmp/846623/libibverbs-1.1.4/examples/uc_pingpong.c	Thu Mar 10 06:58:21 2011
 
       
  2532 +++ libibverbs-1.1.4/examples/uc_pingpong.c	Tue Jan  6 10:05:55 2015
 
       
  2533 @@ -144,7 +144,7 @@
 
       
  2534  
       
  2535  	n = getaddrinfo(servername, service, &hints, &res);
 
       
  2536  
       
  2537 -	if (n < 0) {
 
       
  2538 +	if (n != 0) {
 
       
  2539  		fprintf(stderr, "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  2540  		free(service);
 
       
  2541  		return NULL;
 
       
  2542 @@ -219,7 +219,7 @@
 
       
  2543  
       
  2544  	n = getaddrinfo(NULL, service, &hints, &res);
 
       
  2545  
       
  2546 -	if (n < 0) {
 
       
  2547 +	if (n != 0) {
 
       
  2548  		fprintf(stderr, "%s for port %d\n", gai_strerror(n), port);
 
       
  2549  		free(service);
 
       
  2550  		return NULL;
 
  2527 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/asyncwatch.c libibverbs-1.1.4/examples/asyncwatch.c
 
  2551 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/asyncwatch.c libibverbs-1.1.4/examples/asyncwatch.c
 
  2528 --- /tmp/846623/libibverbs-1.1.4/examples/asyncwatch.c	Thu Mar 10 06:58:21 2011
 
  2552 --- /tmp/846623/libibverbs-1.1.4/examples/asyncwatch.c	Thu Mar 10 06:58:21 2011
 
  2529 +++ libibverbs-1.1.4/examples/asyncwatch.c	Fri Feb 11 04:02:18 2011
 
  2553 +++ libibverbs-1.1.4/examples/asyncwatch.c	Fri Feb 11 04:02:18 2011
 
  2530 @@ -35,11 +35,72 @@
 
  2554 @@ -35,11 +35,72 @@
 
  2531  #endif /* HAVE_CONFIG_H */
 
  2555  #endif /* HAVE_CONFIG_H */
 
  2914  	return 0;
 
  2938  	return 0;
 
  2915  }
 
  2939  }
 
  2916 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/srq_pingpong.c libibverbs-1.1.4/examples/srq_pingpong.c
 
  2940 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/srq_pingpong.c libibverbs-1.1.4/examples/srq_pingpong.c
 
  2917 --- /tmp/846623/libibverbs-1.1.4/examples/srq_pingpong.c	Thu Mar 10 06:58:21 2011
 
  2941 --- /tmp/846623/libibverbs-1.1.4/examples/srq_pingpong.c	Thu Mar 10 06:58:21 2011
 
  2918 +++ libibverbs-1.1.4/examples/srq_pingpong.c	Wed Jun  8 09:46:34 2011
 
  2942 +++ libibverbs-1.1.4/examples/srq_pingpong.c	Wed Jun  8 09:46:34 2011
 
  2919 @@ -171,6 +171,12 @@
 
  2943 @@ -165,8 +165,13 @@
 
       
  2944  
       
  2945  	n = getaddrinfo(servername, service, &hints, &res);
 
       
  2946  
       
  2947 -	if (n < 0) {
 
       
  2948 -		fprintf(stderr, "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  2949 +	if (n != 0) {
 
       
  2950 +		if (n == EAI_NONAME)
 
       
  2951 +			fprintf(stderr,
 
       
  2952 +			    "Name or service not known for %s:%d\n", servername, port);
 
       
  2953 +		else
 
       
  2954 +			fprintf(stderr,
 
       
  2955 +			    "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  2956  		free(service);
 
  2920  		return NULL;
 
  2957  		return NULL;
 
  2921  	}
 
  2958  	}
 
  2922  
  2959 @@ -253,7 +258,7 @@
 
  2923 +	if (n == EAI_NONAME) {
 
  2960  
  2924 +		fprintf(stderr, "Name or service not known for %s:%d\n", servername, port);
 
  2961  	n = getaddrinfo(NULL, service, &hints, &res);
 
  2925 +		free(service);
 
  2962  
  2926 +		return NULL;
 
  2963 -	if (n < 0) {
 
  2927 +	}
 
  2964 +	if (n != 0) {
 
  2928 +
 
  2965  		fprintf(stderr, "%s for port %d\n", gai_strerror(n), port);
 
  2929  	for (t = res; t; t = t->ai_next) {
 
  2966  		free(service);
 
  2930  		sockfd = socket(t->ai_family, t->ai_socktype, t->ai_protocol);
 
  2967  		return NULL;
 
  2931  		if (sockfd >= 0) {
 
       
  2932 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/ud_pingpong.c libibverbs-1.1.4/examples/ud_pingpong.c
 
  2968 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/ud_pingpong.c libibverbs-1.1.4/examples/ud_pingpong.c
 
  2933 --- /tmp/846623/libibverbs-1.1.4/examples/ud_pingpong.c	Thu Mar 10 06:58:21 2011
 
  2969 --- /tmp/846623/libibverbs-1.1.4/examples/ud_pingpong.c	Thu Mar 10 06:58:21 2011
 
  2934 +++ libibverbs-1.1.4/examples/ud_pingpong.c	Wed Jun  8 09:46:34 2011
 
  2970 +++ libibverbs-1.1.4/examples/ud_pingpong.c	Wed Jun  8 09:46:34 2011
 
  2935 @@ -149,6 +149,12 @@
 
  2971 @@ -143,8 +143,13 @@
 
       
  2972  
       
  2973  	n = getaddrinfo(servername, service, &hints, &res);
 
       
  2974  
       
  2975 -	if (n < 0) {
 
       
  2976 -		fprintf(stderr, "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  2977 +	if (n != 0) {
 
       
  2978 +		if (n == EAI_NONAME)
 
       
  2979 +			fprintf(stderr,
 
       
  2980 +			    "Name or service not known for %s:%d\n", servername, port);
 
       
  2981 +		else
 
       
  2982 +			fprintf(stderr,
 
       
  2983 +			    "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  2984  		free(service);
 
  2936  		return NULL;
 
  2985  		return NULL;
 
  2937  	}
 
  2986  	}
 
  2938  
  2987 @@ -217,7 +222,7 @@
 
  2939 +	if (n == EAI_NONAME) {
 
  2988  
  2940 +		fprintf(stderr, "Name or service not known for %s:%d\n", servername, port);
 
  2989  	n = getaddrinfo(NULL, service, &hints, &res);
 
  2941 +		free(service);
 
  2990  
  2942 +		return NULL;
 
  2991 -	if (n < 0) {
 
  2943 +	}
 
  2992 +	if (n != 0) {
 
  2944 +
 
  2993  		fprintf(stderr, "%s for port %d\n", gai_strerror(n), port);
 
  2945  	for (t = res; t; t = t->ai_next) {
 
  2994  		free(service);
 
  2946  		sockfd = socket(t->ai_family, t->ai_socktype, t->ai_protocol);
 
  2995  		return NULL;
 
  2947  		if (sockfd >= 0) {
 
       
  2948 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/rc_pingpong.c libibverbs-1.1.4/examples/rc_pingpong.c
 
  2996 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/rc_pingpong.c libibverbs-1.1.4/examples/rc_pingpong.c
 
  2949 --- /tmp/846623/libibverbs-1.1.4/examples/rc_pingpong.c	Thu Mar 10 06:58:21 2011
 
  2997 --- /tmp/846623/libibverbs-1.1.4/examples/rc_pingpong.c	Thu Mar 10 06:58:21 2011
 
  2950 +++ libibverbs-1.1.4/examples/rc_pingpong.c	Wed Jun  8 09:46:34 2011
 
  2998 +++ libibverbs-1.1.4/examples/rc_pingpong.c	Wed Jun  8 09:46:34 2011
 
  2951 @@ -161,6 +161,12 @@
 
  2999 @@ -155,8 +155,13 @@
 
       
  3000  
       
  3001  	n = getaddrinfo(servername, service, &hints, &res);
 
       
  3002  
       
  3003 -	if (n < 0) {
 
       
  3004 -		fprintf(stderr, "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  3005 +	if (n != 0) {
 
       
  3006 +		if (n == EAI_NONAME)
 
       
  3007 +			fprintf(stderr,
 
       
  3008 +			    "Name or service not known for %s:%d\n", servername, port);
 
       
  3009 +		else
 
       
  3010 +			fprintf(stderr,
 
       
  3011 +			    "%s for %s:%d\n", gai_strerror(n), servername, port);
 
       
  3012  		free(service);
 
  2952  		return NULL;
 
  3013  		return NULL;
 
  2953  	}
 
  3014  	}
 
  2954  
  3015 @@ -230,7 +235,7 @@
 
  2955 +	if (n == EAI_NONAME) {
 
  3016  
  2956 +		fprintf(stderr, "Name or service not known for %s:%d\n", servername, port);
 
  3017  	n = getaddrinfo(NULL, service, &hints, &res);
 
  2957 +		free(service);
 
  3018  
  2958 +		return NULL;
 
  3019 -	if (n < 0) {
 
  2959 +	}
 
  3020 +	if (n != 0) {
 
  2960 +
 
  3021  		fprintf(stderr, "%s for port %d\n", gai_strerror(n), port);
 
  2961  	for (t = res; t; t = t->ai_next) {
 
  3022  		free(service);
 
  2962  		sockfd = socket(t->ai_family, t->ai_socktype, t->ai_protocol);
 
  3023  		return NULL;
 
  2963  		if (sockfd >= 0) {
 
       
  2964 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/device_list.c libibverbs-1.1.4/examples/device_list.c
 
  3024 diff -r -u /tmp/846623/libibverbs-1.1.4/examples/device_list.c libibverbs-1.1.4/examples/device_list.c
 
  2965 --- /tmp/846623/libibverbs-1.1.4/examples/device_list.c	Sun Nov  1 06:47:19 2009
 
  3025 --- /tmp/846623/libibverbs-1.1.4/examples/device_list.c	Sun Nov  1 06:47:19 2009
 
  2966 +++ libibverbs-1.1.4/examples/device_list.c	Fri Feb 11 04:02:18 2011
 
  3026 +++ libibverbs-1.1.4/examples/device_list.c	Fri Feb 11 04:02:18 2011
 
  2967 @@ -36,16 +36,32 @@
 
  3027 @@ -36,16 +36,32 @@
 
  2968  
  3028
upstream/oracle/userland-gate