10 years agockarrayindex: Move to new header
Ramprasad Venkataraman [Wed, 8 Jun 2011 21:16:13 +0000 (16:16 -0500)]
ckarrayindex: Move to new header

10 years agoarray index: All indices (1D..6D) now use base class init()
Ramprasad Venkataraman [Tue, 7 Jun 2011 17:01:19 +0000 (12:01 -0500)]
array index: All indices (1D..6D) now use base class init()

10 years agoarray index: Provide protected init methods for array indices
Ramprasad Venkataraman [Tue, 7 Jun 2011 17:00:18 +0000 (12:00 -0500)]
array index: Provide protected init methods for array indices

10 years agoarray index: Introduce a union-friendly base class for ckarrayindex
Ramprasad Venkataraman [Thu, 2 Jun 2011 22:05:37 +0000 (17:05 -0500)]
array index: Introduce a union-friendly base class for ckarrayindex

There are only three entities in the charm codebase that put an array
index within a union:
    - envelope
    - callbacks
    - ckobjid

Create a base class that is used just by these three entities. CkArrayIndex is
now a safe and usable index class as it sports constructors, initialization
etc.  The remainder of the codebase and charm applications can and should use
the CkArrayIndex class.

Just at locations where the index objects in unions are handled, we provide a
somewhat "risky" cast operation from base to derived. This should be less
insane than casting across unrelated classes, which was the root of the
perennial problems with the original CkArrayIndex, IndexMax and IndexStruct
setup. However, we should actively explore mechanisms whereby even such casts
can be avoided without too much time/space costs.

10 years agockarrayindex: Delete child class copy assignment operators
Ramprasad Venkataraman [Wed, 1 Jun 2011 22:21:37 +0000 (17:21 -0500)]
ckarrayindex: Delete child class copy assignment operators

Since the index object is now as good as POD, allow the compiler
to generate its default copy assignment operator.

10 years agoUpdate docs to note that CkArrayIndexMax should be deprecated and removed
Ramprasad Venkataraman [Wed, 1 Jun 2011 20:50:33 +0000 (15:50 -0500)]
Update docs to note that CkArrayIndexMax should be deprecated and removed

10 years agoReplace all occurrences of CkArrayIndexMax with CkArrayIndex
Ramprasad Venkataraman [Wed, 1 Jun 2011 19:53:14 +0000 (14:53 -0500)]
Replace all occurrences of CkArrayIndexMax with CkArrayIndex

Leave a typedef behind so that applications that use CkArrayIndexMax can still
take their time to stop using it

10 years agockarrayindex: pretty indent and code docs
Ramprasad Venkataraman [Wed, 1 Jun 2011 18:15:44 +0000 (13:15 -0500)]
ckarrayindex: pretty indent and code docs

10 years agockarrayindex: Return combined count only for dense (upto 3D) arrays
Ramprasad Venkataraman [Wed, 1 Jun 2011 17:58:30 +0000 (12:58 -0500)]
ckarrayindex: Return combined count only for dense (upto 3D) arrays

Code for the creation of dense multi-dimensional chare arrays uses an array
index object to store the dimensions of the array.

The index object sports a funny method introduced to support such use. Ensure
that it returns a count on the number of array elements only for arrays upto 3D
(which are created dense by default).

10 years agockarrayindex: Always use operator== for comparisons
Ramprasad Venkataraman [Wed, 1 Jun 2011 17:42:01 +0000 (12:42 -0500)]
ckarrayindex: Always use operator== for comparisons

Also consolidate member function definitions to single location

10 years agockarrayindex: Delete copyFrom method thats no longer needed
Ramprasad Venkataraman [Wed, 1 Jun 2011 15:39:44 +0000 (10:39 -0500)]
ckarrayindex: Delete copyFrom method thats no longer needed

10 years agockarrayindexmax: Delete class and make the name synonymous with base class
Ramprasad Venkataraman [Tue, 31 May 2011 21:25:19 +0000 (16:25 -0500)]
ckarrayindexmax: Delete class and make the name synonymous with base class

CkArrayIndexMax existed because charm permitted array index objects of
different sizes and the Max object could hold the largest of them.  However,
recently charm has moved to support only a single-sized array index object and
hence the Max class has become vestigial.

Delete the class, and typedef CkArrayIndexMax to be synonymous with CkArrayIndex.
Code should eventually be cleaned to replace all references to Max, but the
typedef exists until then.

