Changeset - 4f06b2901885
[Not reviewed]
default
0 3 0
LordOfWar - 16 years ago 2009-12-21 18:19:24

finished up XMLness of usr_mgr, as far as I can tell its finished and some code needs to be added to main() to test it.
3 files changed with 191 insertions and 51 deletions:
0 comments (0 inline, 0 general)
INSTALL
Show inline comments
 
Installation Instructions
 
*************************
 

	
 
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 
Software Foundation, Inc.
 
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 

	
 
This file is free documentation; the Free Software Foundation gives
 
   This file is free documentation; the Free Software Foundation gives
 
unlimited permission to copy, distribute and modify it.
 

	
 
Basic Installation
 
==================
 

	
 
These are generic installation instructions.
 
   Briefly, the shell commands `./configure; make; make install' should
 
configure, build, and install this package.  The following
 
more-detailed instructions are generic; see the `README' file for
 
instructions specific to this package.
 

	
 
   The `configure' shell script attempts to guess correct values for
 
various system-dependent variables used during compilation.  It uses
 
@@ -23,9 +26,9 @@ debugging `configure').
 

	
 
   It can also use an optional file (typically called `config.cache'
 
and enabled with `--cache-file=config.cache' or simply `-C') that saves
 
the results of its tests to speed up reconfiguring.  (Caching is
 
the results of its tests to speed up reconfiguring.  Caching is
 
disabled by default to prevent problems with accidental use of stale
 
cache files.)
 
cache files.
 

	
 
   If you need to do unusual things to compile the package, please try
 
to figure out how `configure' could check whether to do them, and mail
 
@@ -35,20 +38,17 @@ some point `config.cache' contains resul
 
may remove or edit it.
 

	
 
   The file `configure.ac' (or `configure.in') is used to create
 
`configure' by a program called `autoconf'.  You only need
 
`configure.ac' if you want to change it or regenerate `configure' using
 
a newer version of `autoconf'.
 
`configure' by a program called `autoconf'.  You need `configure.ac' if
 
you want to change it or regenerate `configure' using a newer version
 
of `autoconf'.
 

	
 
The simplest way to compile this package is:
 

	
 
  1. `cd' to the directory containing the package's source code and type
 
     `./configure' to configure the package for your system.  If you're
 
     using `csh' on an old version of System V, you might need to type
 
     `sh ./configure' instead to prevent `csh' from trying to execute
 
     `configure' itself.
 
     `./configure' to configure the package for your system.
 

	
 
     Running `configure' takes awhile.  While running, it prints some
 
     messages telling which features it is checking for.
 
     Running `configure' might take a while.  While running, it prints
 
     some messages telling which features it is checking for.
 

	
 
  2. Type `make' to compile the package.
 

	
 
@@ -67,42 +67,57 @@ The simplest way to compile this package
 
     all sorts of other programs in order to regenerate files that came
 
     with the distribution.
 

	
 
  6. Often, you can also type `make uninstall' to remove the installed
 
     files again.
 

	
 
Compilers and Options
 
=====================
 

	
 
Some systems require unusual options for compilation or linking that the
 
`configure' script does not know about.  Run `./configure --help' for
 
details on some of the pertinent environment variables.
 
   Some systems require unusual options for compilation or linking that
 
the `configure' script does not know about.  Run `./configure --help'
 
for details on some of the pertinent environment variables.
 

	
 
   You can give `configure' initial values for configuration parameters
 
by setting variables in the command line or in the environment.  Here
 
is an example:
 

	
 
     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 

	
 
   *Note Defining Variables::, for more details.
 

	
 
Compiling For Multiple Architectures
 
====================================
 

	
 
You can compile the package for more than one kind of computer at the
 
   You can compile the package for more than one kind of computer at the
 
same time, by placing the object files for each architecture in their
 
own directory.  To do this, you must use a version of `make' that
 
supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 
own directory.  To do this, you can use GNU `make'.  `cd' to the
 
directory where you want the object files and executables to go and run
 
the `configure' script.  `configure' automatically checks for the
 
source code in the directory that `configure' is in and in `..'.
 

	
 
   If you have to use a `make' that does not support the `VPATH'
 
variable, you have to compile the package for one architecture at a
 
time in the source code directory.  After you have installed the
 
