← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Monty Taylor
  • Date: 2010-04-01 18:07:18 UTC
  • mto: (1471.3.2 drizzled-as-lib)
  • mto: This revision was merged to the branch mainline in revision 1479.
  • Revision ID: mordred@inaugust.com-20100401180718-26vblit959akf527
Merged in revs removing depend on the plugin tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/main.cc
153
153
                        "core file on signals"));
154
154
  }
155
155
  (void) sigemptyset(&set);
156
 
  set_signal(SIGPIPE,SIG_IGN);
 
156
  ignore_signal(SIGPIPE);
157
157
  sigaddset(&set,SIGPIPE);
158
158
#ifndef IGNORE_SIGHUP_SIGQUIT
159
159
  sigaddset(&set,SIGQUIT);
165
165
  sigemptyset(&sa.sa_mask);
166
166
  sa.sa_flags = 0;
167
167
  sa.sa_handler = drizzled_print_signal_warning;
168
 
  sigaction(SIGTERM, &sa, (struct sigaction*) 0);
 
168
  sigaction(SIGTERM, &sa, NULL);
169
169
  sa.sa_flags = 0;
170
170
  sa.sa_handler = drizzled_print_signal_warning;
171
 
  sigaction(SIGHUP, &sa, (struct sigaction*) 0);
 
171
  sigaction(SIGHUP, &sa, NULL);
172
172
#ifdef SIGTSTP
173
173
  sigaddset(&set,SIGTSTP);
174
174
#endif
175
175
  if (test_flags.test(TEST_SIGINT))
176
176
  {
177
 
    set_signal(thr_kill_signal, drizzled_end_thread_signal);
 
177
    sa.sa_flags= 0;
 
178
    sa.sa_handler= drizzled_end_thread_signal;
 
179
    sigaction(thr_kill_signal, &sa, NULL);
 
180
 
178
181
    // May be SIGINT
179
182
    sigdelset(&set, thr_kill_signal);
180
183
  }
182
185
    sigaddset(&set,SIGINT);
183
186
  sigprocmask(SIG_SETMASK,&set,NULL);
184
187
  pthread_sigmask(SIG_SETMASK,&set,NULL);
185
 
  return;;
 
188
  return;
186
189
}
187
190
 
188
191