10 years agockarrayindexmax: Move trivial print methods to base class
Ramprasad Venkataraman [Tue, 31 May 2011 20:37:46 +0000 (15:37 -0500)]
ckarrayindexmax: Move trivial print methods to base class

10 years agockarrayindexmax: Move method getProjectionID() to base class
Ramprasad Venkataraman [Tue, 31 May 2011 20:12:45 +0000 (15:12 -0500)]
ckarrayindexmax: Move method getProjectionID() to base class

10 years agockarrayindexmax: Defer to base class pup
Ramprasad Venkataraman [Tue, 31 May 2011 19:46:45 +0000 (14:46 -0500)]
ckarrayindexmax: Defer to base class pup

10 years agockarrayindexmax: Move methods to base class
Ramprasad Venkataraman [Tue, 31 May 2011 18:51:15 +0000 (13:51 -0500)]
ckarrayindexmax: Move methods to base class

copyFrom() and operator== can belong in the base class

10 years agofixed a bug on multiple processors because variable is not initialized
YanhuaSun [Mon, 6 Jun 2011 04:53:58 +0000 (23:53 -0500)]
fixed a bug on multiple processors because variable is not initialized

10 years agoTSP problem fixed
YanhuaSun [Mon, 6 Jun 2011 02:21:17 +0000 (21:21 -0500)]
TSP problem fixed

10 years agoError check for inputs and some minor bugs
nikhil [Wed, 1 Jun 2011 19:39:41 +0000 (14:39 -0500)]
Error check for inputs and some minor bugs

10 years agoFix translate function
nikhil [Wed, 1 Jun 2011 19:27:50 +0000 (14:27 -0500)]
Fix translate function

10 years agofixed link time error caused by using_printCS in converse program.
Gengbin Zheng [Wed, 1 Jun 2011 06:03:51 +0000 (01:03 -0500)]
fixed link time error caused by using_printCS in converse program.

10 years agockarrayindex: Remove all occurrences of asMax()
Ramprasad Venkataraman [Tue, 31 May 2011 22:17:58 +0000 (17:17 -0500)]
ckarrayindex: Remove all occurrences of asMax()

10 years agodisable optimized multicast in bluegenep as it not necessarily gives best performance...
Chao Mei [Tue, 31 May 2011 20:31:05 +0000 (15:31 -0500)]
disable optimized multicast in bluegenep as it not necessarily gives best performance according to Sameer Kumar, and not work in all input cases

10 years agoMerge branch 'ramv/exorcise-arrayindex-bug' into charm
Ramprasad Venkataraman [Tue, 31 May 2011 16:00:45 +0000 (11:00 -0500)]
Merge branch 'ramv/exorcise-arrayindex-bug' into charm

Eliminate CkArrayIndexStruct and consolidate array index data
structures into one class hierarchy. The base class CkArrayIndex
now participates in unions and has shed its constructors.

10 years agockarrayindex: Add instantiation warning to code docs
Ramprasad Venkataraman [Tue, 31 May 2011 15:39:58 +0000 (10:39 -0500)]
ckarrayindex: Add instantiation warning to code docs

10 years agoRemove all traces of CkArrayIndexStruct. Avoid dangerous pointer casts
Ramprasad Venkataraman [Tue, 26 Apr 2011 18:05:01 +0000 (13:05 -0500)]
Remove all traces of CkArrayIndexStruct. Avoid dangerous pointer casts

10 years agockobjid: Use CkArrayIndex instead of CkArrayIndexStruct
Ramprasad Venkataraman [Tue, 26 Apr 2011 17:56:12 +0000 (12:56 -0500)]
ckobjid: Use CkArrayIndex instead of CkArrayIndexStruct

Needs further testing from fault tolerance subgroup

10 years agocharmdebug: Use CkArrayIndex instead of CkArrayIndexStruct
Ramprasad Venkataraman [Tue, 26 Apr 2011 17:26:36 +0000 (12:26 -0500)]
charmdebug: Use CkArrayIndex instead of CkArrayIndexStruct

10 years agoenvelope: For array indices store a base class (CkArrayIndex) object and not CkArrayI...
Ramprasad Venkataraman [Tue, 26 Apr 2011 17:12:48 +0000 (12:12 -0500)]
envelope: For array indices store a base class (CkArrayIndex) object and not CkArrayIndexStruct

This is a big step in the effort to get rid of CkArrayIndexStruct and all the dangerous
pointer casts that accompany it

10 years agockcallback: Use a CkArrayIndex base class object instead of CkArrayIndexStruct
Ramprasad Venkataraman [Fri, 22 Apr 2011 20:15:21 +0000 (15:15 -0500)]
ckcallback: Use a CkArrayIndex base class object instead of CkArrayIndexStruct

CkCallback has a union of data based on the different callback types. One of
these if for callbacks that go to array elements. This required storing an
array index in the union with the resulting stipulation that the stored index
object should not have any default constructors.  A CkArrayIndexStruct class
has existed in the codebase expressly for such situations. Because this class
has no relation to the hierarchy of 'normal' array index classes, dangerous
pointer casts have been the norm.

Because of such risky casts, this snippet of code in the callback has been
plagued with heisenbugs over many years, as compilers get stricter and exhibit
greater personality variations across brands and architectures. OpenAtom has
exposed the bugs a couple of times in the last couple of years.

To fix this issue for good (hopefully), the objective is to not cast across
unrelated class hierarchies, but rather make the base class amenable to
participation in a union.  This should help get rid of classes that existed
purely for such silly hacks to enable charm functionality.

10 years agockarrayindex: Remove all base class constructors
Ramprasad Venkataraman [Fri, 22 Apr 2011 20:00:01 +0000 (15:00 -0500)]
ckarrayindex: Remove all base class constructors

Putting an object in a union requires that the class not have any constructors.
Removing all base class constructors will mean that the array index base class
can now participate in a union; thus removing all purpose for the existence of
a CkArrayIndexStruct.

10 years agoadded a declearation
Yanhua Sun [Sun, 29 May 2011 10:48:53 +0000 (02:48 -0800)]
added a declearation

10 years agoweird mistake. two lines are wrongly deleted. added them now
Yanhua Sun [Sun, 29 May 2011 10:41:42 +0000 (02:41 -0800)]
weird mistake. two lines are wrongly deleted. added them now

10 years agoadd a function which is called before program exit to output statistic
Yanhua Sun [Sun, 29 May 2011 10:25:48 +0000 (02:25 -0800)]
add a function which is called before program exit to output statistic

10 years agoMulticast component to ckgraph
Nikhil Jain [Fri, 27 May 2011 22:02:28 +0000 (17:02 -0500)]
Multicast component to ckgraph

10 years agoEdits to xlc compiler options.
Sameer Kumar [Fri, 27 May 2011 17:42:52 +0000 (12:42 -0500)]
Edits to xlc compiler options.

10 years agoPOSE: Match printf/scanf formats to arguments to silence warnings
Phil Miller [Fri, 27 May 2011 17:42:16 +0000 (12:42 -0500)]
POSE: Match printf/scanf formats to arguments to silence warnings

10 years agoreset group dep field when reset envelope for recycling.
Gengbin Zheng [Fri, 27 May 2011 17:20:23 +0000 (12:20 -0500)]
reset group dep field when reset envelope for recycling.

10 years agoCharacterize smp bug by clarifying Eric's test to create single chare array
Ramprasad Venkataraman [Fri, 27 May 2011 16:44:13 +0000 (11:44 -0500)]
Characterize smp bug by clarifying Eric's test to create single chare array

The hang bug in smp mode happens on lab machines even with a single chare array.
Hence create just one in the test

10 years agonew test to demonstrate a race condition
Eric Bohm [Fri, 27 May 2011 03:10:45 +0000 (22:10 -0500)]
new test to demonstrate a race condition

10 years agoTests megacon: Match int sizes to pointer parameters to quiet warnings
Phil Miller [Thu, 26 May 2011 23:23:55 +0000 (18:23 -0500)]
Tests megacon: Match int sizes to pointer parameters to quiet warnings

10 years agoTests: Silence a type conversion warning
Phil Miller [Thu, 26 May 2011 23:19:41 +0000 (18:19 -0500)]
Tests: Silence a type conversion warning

10 years agoPOSE stats: De-duplicate printing code
Phil Miller [Thu, 26 May 2011 23:19:13 +0000 (18:19 -0500)]
POSE stats: De-duplicate printing code

10 years agoEnable Charm++/Converse build identification from program output
Phil Miller [Wed, 25 May 2011 23:07:02 +0000 (18:07 -0500)]
Enable Charm++/Converse build identification from program output

