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.205 by root, Mon Feb 5 18:29:20 2007 UTC vs.
Revision 1.228 by root, Mon Mar 26 16:53:33 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.52 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
19 21
22use BDB ();
20use Data::Dumper; 23use Data::Dumper;
21use Digest::MD5; 24use Digest::MD5;
22use Fcntl; 25use Fcntl;
26use YAML::Syck ();
23use IO::AIO 2.32 (); 27use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 28use Time::HiRes;
29use Compress::LZF;
26 30
31# configure various modules to our taste
32#
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 36$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 37
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 38# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 39$YAML::Syck::ImplicitUnicode = 1;
33 40
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 41$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
42
43sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 44
36our %COMMAND = (); 45our %COMMAND = ();
37our %COMMAND_TIME = (); 46our %COMMAND_TIME = ();
38 47
39our @EXTS = (); # list of extension package names 48our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 49our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 50our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 51our %EXT_MAP = (); # pluggable maps
43 52
53our $RELOAD; # number of reloads so far
44our @EVENT; 54our @EVENT;
45our $LIBDIR = datadir . "/ext"; 55our $LIBDIR = datadir . "/ext";
46 56
47our $TICK = MAX_TIME * 1e-6; 57our $TICK = MAX_TIME * 1e-6;
48our $TICK_WATCHER; 58our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 59our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 61our $NEXT_TICK;
52our $NOW; 62our $NOW;
53our $USE_FSYNC = 1; # use fsync to write maps - default off 63our $USE_FSYNC = 1; # use fsync to write maps - default off
64
65our $BDB_POLL_WATCHER;
66our $DB_ENV;
54 67
55our %CFG; 68our %CFG;
56 69
57our $UPTIME; $UPTIME ||= time; 70our $UPTIME; $UPTIME ||= time;
58our $RUNTIME; 71our $RUNTIME;
59 72
60our %PLAYER; # all users 73our %PLAYER; # all users
61our %MAP; # all maps 74our %MAP; # all maps
62our $LINK_MAP; # the special {link} map, which is always available 75our $LINK_MAP; # the special {link} map, which is always available
63our $RANDOM_MAPS = cf::localdir . "/random"; 76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
64 78
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal; 79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal; 80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67 81
68# used to convert map paths into valid unix filenames by replacing / by ∕ 82# used to convert map paths into valid unix filenames by replacing / by ∕
… …
81mkdir cf::localdir; 95mkdir cf::localdir;
82mkdir cf::localdir . "/" . cf::playerdir; 96mkdir cf::localdir . "/" . cf::playerdir;
83mkdir cf::localdir . "/" . cf::tmpdir; 97mkdir cf::localdir . "/" . cf::tmpdir;
84mkdir cf::localdir . "/" . cf::uniquedir; 98mkdir cf::localdir . "/" . cf::uniquedir;
85mkdir $RANDOM_MAPS; 99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
86 101
87our $EMERGENCY_POSITION; 102our $EMERGENCY_POSITION;
88 103
89sub cf::map::normalise; 104sub cf::map::normalise;
90 105
… …
193 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 208 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
194 $d 209 $d
195 } || "[unable to dump $_[0]: '$@']"; 210 } || "[unable to dump $_[0]: '$@']";
196} 211}
197 212
198use JSON::Syck (); # TODO# replace by JSON::PC once working 213use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
199 214
200=item $ref = cf::from_json $json 215=item $ref = cf::from_json $json
201 216
202Converts a JSON string into the corresponding perl data structure. 217Converts a JSON string into the corresponding perl data structure.
203 218
204=cut
205
206sub from_json($) {
207 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
208 JSON::Syck::Load $_[0]
209}
210
211=item $json = cf::to_json $ref 219=item $json = cf::to_json $ref
212 220
213Converts a perl data structure into its JSON representation. 221Converts a perl data structure into its JSON representation.
214
215=cut
216
217sub to_json($) {
218 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
219 JSON::Syck::Dump $_[0]
220}
221 222
222=item cf::lock_wait $string 223=item cf::lock_wait $string
223 224
224Wait until the given lock is available. See cf::lock_acquire. 225Wait until the given lock is available. See cf::lock_acquire.
225 226
… …
264sub freeze_mainloop { 265sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 266 return unless $TICK_WATCHER->is_active;
266 267
267 my $guard = Coro::guard { 268 my $guard = Coro::guard {
268 $TICK_WATCHER->start; 269 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 }; 270 };
271 $WRITE_RUNTIME_WATCHER->stop;
272 $TICK_WATCHER->stop; 271 $TICK_WATCHER->stop;
273 $guard 272 $guard
274} 273}
275 274
276=item cf::async { BLOCK } 275=item cf::async { BLOCK }
… …
347 346
348 $coro 347 $coro
349} 348}
350 349
351sub write_runtime { 350sub write_runtime {
351 my $guard = cf::lock_acquire "write_runtime";
352
352 my $runtime = cf::localdir . "/runtime"; 353 my $runtime = cf::localdir . "/runtime";
353 354
354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
355 or return; 356 or return;
356 357
… …
778 } 779 }
779 } else { 780 } else {
780 aio_unlink $filename; 781 aio_unlink $filename;
781 aio_unlink "$filename.pst"; 782 aio_unlink "$filename.pst";
782 } 783 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
789 } 784 }
790} 785}
791 786
792sub object_freezer_as_string { 787sub object_freezer_as_string {
793 my ($rdata, $objs) = @_; 788 my ($rdata, $objs) = @_;
… …
799 794
800sub object_thawer_load { 795sub object_thawer_load {
801 my ($filename) = @_; 796 my ($filename) = @_;
802 797
803 my ($data, $av); 798 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
807 799
808 (aio_load $filename, $data) >= 0 800 (aio_load $filename, $data) >= 0
809 or return; 801 or return;
810 802
811 unless (aio_stat "$filename.pst") { 803 unless (aio_stat "$filename.pst") {
… …
1030=cut 1022=cut
1031 1023
1032sub quit_character { 1024sub quit_character {
1033 my ($pl) = @_; 1025 my ($pl) = @_;
1034 1026
1027 my $name = $pl->ob->name;
1028
1035 $pl->{deny_save} = 1; 1029 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1030 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1031
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1032 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1039 $pl->deactivate; 1033 $pl->deactivate;
… …
1043 my $path = playerdir $pl; 1037 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1038 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1039 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1040 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1041 $pl->destroy;
1042
1043 my $prefix = qr<^~\Q$name\E/>;
1044
1045 # nuke player maps
1046 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1047
1048 IO::AIO::aio_rmtree $temp; 1048 IO::AIO::aio_rmtree $temp;
1049}
1050
1051=item $pl->kick
1052
1053Kicks a player out of the game. This destroys the connection.
1054
1055=cut
1056
1057sub kick {
1058 my ($pl, $kicker) = @_;
1059
1060 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1061 $pl->killer ("kicked");
1062 $pl->ns->destroy;
1049} 1063}
1050 1064
1051=item cf::player::list_logins 1065=item cf::player::list_logins
1052 1066
1053Returns am arrayref of all valid playernames in the system, can take a 1067Returns am arrayref of all valid playernames in the system, can take a
… …
1298 my ($self) = @_; 1312 my ($self) = @_;
1299 1313
1300 utf8::encode (my $save = $self->save_path); 1314 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1315 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1316 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308} 1317}
1309 1318
1310sub load_header_from($) { 1319sub load_header_from($) {
1311 my ($self, $path) = @_; 1320 my ($self, $path) = @_;
1312 1321
… …
1600 return if $self->players; 1609 return if $self->players;
1601 return if $self->isa ("ext::map_per_player");#d# 1610 return if $self->isa ("ext::map_per_player");#d#
1602 1611
1603 warn "resetting map ", $self->path;#d# 1612 warn "resetting map ", $self->path;#d#
1604 1613
1614 $self->in_memory (cf::MAP_SWAPPED);
1615
1616 # need to save uniques path
1617 unless ($self->{deny_save}) {
1618 my $uniq = $self->uniq_path; utf8::encode $uniq;
1619
1620 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1621 if $uniq;
1622 }
1623
1605 delete $cf::MAP{$self->path}; 1624 delete $cf::MAP{$self->path};
1606 1625
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear; 1626 $self->clear;
1609 1627
1610 $_->clear_links_to ($self) for values %cf::MAP; 1628 $_->clear_links_to ($self) for values %cf::MAP;
1611 1629
1612 $self->unlink_save; 1630 $self->unlink_save;
… …
1802 $map->load; 1820 $map->load;
1803 $map->load_diag; 1821 $map->load_diag;
1804 1822
1805 return unless $self->contr->active; 1823 return unless $self->contr->active;
1806 $self->activate_recursive; 1824 $self->activate_recursive;
1825
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807 $self->enter_map ($map, $x, $y); 1827 $self->enter_map ($map, $x, $y);
1808} 1828}
1809 1829
1810cf::player->attach ( 1830cf::player->attach (
1811 on_logout => sub { 1831 on_logout => sub {
… …
1824 # try to abort aborted map switching on player login :) 1844 # try to abort aborted map switching on player login :)
1825 # should happen only on crashes 1845 # should happen only on crashes
1826 if ($pl->ob->{_link_pos}) { 1846 if ($pl->ob->{_link_pos}) {
1827 $pl->ob->enter_link; 1847 $pl->ob->enter_link;
1828 (async { 1848 (async {
1829 # we need this sleep as the login has a concurrent enter_exit running
1830 # and this sleep increases chances of the player not ending up in scorn
1831 $pl->ob->reply (undef, 1849 $pl->ob->reply (undef,
1832 "There was an internal problem at your last logout, " 1850 "There was an internal problem at your last logout, "
1833 . "the server will try to bring you to your intended destination in a second.", 1851 . "the server will try to bring you to your intended destination in a second.",
1834 cf::NDI_RED); 1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1835 Coro::Timer::sleep 1; 1855 Coro::Timer::sleep 1;
1836 $pl->ob->leave_link; 1856 $pl->ob->leave_link;
1837 })->prio (2); 1857 })->prio (2);
1838 } 1858 }
1839 }, 1859 },
… …
1964 1984
1965sub cf::client::send_drawinfo { 1985sub cf::client::send_drawinfo {
1966 my ($self, $text, $flags) = @_; 1986 my ($self, $text, $flags) = @_;
1967 1987
1968 utf8::encode $text; 1988 utf8::encode $text;
1969 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 1989 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1970} 1990}
1971 1991
1972 1992
1973=item $success = $client->query ($flags, "text", \&cb) 1993=item $success = $client->query ($flags, "text", \&cb)
1974 1994
… …
2073 2093
2074# here we export the classes and methods available to script code 2094# here we export the classes and methods available to script code
2075 2095
2076=pod 2096=pod
2077 2097
2078The following fucntions and emthods are available within a safe environment: 2098The following functions and methods are available within a safe environment:
2079 2099
2080 cf::object contr pay_amount pay_player map 2100 cf::object contr pay_amount pay_player map
2081 cf::object::player player 2101 cf::object::player player
2082 cf::player peaceful 2102 cf::player peaceful
2083 cf::map trigger 2103 cf::map trigger
… …
2176The parameter C<$family> should best start with the name of the extension 2196The parameter C<$family> should best start with the name of the extension
2177using it, it should be unique. 2197using it, it should be unique.
2178 2198
2179=over 4 2199=over 4
2180 2200
2181=item $hashref = cf::db_get $family
2182
2183Return a hashref for use by the extension C<$family>, which can be
2184modified. After modifications, you have to call C<cf::db_dirty> or
2185C<cf::db_sync>.
2186
2187=item $value = cf::db_get $family => $key 2201=item $value = cf::db_get $family => $key
2188 2202
2189Returns a single value from the database 2203Returns a single value from the database.
2190
2191=item cf::db_put $family => $hashref
2192
2193Stores the given family hashref into the database. Updates are delayed, if
2194you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195 2204
2196=item cf::db_put $family => $key => $value 2205=item cf::db_put $family => $key => $value
2197 2206
2198Stores the given C<$value> in the family hash. Updates are delayed, if you 2207Stores the given C<$value> in the family.
2199want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201=item cf::db_dirty
2202
2203Marks the database as dirty, to be updated at a later time.
2204
2205=item cf::db_sync
2206
2207Immediately write the database to disk I<if it is dirty>.
2208 2208
2209=cut 2209=cut
2210 2210
2211our $DB; 2211our $DB;
2212 2212
2213{ 2213sub db_init {
2214 unless ($DB) {
2215 $DB = BDB::db_create $DB_ENV;
2216
2217 cf::sync_job {
2218 eval {
2219 $DB->set_flags (BDB::CHKSUM);
2220
2221 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!;
2224 };
2225 cf::cleanup "db_open(db): $@" if $@;
2226 };
2227
2214 my $path = cf::localdir . "/database.pst"; 2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2215 2232
2216 sub db_load() { 2233 cf::db_put (board => data => $pst->{board});
2217 $DB = stat $path ? Storable::retrieve $path : { }; 2234 cf::db_put (guildrules => data => $pst->{guildrules});
2218 } 2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2219 2237
2220 my $pid; 2238 unlink $path;
2221
2222 sub db_save() {
2223 waitpid $pid, 0 if $pid;
2224 if (0 == ($pid = fork)) {
2225 $DB->{_meta}{version} = 1;
2226 Storable::nstore $DB, "$path~";
2227 rename "$path~", $path;
2228 cf::_exit 0 if defined $pid;
2229 } 2239 };
2230 }
2231
2232 my $dirty;
2233
2234 sub db_sync() {
2235 db_save if $dirty;
2236 undef $dirty;
2237 }
2238
2239 my $idle = Event->idle (
2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2246 );
2247
2248 sub db_dirty() {
2249 $dirty = 1;
2250 $idle->start;
2251 }
2252
2253 sub db_get($;$) {
2254 @_ >= 2
2255 ? $DB->{$_[0]}{$_[1]}
2256 : ($DB->{$_[0]} ||= { })
2257 }
2258
2259 sub db_put($$;$) {
2260 if (@_ >= 3) {
2261 $DB->{$_[0]}{$_[1]} = $_[2];
2262 } else {
2263 $DB->{$_[0]} = $_[1];
2264 }
2265 db_dirty;
2266 }
2267
2268 cf::global->attach (
2269 prio => 10000,
2270 on_cleanup => sub {
2271 db_sync;
2272 }, 2240 }
2273 ); 2241 }
2242}
2243
2244sub db_get($$) {
2245 my $key = "$_[0]/$_[1]";
2246
2247 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data;
2249
2250 $! ? ()
2251 : Compress::LZF::sthaw $data
2252 }
2253}
2254
2255sub db_put($$$) {
2256 BDB::dbreq_pri 4;
2257 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2274} 2258}
2275 2259
2276############################################################################# 2260#############################################################################
2277# the server's init and main functions 2261# the server's init and main functions
2278 2262
2263sub load_faces {
2264 my $path = sprintf "%s/faces", cf::datadir;
2265
2266 warn "loading faces from $path\n";
2267
2268 my $faces;
2269 0 < aio_load $path, $faces
2270 or die "$path: $!";
2271
2272 Coro::cede;
2273 $faces = Storable::thaw $faces;
2274 Coro::cede;
2275
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1
2278 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279
2280 while (my ($face, $info) = each %$faces) {
2281 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2284 Coro::cede;
2285 }
2286
2287 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth};
2289 my $idx = cf::face::find $face
2290 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth;
2293 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 }
2296 Coro::cede;
2297 }
2298
2299 1
2300}
2301
2279sub load_resources { 2302sub reload_resources {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d# 2304 or die "unable to load regions file\n";#d#
2305 load_faces
2306 or die "unable to load faces\n";#d#
2307}
2308
2309sub init {
2310 reload_resources;
2282} 2311}
2283 2312
2284sub cfg_load { 2313sub cfg_load {
2285 open my $fh, "<:utf8", cf::confdir . "/config" 2314 open my $fh, "<:utf8", cf::confdir . "/config"
2286 or return; 2315 or return;
… …
2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2299 and die "WARNING: m(un)lockall failed: $!\n"; 2328 and die "WARNING: m(un)lockall failed: $!\n";
2300 }; 2329 };
2301 warn $@ if $@; 2330 warn $@ if $@;
2302 } 2331 }
2303}
2304
2305sub init {
2306 load_resources;
2307} 2332}
2308 2333
2309sub main { 2334sub main {
2310 # we must not ever block the main coroutine 2335 # we must not ever block the main coroutine
2311 local $Coro::idle = sub { 2336 local $Coro::idle = sub {
… …
2314 Event::one_event; 2339 Event::one_event;
2315 })->prio (Coro::PRIO_MAX); 2340 })->prio (Coro::PRIO_MAX);
2316 }; 2341 };
2317 2342
2318 cfg_load; 2343 cfg_load;
2319 db_load; 2344 db_init;
2320 load_extensions; 2345 load_extensions;
2321 2346
2322 $TICK_WATCHER->start; 2347 $TICK_WATCHER->start;
2323 Event::loop; 2348 Event::loop;
2324} 2349}
… …
2363 my $map = $cf::MAP{$path} or next; 2388 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next; 2389 $map->valid or next;
2365 $map->save; 2390 $map->save;
2366 } 2391 }
2367 warn "end emergency map save\n"; 2392 warn "end emergency map save\n";
2393
2394 warn "begin emergency database checkpoint\n";
2395 BDB::db_env_txn_checkpoint $DB_ENV;
2396 warn "end emergency database checkpoint\n";
2368 }; 2397 };
2369 2398
2370 warn "leave emergency perl save\n"; 2399 warn "leave emergency perl save\n";
2400}
2401
2402sub post_cleanup {
2403 my ($make_core) = @_;
2404
2405 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core;
2371} 2407}
2372 2408
2373sub reload() { 2409sub reload() {
2374 # can/must only be called in main 2410 # can/must only be called in main
2375 if ($Coro::current != $Coro::main) { 2411 if ($Coro::current != $Coro::main) {
… …
2377 return; 2413 return;
2378 } 2414 }
2379 2415
2380 warn "reloading..."; 2416 warn "reloading...";
2381 2417
2382 warn "cancelling server ticker"; 2418 warn "entering sync_job";
2383 $TICK_WATCHER->cancel;
2384 2419
2420 cf::sync_job {
2421 cf::write_runtime; # external watchdog should not bark
2385 cf::emergency_save; 2422 cf::emergency_save;
2423 cf::write_runtime; # external watchdog should not bark
2386 2424
2387 eval { 2425 warn "syncing database to disk";
2426 BDB::db_env_txn_checkpoint $DB_ENV;
2427
2388 # if anything goes wrong in here, we should simply crash as we already saved 2428 # if anything goes wrong in here, we should simply crash as we already saved
2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392 2429
2393 warn "cancelling all WF_AUTOCANCEL watchers"; 2430 warn "cancelling all WF_AUTOCANCEL watchers";
2394 for (Event::all_watchers) { 2431 for (Event::all_watchers) {
2395 $_->cancel if $_->data & WF_AUTOCANCEL; 2432 $_->cancel if $_->data & WF_AUTOCANCEL;
2396 } 2433 }
2397 2434
2398 warn "flushing outstanding aio requests"; 2435 warn "flushing outstanding aio requests";
2399 for (;;) { 2436 for (;;) {
2437 BDB::flush;
2400 IO::AIO::flush; 2438 IO::AIO::flush;
2401 Coro::cede; 2439 Coro::cede;
2402 last unless IO::AIO::nreqs; 2440 last unless IO::AIO::nreqs || BDB::nreqs;
2403 warn "iterate..."; 2441 warn "iterate...";
2404 } 2442 }
2443
2444 ++$RELOAD;
2405 2445
2406 warn "cancelling all extension coros"; 2446 warn "cancelling all extension coros";
2407 $_->cancel for values %EXT_CORO; 2447 $_->cancel for values %EXT_CORO;
2408 %EXT_CORO = (); 2448 %EXT_CORO = ();
2409 2449
… …
2462 require cf; 2502 require cf;
2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2503 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464 2504
2465 warn "loading config and database again"; 2505 warn "loading config and database again";
2466 cf::cfg_load; 2506 cf::cfg_load;
2467 cf::db_load;
2468 2507
2469 warn "loading extensions"; 2508 warn "loading extensions";
2470 cf::load_extensions; 2509 cf::load_extensions;
2471 2510
2472 warn "reattaching attachments to objects/players"; 2511 warn "reattaching attachments to objects/players";
2473 _global_reattach; 2512 _global_reattach; # objects, sockets
2474 warn "reattaching attachments to maps"; 2513 warn "reattaching attachments to maps";
2475 reattach $_ for values %MAP; 2514 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER;
2476 2517
2477 warn "loading reloadable resources"; 2518 warn "loading reloadable resources";
2478 load_resources; 2519 reload_resources;
2479 2520
2480 warn "restarting server ticker"; 2521 warn "leaving sync_job";
2481 2522
2482 $TICK_WATCHER->start; 2523 1
2483 }; 2524 } or do {
2484
2485 if ($@) {
2486 warn $@; 2525 warn $@;
2487 warn "error while reloading, exiting."; 2526 warn "error while reloading, exiting.";
2488 exit 1; 2527 exit 1;
2489 } 2528 };
2490 2529
2491 warn "reloaded"; 2530 warn "reloaded";
2492}; 2531};
2493 2532
2494our $RELOAD_WATCHER; # used only during reload 2533our $RELOAD_WATCHER; # used only during reload
… …
2535 2574
2536 cf::server_tick; # one server iteration 2575 cf::server_tick; # one server iteration
2537 $RUNTIME += $TICK; 2576 $RUNTIME += $TICK;
2538 $NEXT_TICK += $TICK; 2577 $NEXT_TICK += $TICK;
2539 2578
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10;
2581 Coro::async_pool {
2582 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!";
2584 };
2585 }
2586
2540 $WAIT_FOR_TICK->broadcast; 2587 $WAIT_FOR_TICK->broadcast;
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2542 2589
2543 Event::sweep;
2544 Coro::cede_notself;
2545
2546# my $AFTER = Event::time; 2590# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d# 2591# warn $AFTER - $NOW;#d#
2548 2592
2549 # if we are delayed by four ticks or more, skip them all 2593 # if we are delayed by four ticks or more, skip them all
2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
… …
2552 $TICK_WATCHER->at ($NEXT_TICK); 2596 $TICK_WATCHER->at ($NEXT_TICK);
2553 $TICK_WATCHER->start; 2597 $TICK_WATCHER->start;
2554 }, 2598 },
2555); 2599);
2556 2600
2601{
2602 BDB::max_poll_time $TICK * 0.1;
2603 $BDB_POLL_WATCHER = Event->io (
2604 reentrant => 0,
2605 fd => BDB::poll_fileno,
2606 poll => 'r',
2607 prio => 0,
2608 data => WF_AUTOCANCEL,
2609 cb => \&BDB::poll_cb,
2610 );
2611 BDB::min_parallel 8;
2612
2613 BDB::set_sync_prepare {
2614 my $status;
2615 my $current = $Coro::current;
2616 (
2617 sub {
2618 $status = $!;
2619 $current->ready; undef $current;
2620 },
2621 sub {
2622 Coro::schedule while defined $current;
2623 $! = $status;
2624 },
2625 )
2626 };
2627
2628 unless ($DB_ENV) {
2629 $DB_ENV = BDB::db_env_create;
2630
2631 cf::sync_job {
2632 eval {
2633 BDB::db_env_open
2634 $DB_ENV,
2635 $BDB_ENV_DIR,
2636 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666;
2639
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2641
2642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2643 $DB_ENV->set_lk_detect;
2644 };
2645
2646 cf::cleanup "db_env_open(db): $@" if $@;
2647 };
2648 }
2649}
2650
2651{
2652 IO::AIO::min_parallel 8;
2653
2654 undef $Coro::AIO::WATCHER;
2557IO::AIO::max_poll_time $TICK * 0.1; 2655 IO::AIO::max_poll_time $TICK * 0.1;
2558
2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io ( 2656 $AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0, 2657 reentrant => 0,
2658 data => WF_AUTOCANCEL,
2562 fd => IO::AIO::poll_fileno, 2659 fd => IO::AIO::poll_fileno,
2563 poll => 'r', 2660 poll => 'r',
2564 prio => 6, 2661 prio => 6,
2565 data => WF_AUTOCANCEL,
2566 cb => \&IO::AIO::poll_cb, 2662 cb => \&IO::AIO::poll_cb,
2567); 2663 );
2568 2664}
2569$WRITE_RUNTIME_WATCHER = Event->timer (
2570 reentrant => 0,
2571 data => WF_AUTOCANCEL,
2572 after => 1,
2573 interval => 10,
2574 prio => 6, # keep it lowest so it acts like a watchdog
2575 cb => Coro::unblock_sub {
2576 write_runtime
2577 or warn "ERROR: unable to write runtime file: $!";
2578 },
2579);
2580 2665
2581END { cf::emergency_save } 2666END { cf::emergency_save }
2582 2667
25831 26681
2584 2669

Diff Legend

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