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.230 by root, Mon Apr 2 18:04:46 2007 UTC vs.
Revision 1.277 by root, Sun Jun 10 04:24:50 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
21 24
22use BDB (); 25use BDB ();
23use Data::Dumper; 26use Data::Dumper;
24use Digest::MD5; 27use Digest::MD5;
25use Fcntl; 28use Fcntl;
… …
28use Time::HiRes; 31use Time::HiRes;
29use Compress::LZF; 32use Compress::LZF;
30 33
31# configure various modules to our taste 34# configure various modules to our taste
32# 35#
36$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 37Coro::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 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 39
36$Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
37 41
… …
50our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
52 56
53our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
54our @EVENT; 58our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 59
57our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58our $TICK_WATCHER; 73our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 76our $NEXT_TICK;
62our $NOW; 77our $NOW;
… …
71our $RUNTIME; 86our $RUNTIME;
72 87
73our %PLAYER; # all users 88our %PLAYER; # all users
74our %MAP; # all maps 89our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 91
82# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
85binmode STDOUT; 99binmode STDOUT;
86binmode STDERR; 100binmode STDERR;
87 101
88# read virtual server time, if available 102# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
93} 107}
94 108
95mkdir cf::localdir; 109mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 111
102our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
103 113
104sub cf::map::normalise; 114sub cf::map::normalise;
105 115
… …
116=item $cf::RUNTIME 126=item $cf::RUNTIME
117 127
118The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
119every server tick. 129every server tick.
120 130
121=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122 134
123The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
124be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
125 139
126=item $cf::NOW 140=item $cf::NOW
127 141
128The time of the last (current) server tick. 142The time of the last (current) server tick.
129 143
130=item $cf::TICK 144=item $cf::TICK
131 145
132The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
133 157
134=item %cf::CFG 158=item %cf::CFG
135 159
136Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 161from wherever your confdir points to.
138 162
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
140 164
141These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
143processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144window of cpu time available, or simply to synchronise to the server tick.
145 168
146=back 169=back
147 170
148=cut 171=cut
149 172
150BEGIN { 173BEGIN {
151 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 utf8::encode $msg;
154 176
155 $msg .= "\n" 177 $msg .= "\n"
156 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
157 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
158 LOG llevError, $msg; 183 LOG llevError, $msg;
159 }; 184 };
160} 185}
161 186
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
163@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
164@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
165@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
166@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
167@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
168 194
169# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
170# within the Safe compartment. 196# within the Safe compartment.
171for my $pkg (qw( 197for my $pkg (qw(
172 cf::global cf::attachable 198 cf::global cf::attachable
… …
232returned. 258returned.
233 259
234Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
236 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
237=cut 267=cut
238 268
239our %LOCK; 269our %LOCK;
240 270
241sub lock_wait($) { 271sub lock_wait($) {
… …
258 288
259 Coro::guard { 289 Coro::guard {
260 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
262 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
263} 299}
264 300
265sub freeze_mainloop { 301sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
267 303
… …
297 333
298sub sync_job(&) { 334sub sync_job(&) {
299 my ($job) = @_; 335 my ($job) = @_;
300 336
301 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
302 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
304 342
305 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
317 355
318 while ($busy) { 356 while ($busy) {
319 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
320 } 358 }
321 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
322 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
323 } else { 368 } else {
324 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
325 370
326 $job->() 371 $job->()
… …
346 391
347 $coro 392 $coro
348} 393}
349 394
350sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
351 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
352
353 my $runtime = cf::localdir . "/runtime";
354 404
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
356 or return; 406 or return;
357 407
358 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
364 414
365 # always fsync - this file is important 415 # always fsync - this file is important
366 aio_fsync $fh 416 aio_fsync $fh
367 and return; 417 and return;
368 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
369 close $fh 422 close $fh
370 or return; 423 or return;
371 424
372 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
373 and return; 426 and return;
427
428 warn "runtime file written.\n";
374 429
375 1 430 1
376} 431}
377 432
378=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
571 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
572 627
573 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 632
578 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 634 my $pkg = shift @arg;
580 635
581 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
622 if (ref $_[0]) { 677 if (ref $_[0]) {
623 _object_attach @_; 678 _object_attach @_;
624 } else { 679 } else {
625 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
626 } 681 }
682 _recalc_want;
627}; 683};
628 684
629# all those should be optimised 685# all those should be optimised
630sub cf::attachable::detach { 686sub cf::attachable::detach {
631 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
634 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
635 reattach ($obj); 691 reattach ($obj);
636 } else { 692 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
638 } 694 }
695 _recalc_want;
639}; 696};
640 697
641sub cf::attachable::attached { 698sub cf::attachable::attached {
642 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
643 700
… …
816 or return; 873 or return;
817 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
818 } 875 }
819 876
820 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
822 return ($data, $av); 879 return ($data, $av);
823} 880}
824 881
825############################################################################# 882#############################################################################
826# command handling &c 883# command handling &c
… …
953Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
954 1011
955=cut 1012=cut
956 1013
957sub playerdir($) { 1014sub playerdir($) {
958 cf::localdir 1015 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1017}
964 1018
965sub path($) { 1019sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1021
968 (playerdir $login) . "/$login.pl" 1022 (playerdir $login) . "/playerdata"
969} 1023}
970 1024
971sub find_active($) { 1025sub find_active($) {
972 $cf::PLAYER{$_[0]} 1026 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1027 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 1040 my $login = $_[0];
987 1041
988 my $guard = cf::lock_acquire "user_find:$login"; 1042 my $guard = cf::lock_acquire "user_find:$login";
989 1043
990 $cf::PLAYER{$_[0]} || do { 1044 $cf::PLAYER{$_[0]} || do {
1045 # rename old playerfiles to new ones
1046 #TODO: remove when no longer required
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl";
1051
991 my $pl = load_pl path $login 1052 my $pl = load_pl path $login
992 or return; 1053 or return;
993 $cf::PLAYER{$login} = $pl 1054 $cf::PLAYER{$login} = $pl
994 } 1055 }
995 } 1056 }
… …
1079while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1080 1141
1081=cut 1142=cut
1082 1143
1083sub list_logins { 1144sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1146 or return [];
1086 1147
1087 my @logins; 1148 my @logins;
1088 1149
1089 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
… …
1124 } 1185 }
1125 1186
1126 \@paths 1187 \@paths
1127} 1188}
1128 1189
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1190=item $player->ext_reply ($msgid, %msg)
1130 1191
1131Sends an ext reply to the player. 1192Sends an ext reply to the player.
1132 1193
1133=cut 1194=cut
1134 1195
1135sub ext_reply($$$%) { 1196sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1197 my ($self, $id, %msg) = @_;
1137 1198
1138 $msg{msgid} = $id; 1199 $msg{msgid} = $id;
1139 1200
1140 $self->send ("ext " . cf::to_json \%msg); 1201 $self->send ("ext " . cf::to_json \%msg);
1141} 1202}
1142 1203
1143package cf; 1204=item $player->ext_event ($type, %msg)
1205
1206Sends an ext event to the client.
1207
1208=cut
1209
1210sub ext_event($$%) {
1211 my ($self, $type, %msg) = @_;
1212
1213 $self->ns->ext_event ($type, %msg);
1214}
1215
1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1144 1244
1145=back 1245=back
1146
1147 1246
1148=head3 cf::map 1247=head3 cf::map
1149 1248
1150=over 4 1249=over 4
1151 1250
… …
1206 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1207 1306
1208 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1209 local $self->{path}; 1308 local $self->{path};
1210 local $self->{load_path}; 1309 local $self->{load_path};
1211 local $self->{deny_save};
1212 local $self->{deny_reset};
1213 1310
1214 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1215} 1312}
1216 1313
1217sub normalise { 1314sub normalise {
… …
1289 1386
1290# the original (read-only) location 1387# the original (read-only) location
1291sub load_path { 1388sub load_path {
1292 my ($self) = @_; 1389 my ($self) = @_;
1293 1390
1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1295} 1392}
1296 1393
1297# the temporary/swap location 1394# the temporary/swap location
1298sub save_path { 1395sub save_path {
1299 my ($self) = @_; 1396 my ($self) = @_;
1300 1397
1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1303} 1400}
1304 1401
1305# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1306sub uniq_path { 1403sub uniq_path {
1307 my ($self) = @_; 1404 my ($self) = @_;
1308 1405
1309 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1311} 1408}
1312 1409
1313# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1314# all maps in C++... 1411# all maps in C++...
1315sub change_all_map_light { 1412sub change_all_map_light {
1316 my ($change) = @_; 1413 my ($change) = @_;
1317 1414
1318 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1319 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1417}
1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1320} 1425}
1321 1426
1322sub unlink_save { 1427sub unlink_save {
1323 my ($self) = @_; 1428 my ($self) = @_;
1324 1429
… …
1382 $self->load_header_orig 1487 $self->load_header_orig
1383 or return; 1488 or return;
1384 $self->prepare_orig; 1489 $self->prepare_orig;
1385 } 1490 }
1386 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1497
1387 1 1498 1
1388} 1499}
1389 1500
1390sub find; 1501sub find;
1391sub find { 1502sub find {
… …
1403 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1404 1515
1405 $map->load_header 1516 $map->load_header
1406 or return; 1517 or return;
1407 1518
1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1409 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1410 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1411 $map->reset; 1522 $map->reset;
1412 undef $guard; 1523 undef $guard;
1413 return find $path; 1524 return find $path;
… …
1424 my ($self) = @_; 1535 my ($self) = @_;
1425 1536
1426 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1427 1538
1428 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1429 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1430 1543
1431 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1432 1545
1433 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1434 1547
1435 $self->alloc; 1548 $self->alloc;
1436 1549
1437 $self->pre_load; 1550 $self->pre_load;
1438
1439 $self->_load_objects ($self->{load_path}, 1)
1440 or return;
1441
1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443 if delete $self->{load_original};
1444
1445 if (my $uniq = $self->uniq_path) {
1446 utf8::encode $uniq;
1447 if (aio_open $uniq, O_RDONLY, 0) {
1448 $self->clear_unique_items;
1449 $self->_load_objects ($uniq, 0);
1450 }
1451 }
1452
1453 Coro::cede;
1454
1455 # now do the right thing for maps
1456 $self->link_multipart_objects;
1457
1458 unless ($self->{deny_activate}) {
1459 $self->decay_objects;
1460 $self->fix_auto_apply;
1461 $self->update_buttons;
1462 Coro::cede; 1551 Coro::cede;
1463 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1464 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1465 unless $self->difficulty; 1571 unless $self->difficulty;
1466 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1467 $self->activate; 1581 $self->activate;
1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1468 } 1585 }
1469 1586
1470 $self->post_load; 1587 $self->post_load;
1471
1472 $self->in_memory (cf::MAP_IN_MEMORY);
1473} 1588}
1474 1589
1475sub customise_for { 1590sub customise_for {
1476 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1477 1592
1478 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1479 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1480 1598
1481 $self 1599 $self
1482} 1600}
1483 1601
1484# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
… …
1595 1713
1596sub reset_at { 1714sub reset_at {
1597 my ($self) = @_; 1715 my ($self) = @_;
1598 1716
1599 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1600 return 1e99 if $self->isa ("ext::map_per_player");#d#
1601 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1602 1719
1603 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1604 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1605 1722
… …
1616 my ($self) = @_; 1733 my ($self) = @_;
1617 1734
1618 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1619 1736
1620 return if $self->players; 1737 return if $self->players;
1621 return if $self->isa ("ext::map_per_player");#d#
1622 1738
1623 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1624 1740
1625 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1626 1742
1627 # need to save uniques path 1743 # need to save uniques path
1628 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1660 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1661 1777
1662 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1663} 1779}
1664 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps. May block.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 /\.map$/
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1799=item $maps = cf::map::random_maps
1800
1801Returns an arrayref with all map paths of currently instantiated and saved
1802random maps. May block.
1803
1804=cut
1805
1806sub random_maps() {
1807 [
1808 map {
1809 utf8::decode $_;
1810 /\.map$/
1811 ? normalise "?random/$_"
1812 : ()
1813 } @{ aio_readdir $RANDOMDIR or [] }
1814 ]
1815}
1816
1665=item cf::map::unique_maps 1817=item cf::map::unique_maps
1666 1818
1667Returns an arrayref of paths of all shared maps that have 1819Returns an arrayref of paths of all shared maps that have
1668instantiated unique items. May block. 1820instantiated unique items. May block.
1669 1821
1670=cut 1822=cut
1671 1823
1672sub unique_maps() { 1824sub unique_maps() {
1673 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1825 [
1674 or return; 1826 map {
1675
1676 my @paths;
1677
1678 for (@$files) {
1679 utf8::decode $_; 1827 utf8::decode $_;
1680 next if /\.pst$/; 1828 /\.map$/
1681 next unless /^$PATH_SEP/o; 1829 ? normalise $_
1682 1830 : ()
1683 push @paths, cf::map::normalise $_; 1831 } @{ aio_readdir $UNIQUEDIR or [] }
1684 } 1832 ]
1685
1686 \@paths
1687} 1833}
1688 1834
1689package cf; 1835package cf;
1690 1836
1691=back 1837=back
… …
1797 $self->deactivate_recursive; 1943 $self->deactivate_recursive;
1798 1944
1799 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1945 return if UNIVERSAL::isa $self->map, "ext::map_link";
1800 1946
1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1947 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1802 if $self->map; 1948 if $self->map && $self->map->{path} ne "{link}";
1803 1949
1804 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1950 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1805} 1951}
1806 1952
1807sub cf::object::player::leave_link { 1953sub cf::object::player::leave_link {
1808 my ($self, $map, $x, $y) = @_; 1954 my ($self, $map, $x, $y) = @_;
1955
1956 return unless $self->contr->active;
1809 1957
1810 my $link_pos = delete $self->{_link_pos}; 1958 my $link_pos = delete $self->{_link_pos};
1811 1959
1812 unless ($map) { 1960 unless ($map) {
1813 # restore original map position 1961 # restore original map position
… …
1836 1984
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1838 $self->enter_map ($map, $x, $y); 1986 $self->enter_map ($map, $x, $y);
1839} 1987}
1840 1988
1841cf::player->attach (
1842 on_logout => sub {
1843 my ($pl) = @_;
1844
1845 # abort map switching before logout
1846 if ($pl->ob->{_link_pos}) {
1847 cf::sync_job {
1848 $pl->ob->leave_link
1849 };
1850 }
1851 },
1852 on_login => sub {
1853 my ($pl) = @_;
1854
1855 # try to abort aborted map switching on player login :)
1856 # should happen only on crashes
1857 if ($pl->ob->{_link_pos}) {
1858 $pl->ob->enter_link;
1859 (async {
1860 $pl->ob->reply (undef,
1861 "There was an internal problem at your last logout, "
1862 . "the server will try to bring you to your intended destination in a second.",
1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1866 Coro::Timer::sleep 1;
1867 $pl->ob->leave_link;
1868 })->prio (2);
1869 }
1870 },
1871);
1872
1873=item $player_object->goto ($path, $x, $y) 1989=item $player_object->goto ($path, $x, $y[, $check->($map)])
1874 1990
1991Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position.
1995
1875=cut 1996=cut
1997
1998our $GOTOGEN;
1876 1999
1877sub cf::object::player::goto { 2000sub cf::object::player::goto {
1878 my ($self, $path, $x, $y) = @_; 2001 my ($self, $path, $x, $y, $check) = @_;
2002
2003 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1879 2005
1880 $self->enter_link; 2006 $self->enter_link;
1881 2007
1882 (async { 2008 (async {
1883 my $map = eval { 2009 my $map = eval {
1884 my $map = cf::map::find $path; 2010 my $map = cf::map::find $path;
2011
2012 if ($map) {
1885 $map = $map->customise_for ($self) if $map; 2013 $map = $map->customise_for ($self);
2014 $map = $check->($map) if $check && $map;
2015 } else {
2016 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2017 }
2018
1886 $map 2019 $map
2020 };
2021
2022 if ($@) {
2023 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2024 LOG llevError | logBacktrace, Carp::longmess $@;
1887 } or 2025 }
1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1889 2026
2027 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation};
1890 $self->leave_link ($map, $x, $y); 2029 $self->leave_link ($map, $x, $y);
2030 }
1891 })->prio (1); 2031 })->prio (1);
1892} 2032}
1893 2033
1894=item $player_object->enter_exit ($exit_object) 2034=item $player_object->enter_exit ($exit_object)
1895 2035
… …
1934 2074
1935 $rmp->{random_seed} ||= $exit->random_seed; 2075 $rmp->{random_seed} ||= $exit->random_seed;
1936 2076
1937 my $data = cf::to_json $rmp; 2077 my $data = cf::to_json $rmp;
1938 my $md5 = Digest::MD5::md5_hex $data; 2078 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2079 my $meta = "$RANDOMDIR/$md5.meta";
1940 2080
1941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2081 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1942 aio_write $fh, 0, (length $data), $data, 0; 2082 aio_write $fh, 0, (length $data), $data, 0;
1943 undef $fh; 2083 undef $fh;
1944 aio_rename "$meta~", $meta; 2084 aio_rename "$meta~", $meta;
… …
1953 2093
1954 return unless $self->type == cf::PLAYER; 2094 return unless $self->type == cf::PLAYER;
1955 2095
1956 if ($exit->slaying eq "/!") { 2096 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 2097 #TODO: this should de-fi-ni-te-ly not be a sync-job
2098 # the problem is that $exit might not survive long enough
2099 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 2100 cf::sync_job { prepare_random_map $exit };
1959 } 2101 }
1960 2102
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2103 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 2104 my $hp = $exit->stats->hp;
… …
1970 $self->goto ($slaying, $hp, $sp); 2112 $self->goto ($slaying, $hp, $sp);
1971 2113
1972 1; 2114 1;
1973 }) { 2115 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 2116 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 2117 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 2118 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2119 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2120
1979 warn "ERROR in enter_exit: $@"; 2121 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2122 $self->leave_link;
1981 } 2123 }
1982 })->prio (1); 2124 })->prio (1);
… …
1998 2140
1999 utf8::encode $text; 2141 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2142 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2143}
2002 2144
2145=item $client->ext_event ($type, %msg)
2146
2147Sends an exti event to the client.
2148
2149=cut
2150
2151sub cf::client::ext_event($$%) {
2152 my ($self, $type, %msg) = @_;
2153
2154 $msg{msgtype} = "event_$type";
2155 $self->send_packet ("ext " . cf::to_json \%msg);
2156}
2003 2157
2004=item $success = $client->query ($flags, "text", \&cb) 2158=item $success = $client->query ($flags, "text", \&cb)
2005 2159
2006Queues a query to the client, calling the given callback with 2160Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2161the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2199############################################################################# 2353#############################################################################
2200 2354
2201=head2 EXTENSION DATABASE SUPPORT 2355=head2 EXTENSION DATABASE SUPPORT
2202 2356
2203Crossfire maintains a very simple database for extension use. It can 2357Crossfire maintains a very simple database for extension use. It can
2204currently store anything that can be serialised using Storable, which 2358currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2205excludes objects. 2359convert to/from binary).
2206 2360
2207The parameter C<$family> should best start with the name of the extension 2361The parameter C<$family> should best start with the name of the extension
2208using it, it should be unique. 2362using it, it should be unique.
2209 2363
2210=over 4 2364=over 4
… …
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2387 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!; 2388 cf::cleanup "db_open(db): $!" if $!;
2235 }; 2389 };
2236 cf::cleanup "db_open(db): $@" if $@; 2390 cf::cleanup "db_open(db): $@" if $@;
2237 }; 2391 };
2238
2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2243
2244 cf::db_put (board => data => $pst->{board});
2245 cf::db_put (guildrules => data => $pst->{guildrules});
2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249 unlink $path;
2250 };
2251 }
2252 } 2392 }
2253} 2393}
2254 2394
2255sub db_get($$) { 2395sub db_get($$) {
2256 my $key = "$_[0]/$_[1]"; 2396 my $key = "$_[0]/$_[1]";
2257 2397
2258 cf::sync_job { 2398 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data; 2399 BDB::db_get $DB, undef, $key, my $data;
2260 2400
2261 $! ? () 2401 $! ? ()
2262 : Compress::LZF::sthaw $data 2402 : $data
2263 } 2403 }
2264} 2404}
2265 2405
2266sub db_put($$$) { 2406sub db_put($$$) {
2267 BDB::dbreq_pri 4; 2407 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2408 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409}
2410
2411=item cf::cache $id => [$paths...], $processversion => $process
2412
2413Generic caching function that returns the value of the resource $id,
2414caching and regenerating as required.
2415
2416This function can block.
2417
2418=cut
2419
2420sub cache {
2421 my ($id, $src, $processversion, $process) = @_;
2422
2423 my $meta =
2424 join "\x00",
2425 $processversion,
2426 map {
2427 aio_stat $_
2428 and Carp::croak "$_: $!";
2429
2430 ($_, (stat _)[7,9])
2431 } @$src;
2432
2433 my $dbmeta = db_get cache => "$id/meta";
2434 if ($dbmeta ne $meta) {
2435 # changed, we may need to process
2436
2437 my @data;
2438 my $md5;
2439
2440 for (0 .. $#$src) {
2441 0 <= aio_load $src->[$_], $data[$_]
2442 or Carp::croak "$src->[$_]: $!";
2443 }
2444
2445 # if processing is expensive, check
2446 # checksum first
2447 if (1) {
2448 $md5 =
2449 join "\x00",
2450 $processversion,
2451 map {
2452 Coro::cede;
2453 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2454 } 0.. $#$src;
2455
2456
2457 my $dbmd5 = db_get cache => "$id/md5";
2458 if ($dbmd5 eq $md5) {
2459 db_put cache => "$id/meta", $meta;
2460
2461 return db_get cache => "$id/data";
2462 }
2463 }
2464
2465 my $t1 = Time::HiRes::time;
2466 my $data = $process->(\@data);
2467 my $t2 = Time::HiRes::time;
2468
2469 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471 db_put cache => "$id/data", $data;
2472 db_put cache => "$id/md5" , $md5;
2473 db_put cache => "$id/meta", $meta;
2474
2475 return $data;
2476 }
2477
2478 db_get cache => "$id/data"
2479}
2480
2481=item fork_call { }, $args
2482
2483Executes the given code block with the given arguments in a seperate
2484process, returning the results. Everything must be serialisable with
2485Coro::Storable. May, of course, block. Note that the executed sub may
2486never block itself or use any form of Event handling.
2487
2488=cut
2489
2490sub fork_call(&@) {
2491 my ($cb, @args) = @_;
2492
2493# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494# or die "socketpair: $!";
2495 pipe my $fh1, my $fh2
2496 or die "pipe: $!";
2497
2498 if (my $pid = fork) {
2499 close $fh2;
2500
2501 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502 $res = Coro::Storable::thaw $res;
2503
2504 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506 die $$res unless "ARRAY" eq ref $res;
2507
2508 return wantarray ? @$res : $res->[-1];
2509 } else {
2510 reset_signals;
2511 local $SIG{__WARN__};
2512 local $SIG{__DIE__};
2513 eval {
2514 close $fh1;
2515
2516 my @res = eval { $cb->(@args) };
2517 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518 };
2519
2520 warn $@ if $@;
2521 _exit 0;
2522 }
2269} 2523}
2270 2524
2271############################################################################# 2525#############################################################################
2272# the server's init and main functions 2526# the server's init and main functions
2273 2527
2274sub load_facedata { 2528sub load_facedata($) {
2275 my $path = sprintf "%s/facedata", cf::datadir; 2529 my ($path) = @_;
2276 2530
2277 warn "loading facedata from $path\n"; 2531 warn "loading facedata from $path\n";
2278 2532
2279 my $faces; 2533 my $facedata;
2280 0 < aio_load $path, $faces 2534 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 2535 or die "$path: $!";
2282 2536
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 2537 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 2538
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1 2539 $facedata->{version} == 2
2289 or cf::cleanup "$path: version mismatch, cannot proceed."; 2540 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290 2541
2542 {
2543 my $faces = $facedata->{faceinfo};
2544
2291 while (my ($face, $info) = each %$faces) { 2545 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2546 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2547 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2548 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2549 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2296 Coro::cede; 2550 Coro::cede;
2297 } 2551 }
2298 2552
2299 while (my ($face, $info) = each %$faces) { 2553 while (my ($face, $info) = each %$faces) {
2300 next unless $info->{smooth}; 2554 next unless $info->{smooth};
2301 my $idx = cf::face::find $face 2555 my $idx = cf::face::find $face
2302 or next; 2556 or next;
2303 if (my $smooth = cf::face::find $info->{smooth}) { 2557 if (my $smooth = cf::face::find $info->{smooth}) {
2304 cf::face::set_smooth $idx, $smooth; 2558 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2305 } else { 2559 } else {
2306 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2560 warn "smooth face '$info->{smooth}' not found for face '$face'";
2307 } 2561 }
2308 Coro::cede; 2562 Coro::cede;
2563 }
2564 }
2565
2566 {
2567 my $anims = $facedata->{animinfo};
2568
2569 while (my ($anim, $info) = each %$anims) {
2570 cf::anim::set $anim, $info->{frames}, $info->{facings};
2571 Coro::cede;
2572 }
2573
2574 cf::anim::invalidate_all; # d'oh
2309 } 2575 }
2310 2576
2311 1 2577 1
2312} 2578}
2313 2579
2580sub reload_regions {
2581 load_resource_file "$MAPDIR/regions"
2582 or die "unable to load regions file\n";
2583}
2584
2585sub reload_facedata {
2586 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n";
2588}
2589
2590sub reload_archetypes {
2591 load_resource_file "$DATADIR/archetypes"
2592 or die "unable to load archetypes\n";
2593}
2594
2595sub reload_treasures {
2596 load_resource_file "$DATADIR/treasures"
2597 or die "unable to load treasurelists\n";
2598}
2599
2314sub reload_resources { 2600sub reload_resources {
2315 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2601 warn "reloading resource files...\n";
2316 or die "unable to load regions file\n";#d# 2602
2603 reload_regions;
2317 load_facedata 2604 reload_facedata;
2318 or die "unable to load facedata\n";#d# 2605 #reload_archetypes;#d#
2606 reload_archetypes;
2607 reload_treasures;
2608
2609 warn "finished reloading resource files\n";
2319} 2610}
2320 2611
2321sub init { 2612sub init {
2322 reload_resources; 2613 reload_resources;
2323} 2614}
2324 2615
2325sub cfg_load { 2616sub cfg_load {
2326 open my $fh, "<:utf8", cf::confdir . "/config" 2617 open my $fh, "<:utf8", "$CONFDIR/config"
2327 or return; 2618 or return;
2328 2619
2329 local $/; 2620 local $/;
2330 *CFG = YAML::Syck::Load <$fh>; 2621 *CFG = YAML::Syck::Load <$fh>;
2331 2622
… …
2416 2707
2417 warn Carp::longmess "post_cleanup backtrace" 2708 warn Carp::longmess "post_cleanup backtrace"
2418 if $make_core; 2709 if $make_core;
2419} 2710}
2420 2711
2421sub reload() { 2712sub do_reload_perl() {
2422 # can/must only be called in main 2713 # can/must only be called in main
2423 if ($Coro::current != $Coro::main) { 2714 if ($Coro::current != $Coro::main) {
2424 warn "can only reload from main coroutine"; 2715 warn "can only reload from main coroutine";
2425 return; 2716 return;
2426 } 2717 }
… …
2501 Symbol::delete_package "safe::$_" 2792 Symbol::delete_package "safe::$_"
2502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2793 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2503 2794
2504 warn "unloading cf.pm \"a bit\""; 2795 warn "unloading cf.pm \"a bit\"";
2505 delete $INC{"cf.pm"}; 2796 delete $INC{"cf.pm"};
2797 delete $INC{"cf/pod.pm"};
2506 2798
2507 # don't, removes xs symbols, too, 2799 # don't, removes xs symbols, too,
2508 # and global variables created in xs 2800 # and global variables created in xs
2509 #Symbol::delete_package __PACKAGE__; 2801 #Symbol::delete_package __PACKAGE__;
2510 2802
… …
2525 warn "reattaching attachments to maps"; 2817 warn "reattaching attachments to maps";
2526 reattach $_ for values %MAP; 2818 reattach $_ for values %MAP;
2527 warn "reattaching attachments to players"; 2819 warn "reattaching attachments to players";
2528 reattach $_ for values %PLAYER; 2820 reattach $_ for values %PLAYER;
2529 2821
2530 warn "loading reloadable resources";
2531 reload_resources;
2532
2533 warn "leaving sync_job"; 2822 warn "leaving sync_job";
2534 2823
2535 1 2824 1
2536 } or do { 2825 } or do {
2537 warn $@; 2826 warn $@;
… …
2542 warn "reloaded"; 2831 warn "reloaded";
2543}; 2832};
2544 2833
2545our $RELOAD_WATCHER; # used only during reload 2834our $RELOAD_WATCHER; # used only during reload
2546 2835
2836sub reload_perl() {
2837 # doing reload synchronously and two reloads happen back-to-back,
2838 # coro crashes during coro_state_free->destroy here.
2839
2840 $RELOAD_WATCHER ||= Event->timer (
2841 reentrant => 0,
2842 after => 0,
2843 data => WF_AUTOCANCEL,
2844 cb => sub {
2845 do_reload_perl;
2846 undef $RELOAD_WATCHER;
2847 },
2848 );
2849}
2850
2547register_command "reload" => sub { 2851register_command "reload" => sub {
2548 my ($who, $arg) = @_; 2852 my ($who, $arg) = @_;
2549 2853
2550 if ($who->flag (FLAG_WIZ)) { 2854 if ($who->flag (FLAG_WIZ)) {
2551 $who->message ("reloading server."); 2855 $who->message ("reloading server.");
2552 2856 async { reload_perl };
2553 # doing reload synchronously and two reloads happen back-to-back,
2554 # coro crashes during coro_state_free->destroy here.
2555
2556 $RELOAD_WATCHER ||= Event->timer (
2557 reentrant => 0,
2558 after => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => sub {
2561 reload;
2562 undef $RELOAD_WATCHER;
2563 },
2564 );
2565 } 2857 }
2566}; 2858};
2567 2859
2568unshift @INC, $LIBDIR; 2860unshift @INC, $LIBDIR;
2569 2861
2570my $bug_warning = 0; 2862my $bug_warning = 0;
2571 2863
2864our @WAIT_FOR_TICK;
2865our @WAIT_FOR_TICK_BEGIN;
2866
2867sub wait_for_tick {
2868 return unless $TICK_WATCHER->is_active;
2869 return if $Coro::current == $Coro::main;
2870
2871 my $signal = new Coro::Signal;
2872 push @WAIT_FOR_TICK, $signal;
2873 $signal->wait;
2874}
2875
2876sub wait_for_tick_begin {
2877 return unless $TICK_WATCHER->is_active;
2878 return if $Coro::current == $Coro::main;
2879
2880 my $signal = new Coro::Signal;
2881 push @WAIT_FOR_TICK_BEGIN, $signal;
2882 $signal->wait;
2883}
2884
2885 my $min = 1e6;#d#
2886 my $avg = 10;
2572$TICK_WATCHER = Event->timer ( 2887$TICK_WATCHER = Event->timer (
2573 reentrant => 0, 2888 reentrant => 0,
2574 parked => 1, 2889 parked => 1,
2575 prio => 0, 2890 prio => 0,
2576 at => $NEXT_TICK || $TICK, 2891 at => $NEXT_TICK || $TICK,
… …
2580 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2895 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2581 unless ++$bug_warning > 10; 2896 unless ++$bug_warning > 10;
2582 return; 2897 return;
2583 } 2898 }
2584 2899
2585 $NOW = Event::time; 2900 $NOW = $tick_start = Event::time;
2586 2901
2587 cf::server_tick; # one server iteration 2902 cf::server_tick; # one server iteration
2903
2904 0 && sync_job {#d#
2905 for(1..10) {
2906 my $t = Event::time;
2907 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2908 or die;
2909
2910 $map->width (50);
2911 $map->height (50);
2912 $map->alloc;
2913 $map->_load_objects ("/tmp/x.map", 1);
2914 my $t = Event::time - $t;
2915
2916 #next unless $t < 0.0013;#d#
2917 if ($t < $min) {
2918 $min = $t;
2919 }
2920 $avg = $avg * 0.99 + $t * 0.01;
2921 }
2922 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2923 exit 0;
2924 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2925 };
2926
2588 $RUNTIME += $TICK; 2927 $RUNTIME += $TICK;
2589 $NEXT_TICK += $TICK; 2928 $NEXT_TICK += $TICK;
2590 2929
2591 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2930 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2592 $NEXT_RUNTIME_WRITE = $NOW + 10; 2931 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2594 write_runtime 2933 write_runtime
2595 or warn "ERROR: unable to write runtime file: $!"; 2934 or warn "ERROR: unable to write runtime file: $!";
2596 }; 2935 };
2597 } 2936 }
2598 2937
2599 $WAIT_FOR_TICK->broadcast;
2600 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2601
2602# my $AFTER = Event::time; 2938# my $AFTER = Event::time;
2603# warn $AFTER - $NOW;#d# 2939# warn $AFTER - $NOW;#d#
2604 2940
2941 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2942 $sig->send;
2943 }
2944 while (my $sig = shift @WAIT_FOR_TICK) {
2945 $sig->send;
2946 }
2947
2948 $NOW = Event::time;
2949
2605 # if we are delayed by four ticks or more, skip them all 2950 # if we are delayed by four ticks or more, skip them all
2606 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2951 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2607 2952
2608 $TICK_WATCHER->at ($NEXT_TICK); 2953 $TICK_WATCHER->at ($NEXT_TICK);
2609 $TICK_WATCHER->start; 2954 $TICK_WATCHER->start;
2955
2956 $LOAD = ($NOW - $tick_start) / $TICK;
2957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2958
2959 _post_tick;
2960
2961
2610 }, 2962 },
2611); 2963);
2612 2964
2613{ 2965{
2614 BDB::max_poll_time $TICK * 0.1; 2966 BDB::max_poll_time $TICK * 0.1;
… …
2642 2994
2643 cf::sync_job { 2995 cf::sync_job {
2644 eval { 2996 eval {
2645 BDB::db_env_open 2997 BDB::db_env_open
2646 $DB_ENV, 2998 $DB_ENV,
2647 $BDB_ENV_DIR, 2999 $BDBDIR,
2648 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3000 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2649 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3001 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2650 0666; 3002 0666;
2651 3003
2652 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3004 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2653 3005
2654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2655 $DB_ENV->set_lk_detect; 3007 $DB_ENV->set_lk_detect;
2656 }; 3008 };
2657 3009
… …
2673 prio => 6, 3025 prio => 6,
2674 cb => \&IO::AIO::poll_cb, 3026 cb => \&IO::AIO::poll_cb,
2675 ); 3027 );
2676} 3028}
2677 3029
3030my $_log_backtrace;
3031
3032sub _log_backtrace {
3033 my ($msg, @addr) = @_;
3034
3035 $msg =~ s/\n//;
3036
3037 # limit the # of concurrent backtraces
3038 if ($_log_backtrace < 2) {
3039 ++$_log_backtrace;
3040 async {
3041 my @bt = fork_call {
3042 @addr = map { sprintf "%x", $_ } @addr;
3043 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3044 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3045 or die "addr2line: $!";
3046
3047 my @funcs;
3048 my @res = <$fh>;
3049 chomp for @res;
3050 while (@res) {
3051 my ($func, $line) = splice @res, 0, 2, ();
3052 push @funcs, "[$func] $line";
3053 }
3054
3055 @funcs
3056 };
3057
3058 LOG llevInfo, "[ABT] $msg\n";
3059 LOG llevInfo, "[ABT] $_\n" for @bt;
3060 --$_log_backtrace;
3061 };
3062 } else {
3063 LOG llevInfo, "[ABT] $msg\n";
3064 LOG llevInfo, "[ABT] [suppressed]\n";
3065 }
3066}
3067
3068# load additional modules
3069use cf::pod;
3070
2678END { cf::emergency_save } 3071END { cf::emergency_save }
2679 3072
26801 30731
2681 3074

Diff Legend

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