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.59 by root, Wed Aug 30 16:30:37 2006 UTC vs.
Revision 1.64 by root, Sun Sep 10 00:51:24 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.
… …
389 for (@$callbacks) { 353 for (@$callbacks) {
390 eval { &{$_->[1]} }; 354 eval { &{$_->[1]} };
391 355
392 if ($@) { 356 if ($@) {
393 warn "$@"; 357 warn "$@";
394 warn "... while processing $EVENT[$event][0] event, skipping processing altogether.\n"; 358 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
395 override; 359 override;
396 } 360 }
397 361
398 return 1 if $override; 362 return 1 if $override;
399 } 363 }
… …
478} 442}
479 443
480sub object_freezer_save { 444sub object_freezer_save {
481 my ($filename, $rdata, $objs) = @_; 445 my ($filename, $rdata, $objs) = @_;
482 446
447 if (length $$rdata) {
448 warn sprintf "saving %s (%d,%d)\n",
449 $filename, length $$rdata, scalar @$objs;
450
483 if (open my $fh, ">:raw", "$filename~") { 451 if (open my $fh, ">:raw", "$filename~") {
484 chmod SAVE_MODE, $fh;
485 syswrite $fh, $$rdata;
486 close $fh;
487
488 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
489 chmod SAVE_MODE, $fh; 452 chmod SAVE_MODE, $fh;
490 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs }; 453 syswrite $fh, $$rdata;
491 close $fh; 454 close $fh;
455
456 if (@$objs && open my $fh, ">:raw", "$filename.pst~") {
457 chmod SAVE_MODE, $fh;
458 syswrite $fh, Storable::nfreeze { version => 1, objs => $objs };
459 close $fh;
492 rename "$filename.pst~", "$filename.pst"; 460 rename "$filename.pst~", "$filename.pst";
461 } else {
462 unlink "$filename.pst";
463 }
464
465 rename "$filename~", $filename;
493 } else { 466 } else {
494 unlink "$filename.pst"; 467 warn "FATAL: $filename~: $!\n";
495 } 468 }
496
497 rename "$filename~", $filename;
498 } else { 469 } else {
499 warn "FATAL: $filename~: $!\n"; 470 unlink $filename;
471 unlink "$filename.pst";
500 } 472 }
501} 473}
502 474
503sub object_thawer_load { 475sub object_thawer_load {
504 my ($filename) = @_; 476 my ($filename) = @_;
505 477
478 local $/;
479
480 my $av;
481
482 #TODO: use sysread etc.
483 if (open my $data, "<:raw:perlio", $filename) {
484 $data = <$data>;
506 open my $fh, "<:raw:perlio", "$filename.pst" 485 if (open my $pst, "<:raw:perlio", "$filename.pst") {
507 or return; 486 $av = eval { (Storable::thaw <$pst>)->{objs} };
487 }
488 return ($data, $av);
489 }
508 490
509 eval { local $/; (Storable::thaw <$fh>)->{objs} } 491 ()
510} 492}
511 493
512attach_to_objects 494attach_to_objects
513 prio => -1000000, 495 prio => -1000000,
514 on_clone => sub { 496 on_clone => sub {
… …
710 #Symbol::delete_package __PACKAGE__; 692 #Symbol::delete_package __PACKAGE__;
711 693
712 # 7. reload cf.pm 694 # 7. reload cf.pm
713 $msg->("reloading cf.pm"); 695 $msg->("reloading cf.pm");
714 require cf; 696 require cf;
697
698 $msg->("load extensions");
699 cf::load_extensions;
700
701 $msg->("reattach");
702 _global_reattach;
715 }; 703 };
716 $msg->($@) if $@; 704 $msg->($@) if $@;
717 705
718 $msg->("reloaded"); 706 $msg->("reloaded");
719}; 707};
… …
779 767
780sub all_objects(@) { 768sub all_objects(@) {
781 @_, map all_objects ($_->inv), @_ 769 @_, map all_objects ($_->inv), @_
782} 770}
783 771
772# TODO: compatibility cruft, remove when no longer needed
784attach_to_players 773attach_to_players
785 on_load => sub { 774 on_load => sub {
786 my ($pl, $path) = @_; 775 my ($pl, $path) = @_;
787 776
788 for my $o (all_objects $pl->ob) { 777 for my $o (all_objects $pl->ob) {
… …
909 898
910############################################################################# 899#############################################################################
911# the server's main() 900# the server's main()
912 901
913sub main { 902sub main {
903 load_extensions;
914 Event::loop; 904 Event::loop;
915} 905}
916 906
917############################################################################# 907#############################################################################
918# initialisation 908# initialisation
919 909
920register "<global>", __PACKAGE__; 910register "<global>", __PACKAGE__;
921 911
922unshift @INC, $LIBDIR; 912unshift @INC, $LIBDIR;
923
924load_extensions;
925 913
926$TICK_WATCHER = Event->timer ( 914$TICK_WATCHER = Event->timer (
927 prio => 1, 915 prio => 1,
928 at => $NEXT_TICK || 1, 916 at => $NEXT_TICK || 1,
929 cb => sub { 917 cb => sub {
… …
938 $TICK_WATCHER->at ($NEXT_TICK); 926 $TICK_WATCHER->at ($NEXT_TICK);
939 $TICK_WATCHER->start; 927 $TICK_WATCHER->start;
940 }, 928 },
941); 929);
942 930
943_reload_2;
944
9451 9311
946 932

Diff Legend

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