Mail Archives: cygwin/2012/02/16/10:57:51
--------------010907030305050202020002
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
On 2/16/2012 6:09 AM, Corinna Vinschen wrote:
> On Feb 15 14:14, David Rothenberger wrote:
>> On 2/15/2012 1:20 PM, Corinna Vinschen wrote:
>>> On Feb 15 13:15, David Rothenberger wrote:
>>>> On 2/15/2012 12:45 PM, Corinna Vinschen wrote:
>>>>> On Feb 15 11:39, David Rothenberger wrote:
>>>>>> But... now one of the flock tests is failing. It takes a while to
>>>>>> extract a STC from the APR test suite because everything is written in
>>>>>> APR-ese and I have to convert every APR call into the base C library
>>>>>> calls. I'll work on that over the next day or three.
>>>>>>
>>>>>> The gist of the test that's failing is this:
>>>>>>
>>>>>> * Create a file.
>>>>>> * Get an exclusive flock on it.
>>>>>> * Spawn a child process that attempts to get an exclusive, non-blocking
>>>>>> lock on the file.
>>>>>>
>>>>>> The test is expecting that the child will not be able to get the lock,
>>>>>> but the child is able to.
>>>>> [...]
>>>>> Does it fork/exec or does it only exec?
>>>>
>>>> Looks like fork/exec. execv to be precise.
>>>>
>>>>> I guess I really need the testcase.
>>>> [...]
>
> I read the Linux man page again (http://linux.die.net/man/2/flock)
> and I just hacked the following testcase, based on your flock STC.
That sounds pretty close to what the APR test case is doing, as far as I
understand.
> The testcase is attached. I'm pretty curious what your test is actually
> testing.
I got to work at my real job all last night, so couldn't extract the STC
from the APR test suite. But, here's the test in APR-ese in case you're
interested. I'll remove the APRisms as soon as I can to get you another
test case.
--
David Rothenberger ---- daveroth AT acm DOT org
--------------010907030305050202020002
Content-Type: text/plain;
name="testflock.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="testflock.c"
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "testflock.h"
#include "testutil.h"
#include "apr_pools.h"
#include "apr_thread_proc.h"
#include "apr_file_io.h"
#include "apr_file_info.h"
#include "apr_general.h"
#include "apr_strings.h"
static int launch_reader(abts_case *tc)
{
apr_proc_t proc = {0};
apr_procattr_t *procattr;
const char *args[2];
apr_status_t rv;
apr_exit_why_e why;
int exitcode;
rv = apr_procattr_create(&procattr, p);
APR_ASSERT_SUCCESS(tc, "Couldn't create procattr", rv);
rv = apr_procattr_io_set(procattr, APR_NO_PIPE, APR_NO_PIPE,
APR_NO_PIPE);
APR_ASSERT_SUCCESS(tc, "Couldn't set io in procattr", rv);
rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV);
APR_ASSERT_SUCCESS(tc, "Couldn't set copy environment", rv);
rv = apr_procattr_error_check_set(procattr, 1);
APR_ASSERT_SUCCESS(tc, "Couldn't set error check in procattr", rv);
args[0] = "tryread" EXTENSION;
args[1] = NULL;
rv = apr_proc_create(&proc, TESTBINPATH "tryread" EXTENSION, args, NULL, procattr, p);
APR_ASSERT_SUCCESS(tc, "Couldn't launch program", rv);
ABTS_ASSERT(tc, "wait for child process",
apr_proc_wait(&proc, &exitcode, &why, APR_WAIT) == APR_CHILD_DONE);
ABTS_ASSERT(tc, "child terminated normally", why == APR_PROC_EXIT);
return exitcode;
}
static void test_withlock(abts_case *tc, void *data)
{
apr_file_t *file;
apr_status_t rv;
int code;
rv = apr_file_open(&file, TESTFILE, APR_FOPEN_WRITE|APR_FOPEN_CREATE,
APR_OS_DEFAULT, p);
APR_ASSERT_SUCCESS(tc, "Could not create file.", rv);
ABTS_PTR_NOTNULL(tc, file);
rv = apr_file_lock(file, APR_FLOCK_EXCLUSIVE);
APR_ASSERT_SUCCESS(tc, "Could not lock the file.", rv);
ABTS_PTR_NOTNULL(tc, file);
code = launch_reader(tc);
ABTS_INT_EQUAL(tc, FAILED_READ, code);
(void) apr_file_close(file);
}
static void test_withoutlock(abts_case *tc, void *data)
{
int code;
code = launch_reader(tc);
ABTS_INT_EQUAL(tc, SUCCESSFUL_READ, code);
}
static void remove_lockfile(abts_case *tc, void *data)
{
APR_ASSERT_SUCCESS(tc, "Couldn't remove lock file.",
apr_file_remove(TESTFILE, p));
}
abts_suite *testflock(abts_suite *suite)
{
suite = ADD_SUITE(suite)
abts_run_test(suite, test_withlock, NULL);
abts_run_test(suite, test_withoutlock, NULL);
abts_run_test(suite, remove_lockfile, NULL);
return suite;
}
--------------010907030305050202020002
Content-Type: text/plain;
name="testflock.h"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="testflock.h"
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef TESTFLOCK
#define TESTFLOCK
#define TESTFILE "data/testfile.lock"
#define FAILED_READ 0
#define SUCCESSFUL_READ 1
#define UNEXPECTED_ERROR 2
#endif
--------------010907030305050202020002
Content-Type: text/plain;
name="tryread.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="tryread.c"
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "testflock.h"
#include "apr_pools.h"
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr.h"
#if APR_HAVE_STDLIB_H
#include <stdlib.h>
#endif
int main(int argc, const char * const *argv)
{
apr_file_t *file;
apr_status_t status;
apr_pool_t *p;
apr_initialize();
apr_pool_create(&p, NULL);
if (apr_file_open(&file, TESTFILE, APR_FOPEN_WRITE, APR_OS_DEFAULT, p)
!= APR_SUCCESS) {
exit(UNEXPECTED_ERROR);
}
status = apr_file_lock(file, APR_FLOCK_EXCLUSIVE | APR_FLOCK_NONBLOCK);
if (status == APR_SUCCESS) {
exit(SUCCESSFUL_READ);
}
if (APR_STATUS_IS_EAGAIN(status)) {
exit(FAILED_READ);
}
exit(UNEXPECTED_ERROR);
}
--------------010907030305050202020002
Content-Type: text/plain; charset=us-ascii
--
Problem reports: http://cygwin.com/problems.html
FAQ: http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
--------------010907030305050202020002--
- Raw text -