package for one architecture, use `make distclean' before reconfiguring
 
for another architecture.
 
   With a non-GNU `make', it is safer to compile the package for one
 
architecture at a time in the source code directory.  After you have
 
installed the package for one architecture, use `make distclean' before
 
reconfiguring for another architecture.
 

	
 
   On MacOS X 10.5 and later systems, you can create libraries and
 
executables that work on multiple system types--known as "fat" or
 
"universal" binaries--by specifying multiple `-arch' options to the
 
compiler but only a single `-arch' option to the preprocessor.  Like
 
this:
 

	
 
     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 
                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 
                 CPP="gcc -E" CXXCPP="g++ -E"
 

	
 
   This is not guaranteed to produce working output in all cases, you
 
may have to build one architecture at a time and combine the results
 
using the `lipo' tool if you have problems.
 

	
 
Installation Names
 
==================
 

	
 
By default, `make install' installs the package's commands under
 
   By default, `make install' installs the package's commands under
 
`/usr/local/bin', include files under `/usr/local/include', etc.  You
 
can specify an installation prefix other than `/usr/local' by giving
 
`configure' the option `--prefix=PREFIX'.
 
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
 
Optional Features
 
=================
 

	
 
Some packages pay attention to `--enable-FEATURE' options to
 
   Some packages pay attention to `--enable-FEATURE' options to
 
`configure', where FEATURE indicates an optional part of the package.
 
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 
is something like `gnu-as' or `x' (for the X Window System).  The
 
@@ -137,14 +152,46 @@ find the X include and library files aut
 
you can use the `configure' options `--x-includes=DIR' and
 
`--x-libraries=DIR' to specify their locations.
 

	
 
Particular systems
 
==================
 

	
 
   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
 
CC is not installed, it is recommended to use the following options in
 
order to use an ANSI C compiler:
 

	
 
     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 

	
 
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 

	
 
   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 
parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 
a workaround.  If GNU CC is not installed, it is therefore recommended
 
to try
 

	
 
     ./configure CC="cc"
 

	
 
and if that doesn't work, try
 

	
 
     ./configure CC="cc -nodtk"
 

	
 
   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
 
directory contains several dysfunctional programs; working variants of
 
these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
 
in your `PATH', put it _after_ `/usr/bin'.
 

	
 
   On Haiku, software installed for all users goes in `/boot/common',
 
not `/usr/local'.  It is recommended to use the following options:
 

	
 
     ./configure --prefix=/boot/common
 

	
 
Specifying the System Type
 
==========================
 

	
 
There may be some features `configure' cannot figure out automatically,
 
but needs to determine by the type of machine the package will run on.
 
Usually, assuming the package is built to be run on the _same_
 
architectures, `configure' can figure that out, but if it prints a
 
message saying it cannot guess the machine type, give it the
 
   There may be some features `configure' cannot figure out
 
automatically, but needs to determine by the type of machine the package
 
will run on.  Usually, assuming the package is built to be run on the
 
_same_ architectures, `configure' can figure that out, but if it prints
 
a message saying it cannot guess the machine type, give it the
 
`--build=TYPE' option.  TYPE can either be a short name for the system
 
type, such as `sun4', or a canonical name which has the form:
 

	
 
@@ -152,7 +199,8 @@ type, such as `sun4', or a canonical nam
 

	
 
where SYSTEM can have one of these forms:
 

	
 
     OS KERNEL-OS
 
     OS
 
     KERNEL-OS
 

	
 
   See the file `config.sub' for the possible values of each field.  If
 
`config.sub' isn't included in this package, then this package doesn't
 
@@ -170,9 +218,9 @@ eventually be run) with `--host=TYPE'.
 
Sharing Defaults
 
================
 

	
 
If you want to set default values for `configure' scripts to share, you
 
can create a site shell script called `config.site' that gives default
 
values for variables like `CC', `cache_file', and `prefix'.
 
   If you want to set default values for `configure' scripts to share,
 
you can create a site shell script called `config.site' that gives
 
default values for variables like `CC', `cache_file', and `prefix'.
 
`configure' looks for `PREFIX/share/config.site' if it exists, then
 
`PREFIX/etc/config.site' if it exists.  Or, you can set the
 
`CONFIG_SITE' environment variable to the location of the site script.
 