When making anything in the base build directory, check whether any
code has been changed or commited, and generate a version string
accordingly. Embed this string in a standalone object linked into
converse. Print the string at startup.

10 years agoMerge remote branch 'origin/machine-common-codes' into charm
Phil Miller [Thu, 26 May 2011 20:16:38 +0000 (15:16 -0500)]
Merge remote branch 'origin/machine-common-codes' into charm

10 years ago1. make the dynamic cap parameter configurable by reading from command line
Chao Mei [Wed, 25 May 2011 22:18:59 +0000 (17:18 -0500)]
1. make the dynamic cap parameter configurable by reading from command line

2. simplified the send op for both non-SMP and SMP that they share the same
   code of calling MPI_Isend function

10 years agosmall change to typed reductions
Pritish Jetley [Wed, 25 May 2011 20:23:30 +0000 (15:23 -0500)]
small change to typed reductions

10 years agoremoved commented section in 3.16; it seemed to be causing a blank code box to be...
Pritish Jetley [Wed, 25 May 2011 19:09:09 +0000 (14:09 -0500)]
removed commented section in 3.16; it seemed to be causing a blank code box to be rendered.

10 years agochanges to sections 3.14,3.15 and 3.16 of Charm++ manual
Pritish Jetley [Wed, 25 May 2011 19:03:33 +0000 (14:03 -0500)]
changes to sections 3.14,3.15 and 3.16 of Charm++ manual

10 years agodisable MPI_POST_RECV in default
Chao Mei [Mon, 23 May 2011 21:40:45 +0000 (16:40 -0500)]
disable MPI_POST_RECV in default

10 years agoadded printing out the description of the error number when creating the sts file
Chao Mei [Mon, 23 May 2011 21:31:37 +0000 (16:31 -0500)]
added printing out the description of the error number when creating the sts file

10 years agomake the parsing of #pes and #ppns more accurate as numbers should follow +p or
Chao Mei [Mon, 23 May 2011 19:35:28 +0000 (14:35 -0500)]
make the parsing of #pes and #ppns more accurate as numbers should follow +p or

10 years agomake the parameters regarding post_recv configurable through command line options
Chao Mei [Mon, 23 May 2011 19:33:25 +0000 (14:33 -0500)]
make the parameters regarding post_recv configurable through command line options

10 years agoTLS and other changes to AMPI manual
Ehsan Totoni [Thu, 19 May 2011 17:10:15 +0000 (12:10 -0500)]
TLS and other changes to AMPI manual

10 years agofixed a subtle bug in handling immediate msg in SMP mode when there's only one worker...
Chao Mei [Thu, 19 May 2011 07:01:54 +0000 (02:01 -0500)]
fixed a subtle bug in handling immediate msg in SMP mode when there's only one worker thread

10 years agochange root to int if error checking is enabled
Chao Mei [Thu, 19 May 2011 04:45:59 +0000 (23:45 -0500)]
change root to int if error checking is enabled

10 years agoFixed the optimized multicast for non-SMP, but the DCMF_multicast interface is
Chao Mei [Sun, 15 May 2011 23:21:38 +0000 (18:21 -0500)]
Fixed the optimized multicast for non-SMP, but the DCMF_multicast interface is
not suitable for SMP mode.

10 years agofixed typos in re-defining macros
Chao Mei [Sun, 15 May 2011 01:44:50 +0000 (20:44 -0500)]
fixed typos in re-defining macros

10 years agoAdded the empty implementation for MachinePostNonLocal
Chao Mei [Sat, 14 May 2011 21:48:55 +0000 (21:48 +0000)]
Added the empty implementation for MachinePostNonLocal

10 years agoadded empty implementation for CmiBarrier and CmiBarrierZero as in the old one
Chao Mei [Sat, 14 May 2011 21:30:07 +0000 (16:30 -0500)]
added empty implementation for CmiBarrier and CmiBarrierZero as in the old one

10 years agoa very rought draft of a template for machine-specific implementation
Chao Mei [Fri, 13 May 2011 23:19:38 +0000 (18:19 -0500)]
a very rought draft of a template for machine-specific implementation

10 years agoFirst check-in for the work on extractin common codes from MPI, LAPI and DCMF layer...
Chao Mei [Fri, 13 May 2011 23:10:21 +0000 (18:10 -0500)]
First check-in for the work on extractin common codes from MPI, LAPI and DCMF layer. MPI and LAPI work both in SMP and non-SMP mode. DCMF got compiled in both modes, but has not been tested yet.

