Changeset 2751


Ignore:
Timestamp:
Feb 20, 2011, 12:14:25 AM (11 years ago)
Author:
schwittmann
Message:

ExternalClient: fixed segmentation fault on systems with vendor specific libGL.so

Location:
trunk/CrypPlugins/KeySearcher/ExternalClient
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/KeySearcher/ExternalClient/Cryptool.cpp

    r2486 r2751  
    199199    }
    200200
    201     if (kernel != 0)
    202201        delete kernel;
    203202
  • trunk/CrypPlugins/KeySearcher/ExternalClient/Job.cpp

    r2259 r2751  
    22
    33Job::Job():
    4     Key(NULL)
     4    KeySize(0), Key(NULL), LargerThen(false), Size(0),
     5    ResultSize(0)
    56{
    67}
     
    89Job::~Job()
    910{
    10     if(Key != NULL)
    11     {
    12         delete[] Key;
    13     }
     11    delete[] Key;
    1412}
    1513
  • trunk/CrypPlugins/KeySearcher/ExternalClient/Makefile

    r2230 r2751  
    22
    33OBJFILES := $(patsubst %.cpp,bin/%.o,$(wildcard *.cpp))
     4
     5CCFLAGS := -g -Wall -Wextra -fopenmp -Wfloat-equal -Wpointer-arith
     6#CCFLAGS := -O3 -g -Wall -Wextra -fopenmp -Wfloat-equal -Wpointer-arith
    47
    58.PHONY: all clean
     
    811
    912bin/Cryptool: $(OBJFILES)
    10         g++ -fopenmp -O3 -o bin/Cryptool bin/*.o -Wall -Wextra -lpthread -ldl -L/usr/X11R6/lib -lOpenCL -lSDKUtil -L$(SDK)/lib/x86 -L$(SDK)/TempSDKUtil/lib/x86
     13        g++ $(CCFLAGS) -o bin/Cryptool bin/*.o -lpthread -ldl -L/usr/X11R6/lib -lOpenCL -lSDKUtil -L$(SDK)/lib/x86 -L$(SDK)/TempSDKUtil/lib/x86
    1114
    1215bin/%.o: %.cpp
    1316        mkdir -p bin
    14         g++ -fopenmp -O3 -msse3 -Wfloat-equal -Wall -Wextra -Wpointer-arith -DATI_OS_LINUX -g3 -ffor-scope -I $(SDK)/include -I $(SDK)/samples/opencl/SDKUtil/include -o $@ -c $<
     17        g++ $(CCFLAGS) -DATI_OS_LINUX -I $(SDK)/include -I $(SDK)/samples/opencl/SDKUtil/include -o $@ -c $<
    1518
    1619clean:
  • trunk/CrypPlugins/KeySearcher/ExternalClient/runclient.sh

    r2417 r2751  
    11#!/bin/bash
    22export LD_LIBRARY_PATH=~/src/ati-stream-sdk-v2.2-lnx32/lib/x86/:.
     3# some vendors install an incompatbile own libGL
     4export LD_PRELOAD=/usr/lib/libGL.so
    35make && ./bin/Cryptool 192.168.1.109 6235 123
Note: See TracChangeset for help on using the changeset viewer.