Changeset 14936 for trunk/FACT++


Ignore:
Timestamp:
02/21/13 13:07:34 (12 years ago)
Author:
tbretz
Message:
Changed to v20r5.
Location:
trunk/FACT++/dim
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/dim/README_v20.txt

    r14698 r14936  
    11
    2                     DIM version 20r4 Release Notes
     2                    DIM version 20r5 Release Notes
    33
    44Notes 1 and 2 for Unix Users only
     
    1717                Dns </dev/null >& dns.log &
    1818
    19 NOTE 3: The Version Number service provided by servers is now set to 2004.
     19NOTE 3: The Version Number service provided by servers is now set to 2005.
     20
     2121/12/2012
     22Changes for version 2005:
     23    - Moved the WebDID sources to the src directory and the VS settings to the Visual directory
     24    - In the Multithreaded (the default) version of DIM, signals are not touched anymore.
     25      Before they were masked/unmasked at every dim lock/unlock occurence.
     26    - Fixes in WebDID:
     27        - Now DIM nodes defined by an IP Address are shown properly (by IP Name)
     28        - WebDID looks for the Javascript files in the same directory where its executable is
     29          (independently of where it is started from)
     30
    2031
    213221/11/2012
     
    2839Changes for version 2003:
    2940    - Added the project settings for Visual Studio 10 in the Visual directory
     41    - Added a bin64 directory containing binaries for Windows7 (and 2008 R2) 64 bits
    3042    - Added a prototype webDid. in order to use it:
    3143        - In the same machine when the DIM DNS runs start <dim>/WebDid/webDid
  • trunk/FACT++/dim/dim/dim.h

    r14698 r14936  
    1414#include "dim_common.h"
    1515
    16 #define DIM_VERSION_NUMBER 2004
     16#define DIM_VERSION_NUMBER 2005
    1717
    1818
  • trunk/FACT++/dim/dim/dim_common.h

    r14575 r14936  
    124124#include <unistd.h>
    125125
    126 #define DISABLE_AST     sigset_t set, oset; sigemptyset(&set);\
     126#define DISABLE_SIG     sigset_t set, oset; sigemptyset(&set);\
    127127                                                sigaddset(&set,SIGIO);\
    128128                                                sigaddset(&set,SIGALRM);\
    129                                                 sigprocmask(SIG_BLOCK,&set,&oset);\
    130                                                 DIM_LOCK
    131 #define ENABLE_AST      DIM_UNLOCK sigprocmask(SIG_SETMASK,&oset,0);
     129                                                sigprocmask(SIG_BLOCK,&set,&oset);
     130#define ENABLE_SIG      sigprocmask(SIG_SETMASK,&oset,0);
    132131
    133132#ifdef VxWorks
     133#define DISABLE_AST     DISABLE_SIG DIM_LOCK
     134#define ENABLE_AST      DIM_UNLOCK ENABLE_SIG
    134135#define DIM_LOCK taskLock();
    135136#define DIM_UNLOCK taskUnlock();
     
    144145_DIM_PROTOE( void dim_signal_cond,      () );
    145146
     147#define DISABLE_AST     DIM_LOCK
     148#define ENABLE_AST      DIM_UNLOCK
    146149#define DIM_LOCK        dim_lock();
    147150#define DIM_UNLOCK      dim_unlock();
    148151
    149152#else
     153#include <time.h>
     154#define DISABLE_AST     DISABLE_SIG DIM_LOCK
     155#define ENABLE_AST      DIM_UNLOCK ENABLE_SIG
    150156#define DIM_LOCK
    151157#define DIM_UNLOCK
  • trunk/FACT++/dim/src/benchmark/benchClient.cxx

    r11071 r14936  
    2323        }
    2424public :
    25         Service(char *name) : DimInfo(name,"--") {/*nReceived = 0;*/}
     25        Service(char *name) : DimInfo(name,(char *)"--") {/*nReceived = 0;*/}
    2626};
    2727
     
    3434        char *name, *format, *cltptr, *srvptr, clientName[128];
    3535
     36        if(argc){}
     37        if(argc){}
    3638        br.getServices("BENCH_SERVICE_*");
    3739
     
    4749        }
    4850        dic_get_id(clientName);
    49         if(cltptr = strchr(clientName,'@'))
     51        if((cltptr = strchr(clientName,'@')))
    5052                cltptr++;
    5153        sleep(5);
     
    5557
    5658        mps = NReceived/TEST_TIME;
    57         if(srvptr = strchr(ServerName,'@'))
     59        if((srvptr = strchr(ServerName,'@')))
    5860                srvptr++;
    5961        cout << "Benchmark from "<< srvptr << " to " << cltptr << " :" << endl;
  • trunk/FACT++/dim/src/benchmark/benchServer.cxx

    r11071 r14936  
    44#include <process.h>
    55#endif
     6#include <stdio.h>
    67
    78int main(int argc, char *argv[])
     
    1112        DimService **services;
    1213
     14        if(argc){}
    1315        sscanf(argv[1],"%d",&msgSize);
    1416        sscanf(argv[2],"%d",&nServices);
  • trunk/FACT++/dim/src/dim_thr.c

    r14698 r14936  
    535535
    536536{
     537        if(thread_ast){}
     538        if(tag){}
    537539        printf("dim_start_thread: not available\n");
    538540        return (dim_long)0;
     
    541543int dim_stop_thread(dim_long t_id)
    542544{
     545        if(t_id){}
    543546        printf("dim_stop_thread: not available\n");
    544547        return 0;
  • trunk/FACT++/dim/src/dtq.c

    r14575 r14936  
    844844        sigprocmask(SIG_UNBLOCK, &set, &oset);
    845845        Dtq_sleeping = 1;
    846         dtq_start_timer(secs, dtq_sleep_rout, (void *)123);
     846        dtq_start_timer(secs, dtq_sleep_rout, (dim_long)123);
    847847    do{
    848848                pause();
  • trunk/FACT++/dim/src/examples/test_server.c

    r14698 r14936  
    126126        id = dis_add_service( aux, "l:3;d:1;s:1;c:1;s:1;f:1;c:20", &t, sizeof(t),
    127127                (void *)0, 0 );
     128        if(id){}
    128129        sprintf(aux,"%s/TEST_CMD",argv[1]);
    129130        dis_add_cmnd(aux,"l:3;d:1;s:1;c:1;s:1;f:1;c:20",cmnd_rout, 0);
     
    178179                */
    179180                sleep(10);
     181/*
    180182                dis_update_service(id);
     183*/
    181184/*             
    182185                for(i = 1; i <= 200; i++)
Note: See TracChangeset for help on using the changeset viewer.