@@ -181,7 +229,7 @@ A warning: not all `configure' scripts l
 
Defining Variables
 
==================
 

	
 
Variables not defined in a site shell script can be set in the
 
   Variables not defined in a site shell script can be set in the
 
environment passed to `configure'.  However, some packages may run
 
configure again during the build, and the customized values of these
 
variables may be lost.  In order to avoid this problem, you should set
 
@@ -190,21 +238,29 @@ them in the `configure' command line, us
 
     ./configure CC=/usr/local2/bin/gcc
 

	
 
causes the specified `gcc' to be used as the C compiler (unless it is
 
overridden in the site shell script).  Here is a another example:
 
overridden in the site shell script).
 

	
 
     /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
 
an Autoconf bug.  Until the bug is fixed you can use this workaround:
 

	
 
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
 
configuration-related scripts to be executed by `/bin/bash'.
 
     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 

	
 
`configure' Invocation
 
======================
 

	
 
`configure' recognizes the following options to control how it operates.
 
   `configure' recognizes the following options to control how it
 
operates.
 

	
 
`--help'
 
`-h'
 
     Print a summary of the options to `configure', and exit.
 
     Print a summary of all of the options to `configure', and exit.
 

	
 
`--help=short'
 
`--help=recursive'
 
     Print a summary of the options unique to this package's
 
     `configure', and exit.  The `short' variant lists options used
 
     only in the top level, while the `recursive' variant lists options
 
     also present in any nested packages.
 

	
 
`--version'
 
`-V'
 
@@ -231,6 +287,16 @@ configuration-related scripts to be exec
 
     Look for the package's source code in directory DIR.  Usually
 
     `configure' can determine that directory automatically.
 

	
 
`--prefix=DIR'
 
     Use DIR as the installation prefix.  *Note Installation Names::
 
     for more details, including other options available for fine-tuning
 
     the installation locations.
 

	
 
`--no-create'
 
`-n'
 
     Run the configure checks, but stop before creating any output
 
     files.
 

	
 
`configure' also accepts some other, not widely useful, options.  Run
 
`configure --help' for more details.
 

	
src/server/user_mgr.c
Show inline comments
 
@@ -25,6 +25,7 @@
 
#include <stdlib.h>
 
#include <string.h>
 
#include <unistd.h>
 
#include <sys/stat.h>
 

	
 
#include <libxml/xmlmemory.h>
 
#include <libxml/parser.h>
 
@@ -111,7 +112,11 @@ int deleteUser(struct user *user_ptr)
 
	free(user_ptr->username);
 
	memset(user_ptr, '\0', sizeof(struct user));
 

	
 
	user_mgr_info.current_users--;
 

	
 
	return 1;
 

	
 
	backup_list_XML();
 
}
 

	
 
int createUser(struct user *user_ptr, char *nameOfUser)
 
@@ -123,6 +128,8 @@ int createUser(struct user *user_ptr, ch
 
	user_ptr->render_power = 0;
 
	user_ptr->last_job = 0;
 

	
 
	user_mgr_info.current_users++;
 

	
 
	return 1;
 
}
 

	
 
@@ -131,6 +138,7 @@ int placeUser(int index, char *nameOfUse
 
{
 
	int higher;
 
	int lower;
 
	int total_moves;
 

	
 
	// I shift data in the array to create an open the space where the user should be added
 
	// but first I figure out which way is the shortest
 
@@ -146,16 +154,25 @@ int placeUser(int index, char *nameOfUse
 

	
 
		// here the data is shifted to open up a space
 
		if(index - lower < higher - index)
 
			for(; lower < index; lower++)
 
		  {
 
		    total_moves = index - lower;
 
		    for(; lower < index; lower++)
 
				memcpy(&user_mgr_info.user_array[lower], &user_mgr_info.user_array[lower + 1], sizeof(struct user));
 
		  }
 
		else
 
			for(; higher > index; higher--)
 
		  {
 
		    total_moves = higher - index;
 
		    for(; higher > index; higher--)
 
				memcpy(&user_mgr_info.user_array[higher], &user_mgr_info.user_array[higher - 1], sizeof(struct user));
 
		  }
 
	}
 

	
 
	// add the user to the array
 
	createUser(&user_mgr_info.user_array[index], nameOfUser);
 

	
 
	if(total_moves > 50){
 
	  resize_user_array();
 
	}
 
	return 1;
 
}
 

	
 
@@ -215,16 +232,30 @@ int addUser(char *nameOfUser)
 
		}
 
	}
 

	
 
	backup_list_XML();
 
	return 0;
 
}
 

	
 
int initialize_users()
 
{
 
	// pull data from XML file
 
  struct stat buffer;
 
  // cif user_list.xml exists
 
  if(stat("user_list.xml", &buffer) == 0)
 
  {
 
    restart_From_XML_backup();
 
  }
 
  else
 
  {
 
    user_mgr_info.current_users = 0;
 

	
 
	// if XML file is not found create new array of size 50
 
    user_mgr_info.user_array_size = 50;
 
    user_mgr_info.user_array = malloc(sizeof(struct user) * 50);
 
  }
 

	
 
	return 1;
 
  // if XML file is not found create new array of size 50
 

	
 

	
 
  return 1;
 
}
 

	
 
/********************************** XMLness *****************************/
 
@@ -232,7 +263,7 @@ int initialize_users()
 
int backup_list_XML()
 
{
 
	xmlTextWriterPtr writer;
 
    char *tmp;
 
        char *tmp;
 
	int counter;
 

	
 

	
 
@@ -242,6 +273,10 @@ int backup_list_XML()
 
	// create root element user_list
 
	xmlTextWriterStartElement(writer, (xmlChar*)"user_list");
 

	
 
	_distren_asprintf(&tmp, "%d", user_mgr_info.current_users);
 
	xmlTextWriterWriteAttribute(writer, (xmlChar*)"amount_of_users", (xmlChar*)tmp);
 
	free(tmp);
 

	
 
	for(counter = 0; counter < user_mgr_info.user_array_size; counter++)
 
	{
 
		if(user_mgr_info.user_array[counter].username != 0)
 
@@ -252,6 +287,11 @@ int backup_list_XML()
 

	
 
			_distren_asprintf(&tmp, "%d", user_mgr_info.user_array[counter].last_job);
 
			xmlTextWriterWriteAttribute(writer, (xmlChar*)"last_job", (xmlChar*)tmp);
 
			free(tmp);
 

	
 
			_distren_asprintf(&tmp, "%d", user_mgr_info.user_array[counter].render_power);
 
			xmlTextWriterWriteAttribute(writer, (xmlChar*)"render_power", (xmlChar*)tmp);
 
			free(tmp);
 

	
 
			xmlTextWriterEndElement(writer);
 
		}
 
@@ -260,3 +300,33 @@ int backup_list_XML()
 
	return 0;
 

	
 
}
 

	
 
int restart_From_XML_backup(){
 
  xmlDocPtr doc;
 
  xmlNodePtr cur;
 
  int counter;
 

	
 
  doc = xmlParseFile("user_list.xml");
 
  cur = xmlDocGetRootElement(doc);
 
  if (xmlStrcmp(cur->name, (xmlChar*)"user_list"))
 
    {
 
      fprintf(stderr, "xml document is wrong type");
 
      xmlFreeDoc(doc);
 
      return 1;
 
    }
 

	
 
  user_mgr_info.current_users = atoi((char*)xmlGetProp(cur, (xmlChar*)"amount_of_users"));
 

	
 
  user_mgr_info.user_array_size = user_mgr_info.current_users * 2;
 
  user_mgr_info.user_array = malloc(sizeof(struct user) * user_mgr_info.user_array_size);
 

	
 
  cur = cur->xmlChildrenNode;
 
  for(counter = 0; cur->next; counter++){
 
    user_mgr_info.user_array[counter*2].username = (char*)xmlGetProp(cur, (xmlChar*)"amount_of_users");
 
    user_mgr_info.user_array[counter*2].last_job = atoi((char*)xmlGetProp(cur, (xmlChar*)"last_job"));
 
    user_mgr_info.user_array[counter*2].render_power = atoi((char*)xmlGetProp(cur, (xmlChar*)"render_power"));
 
    cur = cur->next;
 
  }
 

	
 
  return 0;
 
}
src/server/user_mgr.h
Show inline comments
 
@@ -32,4 +32,8 @@ struct user
 
	int last_job;
 
};
 

	
 

	
 
int restart_From_XML_backup();
 
int backup_list_XML();
 

	
 
#endif
0 comments (0 inline, 0 general)