X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsn_stage.c;h=1b564cc6796a909820150ade6c62663291bbe4fa;hb=518eb323bcc57e22984f75134a6c6b44876d8dd2;hp=d0467a4dc6cd2364c598496a239fd3049cbede25;hpb=8764b3122abba9e60cacb591f16a5e71abb5155f;p=sort-networks.git diff --git a/src/sn_stage.c b/src/sn_stage.c index d0467a4..1b564cc 100644 --- a/src/sn_stage.c +++ b/src/sn_stage.c @@ -2,18 +2,19 @@ * libsortnetwork - src/sn_stage.c * Copyright (C) 2008-2010 Florian octo Forster * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * 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. * - * This program 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 - * General Public License for more details. + * 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. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * 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 * * Authors: * Florian octo Forster @@ -29,6 +30,7 @@ #include #include #include +#include #include "sn_comparator.h" #include "sn_stage.h" @@ -82,10 +84,17 @@ int sn_stage_comparator_add (sn_stage_t *s, const sn_comparator_t *c) sn_comparator_t *temp; int i; + if ((s == NULL) || (c == NULL)) + return (EINVAL); + + i = sn_stage_comparator_check_conflict (s, c); + if (i != 0) + return (i); + temp = (sn_comparator_t *) realloc (s->comparators, (s->comparators_num + 1) * sizeof (sn_comparator_t)); if (temp == NULL) - return (-1); + return (ENOMEM); s->comparators = temp; temp = NULL; @@ -112,6 +121,9 @@ int sn_stage_comparator_remove (sn_stage_t *s, int c_num) int nmemb = s->comparators_num - (c_num + 1); sn_comparator_t *temp; + if ((s == NULL) || (s->comparators_num <= c_num)) + return (EINVAL); + assert (c_num < s->comparators_num); assert (c_num >= 0); @@ -141,6 +153,7 @@ int sn_stage_comparator_remove (sn_stage_t *s, int c_num) sn_stage_t *sn_stage_clone (const sn_stage_t *s) { sn_stage_t *s_copy; + int i; s_copy = sn_stage_create (s->depth); if (s_copy == NULL) @@ -154,8 +167,13 @@ sn_stage_t *sn_stage_clone (const sn_stage_t *s) return (NULL); } - memcpy (s_copy->comparators, s->comparators, - s->comparators_num * sizeof (sn_comparator_t)); + for (i = 0; i < s->comparators_num; i++) + { + SN_COMP_MIN (s_copy->comparators + i) = SN_COMP_MIN (s->comparators + i); + SN_COMP_MAX (s_copy->comparators + i) = SN_COMP_MAX (s->comparators + i); + SN_COMP_USER_DATA (s_copy->comparators + i) = NULL; + SN_COMP_FREE_FUNC (s_copy->comparators + i) = NULL; + } s_copy->comparators_num = s->comparators_num; return (s_copy); @@ -276,6 +294,9 @@ int sn_stage_invert (sn_stage_t *s) { int i; + if (s == NULL) + return (EINVAL); + for (i = 0; i < s->comparators_num; i++) sn_comparator_invert (s->comparators + i); @@ -286,6 +307,13 @@ int sn_stage_shift (sn_stage_t *s, int sw, int inputs_num) { int i; + if ((s == NULL) || (inputs_num < 2)) + return (EINVAL); + + sw %= inputs_num; + if (sw == 0) + return (0); + for (i = 0; i < s->comparators_num; i++) sn_comparator_shift (s->comparators + i, sw, inputs_num); @@ -296,6 +324,9 @@ int sn_stage_swap (sn_stage_t *s, int con0, int con1) { int i; + if (s == NULL) + return (EINVAL); + for (i = 0; i < s->comparators_num; i++) sn_comparator_swap (s->comparators + i, con0, con1); @@ -307,6 +338,9 @@ int sn_stage_cut_at (sn_stage_t *s, int input, enum sn_network_cut_dir_e dir) int new_position = input; int i; + if ((s == NULL) || (input < 0)) + return (-EINVAL); + for (i = 0; i < s->comparators_num; i++) { sn_comparator_t *c = s->comparators + i; @@ -333,6 +367,47 @@ int sn_stage_cut_at (sn_stage_t *s, int input, enum sn_network_cut_dir_e dir) return (new_position); } /* int sn_stage_cut_at */ +int sn_stage_cut (sn_stage_t *s, int *mask, /* {{{ */ + sn_stage_t **prev) +{ + int i; + + if ((s == NULL) || (mask == NULL) || (prev == NULL)) + return (EINVAL); + + for (i = 0; i < s->comparators_num; i++) + { + sn_comparator_t *c = s->comparators + i; + int left = SN_COMP_LEFT (c); + int right = SN_COMP_RIGHT (c); + + if ((mask[left] == 0) + && (mask[right] == 0)) + continue; + + /* Check if we need to update the cut position */ + if ((mask[left] != mask[right]) + && ((mask[left] > 0) || (mask[right] < 0))) + { + int tmp; + int j; + + tmp = mask[right]; + mask[right] = mask[left]; + mask[left] = tmp; + + for (j = s->depth - 1; j >= 0; j--) + sn_stage_swap (prev[j], + left, right); + } + + sn_stage_comparator_remove (s, i); + i--; + } /* for (i = 0; i < s->comparators_num; i++) */ + + return (0); +} /* }}} int sn_stage_cut */ + int sn_stage_remove_input (sn_stage_t *s, int input) { int i; @@ -431,7 +506,7 @@ int sn_stage_serialize (sn_stage_t *s, #define SNPRINTF_OR_FAIL(...) \ status = snprintf (buffer, buffer_size, __VA_ARGS__); \ - if ((status < 1) || (status >= buffer_size)) \ + if ((status < 1) || (((size_t) status) >= buffer_size)) \ return (-1); \ buffer += status; \ buffer_size -= status; @@ -533,4 +608,20 @@ sn_stage_t *sn_stage_unserialize (char **ret_buffer, size_t *ret_buffer_size) return (s); } /* sn_stage_t *sn_stage_unserialize */ -/* vim: set shiftwidth=2 softtabstop=2 expandtab : */ +uint32_t sn_stage_get_hashval (const sn_stage_t *s) /* {{{ */ +{ + uint32_t hash; + int i; + + if (s == NULL) + return (0); + + hash = (uint32_t) s->depth; + + for (i = 0; i < s->comparators_num; i++) + hash = (hash * 99991) + sn_comparator_get_hashval (s->comparators + i); + + return (hash); +} /* }}} uint32_t sn_stage_get_hashval */ + +/* vim: set shiftwidth=2 softtabstop=2 expandtab fdm=marker : */