10 years agoMerge branch 'charm' of charmgit:charm into charm
Ehsan Totoni [Thu, 12 May 2011 21:03:52 +0000 (16:03 -0500)]
Merge branch 'charm' of charmgit:charm into charm

10 years agoampi manual changes and additions
Ehsan Totoni [Thu, 12 May 2011 21:03:32 +0000 (16:03 -0500)]
ampi manual changes and additions

10 years agoinitialize messages at construction time where possible to avoid
Eric Bohm [Thu, 12 May 2011 19:48:59 +0000 (14:48 -0500)]
initialize messages at construction time where possible to avoid
tripping over valgrind uninitialized complaints

10 years agofixed a bug when code in trapped CkWaitFuture(), the future can changed when the...
Gengbin Zheng [Thu, 12 May 2011 18:13:27 +0000 (13:13 -0500)]
fixed a bug when code in trapped CkWaitFuture(), the future can changed when the future array is expanded. Therefore, CkWaitFuture may trap forever since it is checking an invalid place.

10 years agoFix bug which caused -only -footest runs to hang.
Eric Bohm [Wed, 11 May 2011 20:14:15 +0000 (15:14 -0500)]
Fix bug which caused -only -footest runs to hang.

10 years agoadded +WSPriority to workstealing seedlb, which steal higher priority tasks.
Gengbin Zheng [Wed, 11 May 2011 19:00:00 +0000 (14:00 -0500)]
added +WSPriority to workstealing seedlb, which steal higher priority tasks.

10 years agoadded rule to build ws version.
Gengbin Zheng [Wed, 11 May 2011 18:57:21 +0000 (13:57 -0500)]
added rule to build ws version.

10 years agofixed a missing return bug
Gengbin Zheng [Wed, 11 May 2011 17:07:35 +0000 (12:07 -0500)]
fixed a missing return bug

10 years agoMerge branch 'charm' of charmgit:charm into charm
YanhuaSun [Wed, 11 May 2011 06:35:35 +0000 (01:35 -0500)]
Merge branch 'charm' of charmgit:charm into charm

10 years agoFixed TSP example
YanhuaSun [Wed, 11 May 2011 06:35:09 +0000 (01:35 -0500)]
Fixed TSP example

10 years agoFixed errors due to ckfuture interface changes
Chao Mei [Wed, 11 May 2011 01:19:50 +0000 (20:19 -0500)]
Fixed errors due to ckfuture interface changes

10 years agoper Sanjay's request, added an opaque strcture CkFuture, and exposed function API.
Gengbin Zheng [Tue, 10 May 2011 18:04:52 +0000 (13:04 -0500)]
per Sanjay's request, added an opaque strcture CkFuture, and exposed function API.

10 years agominor change to balanced tree example
YanhuaSun [Tue, 10 May 2011 16:51:14 +0000 (11:51 -0500)]
minor change to balanced tree example

10 years agoDelete obsolete machine layers
Phil Miller [Mon, 9 May 2011 19:31:32 +0000 (14:31 -0500)]
Delete obsolete machine layers

The following machine types (interconnect, OS, or architecture) are
believe to no longer have even possible users:


10 years agominor change to TSP example
YanhuaSun [Mon, 9 May 2011 05:08:37 +0000 (00:08 -0500)]
minor change to TSP example

10 years agoRevert "minor change to TSP example"
YanhuaSun [Mon, 9 May 2011 05:05:37 +0000 (00:05 -0500)]
Revert "minor change to TSP example"

This reverts commit c4d68132bb62c56c835872ae331077b9132ec5c2.

10 years agoMerge branch 'charm' of charmgit:charm into charm
YanhuaSun [Mon, 9 May 2011 04:51:53 +0000 (23:51 -0500)]
Merge branch 'charm' of charmgit:charm into charm

10 years agominor change to TSP example
YanhuaSun [Mon, 9 May 2011 04:51:21 +0000 (23:51 -0500)]
minor change to TSP example

10 years agoampi manual overview update
Ehsan Totoni [Mon, 9 May 2011 00:19:48 +0000 (19:19 -0500)]
ampi manual overview update

10 years agouse pdflatex instead of latex to make manuals (solve error on figs)
Ehsan Totoni [Mon, 9 May 2011 00:05:48 +0000 (19:05 -0500)]
use pdflatex instead of latex to make manuals (solve error on figs)

