ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.57 by root, Wed Aug 30 11:21:24 2006 UTC vs.
Revision 1.63 by root, Fri Sep 8 17:41:41 2006 UTC

… …
11use Event; 11use Event;
12$Event::Eval = 1; # no idea why this is required, but it is 12$Event::Eval = 1; # no idea why this is required, but it is
13 13
14use strict; 14use strict;
15 15
16_reload_1; 16_init_vars;
17 17
18our %COMMAND = (); 18our %COMMAND = ();
19our @EVENT; 19our @EVENT;
20our %PROP_TYPE;
21our %PROP_IDX;
22our $LIBDIR = maps_directory "perl"; 20our $LIBDIR = maps_directory "perl";
23 21
24our $TICK = MAX_TIME * 1e-6; 22our $TICK = MAX_TIME * 1e-6;
25our $TICK_WATCHER; 23our $TICK_WATCHER;
26our $NEXT_TICK; 24our $NEXT_TICK;
… …
33 31
34 print STDERR "cfperl: $msg"; 32 print STDERR "cfperl: $msg";
35 LOG llevError, "cfperl: $msg"; 33 LOG llevError, "cfperl: $msg";
36 }; 34 };
37} 35}
38
39my %ignore_set = (MAP_PROP_PATH => 1); # I hate the plug-in api. Deeply!
40
41# generate property mutators
42sub prop_gen {
43 my ($prefix, $class) = @_;
44
45 no strict 'refs';
46
47 for my $prop (keys %PROP_TYPE) {
48 $prop =~ /^\Q$prefix\E_(.*$)/ or next;
49 my $sub = lc $1;
50
51 my $type = $PROP_TYPE{$prop};
52 my $idx = $PROP_IDX {$prop};
53
54 *{"$class\::get_$sub"} = *{"$class\::$sub"} = sub {
55 $_[0]->get_property ($type, $idx)
56 };
57
58 *{"$class\::set_$sub"} = sub {
59 $_[0]->set_property ($type, $idx, $_[1]);
60 } unless $ignore_set{$prop};
61 }
62}
63
64# auto-generate most of the API
65
66prop_gen OBJECT_PROP => "cf::object";
67# CFAPI_OBJECT_ANIMATION?
68prop_gen PLAYER_PROP => "cf::object::player";
69
70prop_gen MAP_PROP => "cf::map";
71prop_gen ARCH_PROP => "cf::arch";
72 36
73@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 37@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
74 38
75# we bless all objects into (empty) derived classes to force a method lookup 39# we bless all objects into (empty) derived classes to force a method lookup
76# within the Safe compartment. 40# within the Safe compartment.
… …
476 } 440 }
477 } 441 }
478} 442}
479 443
480sub object_freezer_save { 444sub object_freezer_save {
481 my ($filename, $objs) = @_; 445 my ($filename, $rdata, $objs) = @_;
482 446
483 if (@$objs) { 447 if (length $$rdata) {
448 warn sprintf "saving %s (%d,%d)\n",
449 $filename, length $$rdata, scalar @$objs;
450
484 open my $fh, ">:raw", "$filename.pst~"; 451 if (open my $fh, ">:raw", "$filename~") {
452 chmod SAVE_MODE, $fh;
453 syswrite $fh, $$rdata;
454 close $fh;
455
456 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
457 chmod SAVE_MODE, $fh;
485 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 458 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
486 close $fh; 459 close $fh;
487 unlink "$filename.cfperl";
488 chmod SAVE_MODE, "$filename.pst~";
489 rename "$filename.pst~", "$filename.pst"; 460 rename "$filename.pst~", "$filename.pst";
461 } else {
462 unlink "$filename.pst";
463 }
464
465 rename "$filename~", $filename;
466 } else {
467 warn "FATAL: $filename~: $!\n";
468 }
490 } else { 469 } else {
470 unlink $filename;
491 unlink "$filename.pst"; 471 unlink "$filename.pst";
492 } 472 }
493
494 chmod SAVE_MODE, "$filename~";
495 rename "$filename~", $filename;
496} 473}
497 474
498sub object_thawer_load { 475sub object_thawer_load {
499 my ($filename) = @_; 476 my ($filename) = @_;
500 477
478 local $/;
479
480 my $av;
481
482 #TODO: use sysread etc.
483 if (open my $data, "<:raw:perlio", $filename) {
484 $data = <$data>;
501 open my $fh, "<:raw:perlio", "$filename.pst" 485 if (open my $pst, "<:raw:perlio", "$filename.pst") {
502 or return; 486 $av = eval { (Storable::thaw <$pst>)->{objs} };
487 }
488 return ($data, $av);
489 }
503 490
504 eval { local $/; (Storable::thaw <$fh>)->{objs} } 491 ()
505} 492}
506 493
507attach_to_objects 494attach_to_objects
508 prio => -1000000, 495 prio => -1000000,
509 on_clone => sub { 496 on_clone => sub {
… …
705 #Symbol::delete_package __PACKAGE__; 692 #Symbol::delete_package __PACKAGE__;
706 693
707 # 7. reload cf.pm 694 # 7. reload cf.pm
708 $msg->("reloading cf.pm"); 695 $msg->("reloading cf.pm");
709 require cf; 696 require cf;
697
698 $msg->("load extensions");
699 cf::load_extensions;
700
701 $msg->("reattach");
702 _global_reattach;
710 }; 703 };
711 $msg->($@) if $@; 704 $msg->($@) if $@;
712 705
713 $msg->("reloaded"); 706 $msg->("reloaded");
714}; 707};
… …
765 defined $path or return; 758 defined $path or return;
766 759
767 unlink "$path.pst"; 760 unlink "$path.pst";
768}; 761};
769 762
770# old style persistent data, TODO: remove #d#
771*cf::mapsupport::on_swapin = sub {
772 my ($map) = @_;
773
774 my $path = $map->tmpname;
775 $path = $map->path unless defined $path;
776
777 open my $fh, "<:raw", "$path.cfperl"
778 or return; # no perl data
779
780 my $data = Storable::thaw do { local $/; <$fh> };
781
782 $data->{version} <= 1
783 or return; # too new
784
785 $map->_set_obs ($data->{obs});
786 $map->invoke (EVENT_MAP_UPGRADE);
787};
788
789attach_to_maps prio => -10000, package => cf::mapsupport::; 763attach_to_maps prio => -10000, package => cf::mapsupport::;
790 764
791############################################################################# 765#############################################################################
792# load/save perl data associated with player->ob objects 766# load/save perl data associated with player->ob objects
793 767
794sub all_objects(@) { 768sub all_objects(@) {
795 @_, map all_objects ($_->inv), @_ 769 @_, map all_objects ($_->inv), @_
796} 770}
797 771
772# TODO: compatibility cruft, remove when no longer needed
798attach_to_players 773attach_to_players
799 on_load => sub { 774 on_load => sub {
800 my ($pl, $path) = @_; 775 my ($pl, $path) = @_;
801 776
802 for my $o (all_objects $pl->ob) { 777 for my $o (all_objects $pl->ob) {
… …
923 898
924############################################################################# 899#############################################################################
925# the server's main() 900# the server's main()
926 901
927sub main { 902sub main {
903 load_extensions;
928 Event::loop; 904 Event::loop;
929} 905}
930 906
931############################################################################# 907#############################################################################
932# initialisation 908# initialisation
933 909
934register "<global>", __PACKAGE__; 910register "<global>", __PACKAGE__;
935 911
936unshift @INC, $LIBDIR; 912unshift @INC, $LIBDIR;
937
938load_extensions;
939 913
940$TICK_WATCHER = Event->timer ( 914$TICK_WATCHER = Event->timer (
941 prio => 1, 915 prio => 1,
942 at => $NEXT_TICK || 1, 916 at => $NEXT_TICK || 1,
943 cb => sub { 917 cb => sub {
… …
952 $TICK_WATCHER->at ($NEXT_TICK); 926 $TICK_WATCHER->at ($NEXT_TICK);
953 $TICK_WATCHER->start; 927 $TICK_WATCHER->start;
954 }, 928 },
955); 929);
956 930
957_reload_2;
958
9591 9311
960 932

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines