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.469 by root, Mon Mar 2 22:25:19 2009 UTC vs.
Revision 1.475 by root, Tue Jul 21 06:17:00 2009 UTC

… …
72 72
73# make sure c-lzf reinitialises itself 73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 76
77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 81
79our %COMMAND = (); 82our %COMMAND = ();
80our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
81 84
… …
134our $JITTER; # average jitter 137our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
136 139
137our @POST_INIT; 140our @POST_INIT;
138 141
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
140 144
141binmode STDOUT; 145binmode STDOUT;
142binmode STDERR; 146binmode STDERR;
143 147
144# read virtual server time, if available 148# read virtual server time, if available
… …
1151 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1152 1156
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1158 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1157 aio_close $fh; 1164 aio_close $fh;
1158 1165
1159 if (@$objs) { 1166 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1168 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1165 aio_close $fh; 1175 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1177 }
1168 } else { 1178 } else {
1169 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
… …
1320 1330
1321# "readahead" all extensions 1331# "readahead" all extensions
1322sub cache_extensions { 1332sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1333 my $grp = IO::AIO::aio_group;
1324 1334
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1336 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1338 }
1329 }; 1339 };
1330 1340
… …
2785 id => "infobox", 2795 id => "infobox",
2786 title => "Skills", 2796 title => "Skills",
2787 reply => undef, 2797 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2798 tooltip => "Shows your experience per skill and item power",
2789 }, 2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2790 "c/resistances" => { 2806 "c/resistances" => {
2791 id => "infobox", 2807 id => "infobox",
2792 title => "Resistances", 2808 title => "Resistances",
2793 reply => undef, 2809 reply => undef,
2794 tooltip => "Shows your resistances", 2810 tooltip => "Shows your resistances",
… …
2796 "c/pets" => { 2812 "c/pets" => {
2797 id => "infobox", 2813 id => "infobox",
2798 title => "Pets", 2814 title => "Pets",
2799 reply => undef, 2815 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2801 }, 2823 },
2802 "c/uptime" => { 2824 "c/uptime" => {
2803 id => "infobox", 2825 id => "infobox",
2804 title => "Uptime", 2826 title => "Uptime",
2805 reply => undef, 2827 reply => undef,
… …
3382 3404
3383 seek $fh, 0, 0; 3405 seek $fh, 0, 0;
3384 print $fh $$; 3406 print $fh $$;
3385} 3407}
3386 3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3387sub main { 3418sub main {
3388 cf::init_globals; # initialise logging 3419 cf::init_globals; # initialise logging
3389 3420
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3429 load_extensions; 3460 load_extensions;
3430 3461
3431 utime time, time, $RUNTIMEFILE; 3462 utime time, time, $RUNTIMEFILE;
3432 3463
3433 # no (long-running) fork's whatsoever before this point(!) 3464 # no (long-running) fork's whatsoever before this point(!)
3465 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3466 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3467
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3468 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3469 };
3438 3470
3439 EV::loop; 3471 main_loop;
3440} 3472}
3441 3473
3442############################################################################# 3474#############################################################################
3443# initialisation and cleanup 3475# initialisation and cleanup
3444 3476

Diff Legend

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