10 years agofix compilation error
Abhinav S Bhatele [Sat, 7 May 2011 13:15:45 +0000 (08:15 -0500)]
fix compilation error

10 years agoQuiet string literal constness warnings
Phil Miller [Fri, 6 May 2011 22:18:40 +0000 (17:18 -0500)]
Quiet string literal constness warnings

Since we're about to exec, it's safe to waste a bit of memory making
mutable copies of some literal strings.

10 years agoCast size_t to int before negating it, to silence warnings
Phil Miller [Fri, 6 May 2011 18:50:35 +0000 (13:50 -0500)]
Cast size_t to int before negating it, to silence warnings

We can be pretty confident that the size of the two structs will be in
int's range, so the cast will preserve its value.

10 years agoMerge branch 'charm' of charmgit:charm into charm
YanhuaSun [Fri, 6 May 2011 06:09:45 +0000 (01:09 -0500)]
Merge branch 'charm' of charmgit:charm into charm

10 years agochanges to TSP
YanhuaSun [Fri, 6 May 2011 06:09:33 +0000 (01:09 -0500)]
changes to TSP

10 years agoPrint small sizes as ints, to avoid size_t's printf portability morass
Phil Miller [Thu, 5 May 2011 22:20:52 +0000 (17:20 -0500)]
Print small sizes as ints, to avoid size_t's printf portability morass

Calling printf("%d", sizeof(Foo)) generates warnings, because size_t
is often not an int. We want to squelch all the warnings we're seeing,
but unfortunately, the standard %zd size modifier isn't available on
windows. Since Foo in this case is the small struct _Slot, we don't
need to worry about overflow, and can just shorten its size to int.

10 years agoMatch printf int length specifiers to arguments
Phil Miller [Thu, 5 May 2011 21:55:51 +0000 (16:55 -0500)]
Match printf int length specifiers to arguments

10 years agoMerge branch 'charm' of charmgit:/charm into charm
Ehsan Totoni [Thu, 5 May 2011 22:17:21 +0000 (17:17 -0500)]
Merge branch 'charm' of charmgit:/charm into charm

10 years agoAMPI manual intro
Ehsan Totoni [Thu, 5 May 2011 22:16:49 +0000 (17:16 -0500)]
AMPI manual intro

10 years agoDon't print pointers as ints, to quiet a warning
Phil Miller [Thu, 5 May 2011 21:45:18 +0000 (16:45 -0500)]
Don't print pointers as ints, to quiet a warning

10 years agopplmanual errors fixed, now manuals (like ampi) can be built
Ehsan Totoni [Thu, 5 May 2011 19:14:34 +0000 (14:14 -0500)]
pplmanual errors fixed, now manuals (like ampi) can be built

10 years agoMerge branch 'charm' of charmgit:charm into charm
Chao Mei [Thu, 5 May 2011 17:29:51 +0000 (12:29 -0500)]
Merge branch 'charm' of charmgit:charm into charm

10 years agoRe-organized the code segments. In particular, the timer & barrier functions are...
Chao Mei [Thu, 5 May 2011 17:27:40 +0000 (12:27 -0500)]
Re-organized the code segments. In particular, the timer & barrier functions are moved to the end of the file after CmiMyRank has been defined.

10 years agobuild token queue using priorities, sorted in ascend order.
Gengbin Zheng [Thu, 5 May 2011 07:34:04 +0000 (02:34 -0500)]
build token queue using priorities, sorted in ascend order.

10 years agoa handy function CqsPrioGT_ to compare two priorities without having to build the...
Gengbin Zheng [Thu, 5 May 2011 07:33:14 +0000 (02:33 -0500)]
a handy function CqsPrioGT_ to compare two priorities without having to build the _prio struct

10 years agoMerge branch 'charm' of charmgit:charm into charm
YanhuaSun [Thu, 5 May 2011 04:03:32 +0000 (23:03 -0500)]
Merge branch 'charm' of charmgit:charm into charm

10 years agoadd data for Tsp problem
YanhuaSun [Thu, 5 May 2011 04:03:21 +0000 (23:03 -0500)]
add data for Tsp problem

10 years agoPass a character array, and not its address, to fscanf()
Phil Miller [Thu, 5 May 2011 00:14:21 +0000 (19:14 -0500)]
Pass a character array, and not its address, to fscanf()

Address a warning about passing a pointer to a character array, rather
than the array itself, to a function expecting char*.