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.233 by root, Wed Apr 4 02:20:27 2007 UTC vs.
Revision 1.274 by root, Tue Jun 5 13:05:02 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) {
… …
1150 my ($self, $type, %msg) = @_; 1211 my ($self, $type, %msg) = @_;
1151 1212
1152 $self->ns->ext_event ($type, %msg); 1213 $self->ns->ext_event ($type, %msg);
1153} 1214}
1154 1215
1155package cf; 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}
1156 1244
1157=back 1245=back
1158
1159 1246
1160=head3 cf::map 1247=head3 cf::map
1161 1248
1162=over 4 1249=over 4
1163 1250
… …
1301 1388
1302# the original (read-only) location 1389# the original (read-only) location
1303sub load_path { 1390sub load_path {
1304 my ($self) = @_; 1391 my ($self) = @_;
1305 1392
1306 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1393 "$MAPDIR/$self->{path}.map"
1307} 1394}
1308 1395
1309# the temporary/swap location 1396# the temporary/swap location
1310sub save_path { 1397sub save_path {
1311 my ($self) = @_; 1398 my ($self) = @_;
1312 1399
1313 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1400 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1314 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1401 "$TMPDIR/$path.map"
1315} 1402}
1316 1403
1317# the unique path, undef == no special unique path 1404# the unique path, undef == no special unique path
1318sub uniq_path { 1405sub uniq_path {
1319 my ($self) = @_; 1406 my ($self) = @_;
1320 1407
1321 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1408 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1322 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1409 "$UNIQUEDIR/$path"
1323} 1410}
1324 1411
1325# and all this just because we cannot iterate over 1412# and all this just because we cannot iterate over
1326# all maps in C++... 1413# all maps in C++...
1327sub change_all_map_light { 1414sub change_all_map_light {
… …
1394 $self->load_header_orig 1481 $self->load_header_orig
1395 or return; 1482 or return;
1396 $self->prepare_orig; 1483 $self->prepare_orig;
1397 } 1484 }
1398 1485
1486 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region;
1488
1399 1 1489 1
1400} 1490}
1401 1491
1402sub find; 1492sub find;
1403sub find { 1493sub find {
… …
1436 my ($self) = @_; 1526 my ($self) = @_;
1437 1527
1438 local $self->{deny_reset} = 1; # loading can take a long time 1528 local $self->{deny_reset} = 1; # loading can take a long time
1439 1529
1440 my $path = $self->{path}; 1530 my $path = $self->{path};
1531
1532 {
1441 my $guard = cf::lock_acquire "map_load:$path"; 1533 my $guard = cf::lock_acquire "map_load:$path";
1442 1534
1443 return if $self->in_memory != cf::MAP_SWAPPED; 1535 return if $self->in_memory != cf::MAP_SWAPPED;
1444 1536
1445 $self->in_memory (cf::MAP_LOADING); 1537 $self->in_memory (cf::MAP_LOADING);
1446 1538
1447 $self->alloc; 1539 $self->alloc;
1448 1540
1449 $self->pre_load; 1541 $self->pre_load;
1450
1451 $self->_load_objects ($self->{load_path}, 1)
1452 or return;
1453
1454 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1455 if delete $self->{load_original};
1456
1457 if (my $uniq = $self->uniq_path) {
1458 utf8::encode $uniq;
1459 if (aio_open $uniq, O_RDONLY, 0) {
1460 $self->clear_unique_items;
1461 $self->_load_objects ($uniq, 0);
1462 }
1463 }
1464
1465 Coro::cede;
1466
1467 # now do the right thing for maps
1468 $self->link_multipart_objects;
1469
1470 unless ($self->{deny_activate}) {
1471 $self->decay_objects;
1472 $self->fix_auto_apply;
1473 $self->update_buttons;
1474 Coro::cede; 1542 Coro::cede;
1475 $self->set_darkness_map; 1543
1544 $self->_load_objects ($self->{load_path}, 1)
1545 or return;
1546
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1548 if delete $self->{load_original};
1549
1550 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) {
1553 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0);
1555 }
1556 }
1557
1558 Coro::cede;
1559 # now do the right thing for maps
1560 $self->link_multipart_objects;
1476 $self->difficulty ($self->estimate_difficulty) 1561 $self->difficulty ($self->estimate_difficulty)
1477 unless $self->difficulty; 1562 unless $self->difficulty;
1478 Coro::cede; 1563 Coro::cede;
1564
1565 unless ($self->{deny_activate}) {
1566 $self->decay_objects;
1567 $self->fix_auto_apply;
1568 $self->update_buttons;
1569 Coro::cede;
1570 $self->set_darkness_map;
1571 Coro::cede;
1479 $self->activate; 1572 $self->activate;
1573 }
1574
1575 $self->in_memory (cf::MAP_IN_MEMORY);
1480 } 1576 }
1481 1577
1482 $self->post_load; 1578 $self->post_load;
1483
1484 $self->in_memory (cf::MAP_IN_MEMORY);
1485} 1579}
1486 1580
1487sub customise_for { 1581sub customise_for {
1488 my ($self, $ob) = @_; 1582 my ($self, $ob) = @_;
1489 1583
… …
1630 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1724 my $lock = cf::lock_acquire "map_data:$self->{path}";
1631 1725
1632 return if $self->players; 1726 return if $self->players;
1633 return if $self->isa ("ext::map_per_player");#d# 1727 return if $self->isa ("ext::map_per_player");#d#
1634 1728
1635 warn "resetting map ", $self->path;#d# 1729 warn "resetting map ", $self->path;
1636 1730
1637 $self->in_memory (cf::MAP_SWAPPED); 1731 $self->in_memory (cf::MAP_SWAPPED);
1638 1732
1639 # need to save uniques path 1733 # need to save uniques path
1640 unless ($self->{deny_save}) { 1734 unless ($self->{deny_save}) {
… …
1680instantiated unique items. May block. 1774instantiated unique items. May block.
1681 1775
1682=cut 1776=cut
1683 1777
1684sub unique_maps() { 1778sub unique_maps() {
1685 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1779 my $files = aio_readdir $UNIQUEDIR
1686 or return; 1780 or return;
1687 1781
1688 my @paths; 1782 my @paths;
1689 1783
1690 for (@$files) { 1784 for (@$files) {
… …
1809 $self->deactivate_recursive; 1903 $self->deactivate_recursive;
1810 1904
1811 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1905 return if UNIVERSAL::isa $self->map, "ext::map_link";
1812 1906
1813 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1814 if $self->map; 1908 if $self->map && $self->map->{path} ne "{link}";
1815 1909
1816 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1910 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1817} 1911}
1818 1912
1819sub cf::object::player::leave_link { 1913sub cf::object::player::leave_link {
1820 my ($self, $map, $x, $y) = @_; 1914 my ($self, $map, $x, $y) = @_;
1915
1916 return unless $self->contr->active;
1821 1917
1822 my $link_pos = delete $self->{_link_pos}; 1918 my $link_pos = delete $self->{_link_pos};
1823 1919
1824 unless ($map) { 1920 unless ($map) {
1825 # restore original map position 1921 # restore original map position
… …
1848 1944
1849 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1850 $self->enter_map ($map, $x, $y); 1946 $self->enter_map ($map, $x, $y);
1851} 1947}
1852 1948
1853cf::player->attach (
1854 on_logout => sub {
1855 my ($pl) = @_;
1856
1857 # abort map switching before logout
1858 if ($pl->ob->{_link_pos}) {
1859 cf::sync_job {
1860 $pl->ob->leave_link
1861 };
1862 }
1863 },
1864 on_login => sub {
1865 my ($pl) = @_;
1866
1867 # try to abort aborted map switching on player login :)
1868 # should happen only on crashes
1869 if ($pl->ob->{_link_pos}) {
1870 $pl->ob->enter_link;
1871 (async {
1872 $pl->ob->reply (undef,
1873 "There was an internal problem at your last logout, "
1874 . "the server will try to bring you to your intended destination in a second.",
1875 cf::NDI_RED);
1876 # we need this sleep as the login has a concurrent enter_exit running
1877 # and this sleep increases chances of the player not ending up in scorn
1878 Coro::Timer::sleep 1;
1879 $pl->ob->leave_link;
1880 })->prio (2);
1881 }
1882 },
1883);
1884
1885=item $player_object->goto ($path, $x, $y) 1949=item $player_object->goto ($path, $x, $y[, $check->($map)])
1886 1950
1951Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position.
1955
1887=cut 1956=cut
1957
1958our $GOTOGEN;
1888 1959
1889sub cf::object::player::goto { 1960sub cf::object::player::goto {
1890 my ($self, $path, $x, $y) = @_; 1961 my ($self, $path, $x, $y, $check) = @_;
1962
1963 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1891 1965
1892 $self->enter_link; 1966 $self->enter_link;
1893 1967
1894 (async { 1968 (async {
1895 my $map = eval { 1969 my $map = eval {
1896 my $map = cf::map::find $path; 1970 my $map = cf::map::find $path;
1971
1972 if ($map) {
1897 $map = $map->customise_for ($self) if $map; 1973 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map;
1975 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1977 }
1978
1898 $map 1979 $map
1980 };
1981
1982 if ($@) {
1983 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1984 LOG llevError | logBacktrace, Carp::longmess $@;
1899 } or 1985 }
1900 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1901 1986
1987 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation};
1902 $self->leave_link ($map, $x, $y); 1989 $self->leave_link ($map, $x, $y);
1990 }
1903 })->prio (1); 1991 })->prio (1);
1904} 1992}
1905 1993
1906=item $player_object->enter_exit ($exit_object) 1994=item $player_object->enter_exit ($exit_object)
1907 1995
… …
1946 2034
1947 $rmp->{random_seed} ||= $exit->random_seed; 2035 $rmp->{random_seed} ||= $exit->random_seed;
1948 2036
1949 my $data = cf::to_json $rmp; 2037 my $data = cf::to_json $rmp;
1950 my $md5 = Digest::MD5::md5_hex $data; 2038 my $md5 = Digest::MD5::md5_hex $data;
1951 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2039 my $meta = "$RANDOMDIR/$md5.meta";
1952 2040
1953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1954 aio_write $fh, 0, (length $data), $data, 0; 2042 aio_write $fh, 0, (length $data), $data, 0;
1955 undef $fh; 2043 undef $fh;
1956 aio_rename "$meta~", $meta; 2044 aio_rename "$meta~", $meta;
… …
2225############################################################################# 2313#############################################################################
2226 2314
2227=head2 EXTENSION DATABASE SUPPORT 2315=head2 EXTENSION DATABASE SUPPORT
2228 2316
2229Crossfire maintains a very simple database for extension use. It can 2317Crossfire maintains a very simple database for extension use. It can
2230currently store anything that can be serialised using Storable, which 2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2231excludes objects. 2319convert to/from binary).
2232 2320
2233The parameter C<$family> should best start with the name of the extension 2321The parameter C<$family> should best start with the name of the extension
2234using it, it should be unique. 2322using it, it should be unique.
2235 2323
2236=over 4 2324=over 4
… …
2259 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2260 cf::cleanup "db_open(db): $!" if $!; 2348 cf::cleanup "db_open(db): $!" if $!;
2261 }; 2349 };
2262 cf::cleanup "db_open(db): $@" if $@; 2350 cf::cleanup "db_open(db): $@" if $@;
2263 }; 2351 };
2264
2265 my $path = cf::localdir . "/database.pst";
2266 if (stat $path) {
2267 cf::sync_job {
2268 my $pst = Storable::retrieve $path;
2269
2270 cf::db_put (board => data => $pst->{board});
2271 cf::db_put (guildrules => data => $pst->{guildrules});
2272 cf::db_put (rent => balance => $pst->{rent}{balance});
2273 BDB::db_env_txn_checkpoint $DB_ENV;
2274
2275 unlink $path;
2276 };
2277 }
2278 } 2352 }
2279} 2353}
2280 2354
2281sub db_get($$) { 2355sub db_get($$) {
2282 my $key = "$_[0]/$_[1]"; 2356 my $key = "$_[0]/$_[1]";
2283 2357
2284 cf::sync_job { 2358 cf::sync_job {
2285 BDB::db_get $DB, undef, $key, my $data; 2359 BDB::db_get $DB, undef, $key, my $data;
2286 2360
2287 $! ? () 2361 $! ? ()
2288 : Compress::LZF::sthaw $data 2362 : $data
2289 } 2363 }
2290} 2364}
2291 2365
2292sub db_put($$$) { 2366sub db_put($$$) {
2293 BDB::dbreq_pri 4; 2367 BDB::dbreq_pri 4;
2294 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2295} 2483}
2296 2484
2297############################################################################# 2485#############################################################################
2298# the server's init and main functions 2486# the server's init and main functions
2299 2487
2300sub load_facedata { 2488sub load_facedata($) {
2301 my $path = sprintf "%s/facedata", cf::datadir; 2489 my ($path) = @_;
2302 2490
2303 warn "loading facedata from $path\n"; 2491 warn "loading facedata from $path\n";
2304 2492
2305 my $faces; 2493 my $facedata;
2306 0 < aio_load $path, $faces 2494 0 < aio_load $path, $facedata
2307 or die "$path: $!"; 2495 or die "$path: $!";
2308 2496
2309 Coro::cede;
2310 $faces = Storable::thaw $faces; 2497 $facedata = Coro::Storable::thaw $facedata;
2311 Coro::cede;
2312 2498
2313 my $meta = delete $faces->{""};
2314 $meta->{version} == 1 2499 $facedata->{version} == 2
2315 or cf::cleanup "$path: version mismatch, cannot proceed."; 2500 or cf::cleanup "$path: version mismatch, cannot proceed.";
2316 2501
2502 {
2503 my $faces = $facedata->{faceinfo};
2504
2317 while (my ($face, $info) = each %$faces) { 2505 while (my ($face, $info) = each %$faces) {
2318 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2506 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2319 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2320 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2321 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2322 Coro::cede; 2510 Coro::cede;
2323 } 2511 }
2324 2512
2325 while (my ($face, $info) = each %$faces) { 2513 while (my ($face, $info) = each %$faces) {
2326 next unless $info->{smooth}; 2514 next unless $info->{smooth};
2327 my $idx = cf::face::find $face 2515 my $idx = cf::face::find $face
2328 or next; 2516 or next;
2329 if (my $smooth = cf::face::find $info->{smooth}) { 2517 if (my $smooth = cf::face::find $info->{smooth}) {
2330 cf::face::set_smooth $idx, $smooth; 2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2331 } else { 2519 } else {
2332 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2520 warn "smooth face '$info->{smooth}' not found for face '$face'";
2333 } 2521 }
2334 Coro::cede; 2522 Coro::cede;
2523 }
2524 }
2525
2526 {
2527 my $anims = $facedata->{animinfo};
2528
2529 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede;
2532 }
2533
2534 cf::anim::invalidate_all; # d'oh
2335 } 2535 }
2336 2536
2337 1 2537 1
2338} 2538}
2339 2539
2540sub reload_regions {
2541 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n";
2543}
2544
2545sub reload_facedata {
2546 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n";
2548}
2549
2550sub reload_archetypes {
2551 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n";
2553}
2554
2555sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n";
2558}
2559
2340sub reload_resources { 2560sub reload_resources {
2341 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2561 warn "reloading resource files...\n";
2342 or die "unable to load regions file\n";#d# 2562
2563 reload_regions;
2343 load_facedata 2564 reload_facedata;
2344 or die "unable to load facedata\n";#d# 2565 #reload_archetypes;#d#
2566 reload_archetypes;
2567 reload_treasures;
2568
2569 warn "finished reloading resource files\n";
2345} 2570}
2346 2571
2347sub init { 2572sub init {
2348 reload_resources; 2573 reload_resources;
2349} 2574}
2350 2575
2351sub cfg_load { 2576sub cfg_load {
2352 open my $fh, "<:utf8", cf::confdir . "/config" 2577 open my $fh, "<:utf8", "$CONFDIR/config"
2353 or return; 2578 or return;
2354 2579
2355 local $/; 2580 local $/;
2356 *CFG = YAML::Syck::Load <$fh>; 2581 *CFG = YAML::Syck::Load <$fh>;
2357 2582
… …
2442 2667
2443 warn Carp::longmess "post_cleanup backtrace" 2668 warn Carp::longmess "post_cleanup backtrace"
2444 if $make_core; 2669 if $make_core;
2445} 2670}
2446 2671
2447sub reload() { 2672sub do_reload_perl() {
2448 # can/must only be called in main 2673 # can/must only be called in main
2449 if ($Coro::current != $Coro::main) { 2674 if ($Coro::current != $Coro::main) {
2450 warn "can only reload from main coroutine"; 2675 warn "can only reload from main coroutine";
2451 return; 2676 return;
2452 } 2677 }
… …
2527 Symbol::delete_package "safe::$_" 2752 Symbol::delete_package "safe::$_"
2528 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2753 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2529 2754
2530 warn "unloading cf.pm \"a bit\""; 2755 warn "unloading cf.pm \"a bit\"";
2531 delete $INC{"cf.pm"}; 2756 delete $INC{"cf.pm"};
2757 delete $INC{"cf/pod.pm"};
2532 2758
2533 # don't, removes xs symbols, too, 2759 # don't, removes xs symbols, too,
2534 # and global variables created in xs 2760 # and global variables created in xs
2535 #Symbol::delete_package __PACKAGE__; 2761 #Symbol::delete_package __PACKAGE__;
2536 2762
… …
2551 warn "reattaching attachments to maps"; 2777 warn "reattaching attachments to maps";
2552 reattach $_ for values %MAP; 2778 reattach $_ for values %MAP;
2553 warn "reattaching attachments to players"; 2779 warn "reattaching attachments to players";
2554 reattach $_ for values %PLAYER; 2780 reattach $_ for values %PLAYER;
2555 2781
2556 warn "loading reloadable resources";
2557 reload_resources;
2558
2559 warn "leaving sync_job"; 2782 warn "leaving sync_job";
2560 2783
2561 1 2784 1
2562 } or do { 2785 } or do {
2563 warn $@; 2786 warn $@;
… …
2568 warn "reloaded"; 2791 warn "reloaded";
2569}; 2792};
2570 2793
2571our $RELOAD_WATCHER; # used only during reload 2794our $RELOAD_WATCHER; # used only during reload
2572 2795
2796sub reload_perl() {
2797 # doing reload synchronously and two reloads happen back-to-back,
2798 # coro crashes during coro_state_free->destroy here.
2799
2800 $RELOAD_WATCHER ||= Event->timer (
2801 reentrant => 0,
2802 after => 0,
2803 data => WF_AUTOCANCEL,
2804 cb => sub {
2805 do_reload_perl;
2806 undef $RELOAD_WATCHER;
2807 },
2808 );
2809}
2810
2573register_command "reload" => sub { 2811register_command "reload" => sub {
2574 my ($who, $arg) = @_; 2812 my ($who, $arg) = @_;
2575 2813
2576 if ($who->flag (FLAG_WIZ)) { 2814 if ($who->flag (FLAG_WIZ)) {
2577 $who->message ("reloading server."); 2815 $who->message ("reloading server.");
2578 2816 async { reload_perl };
2579 # doing reload synchronously and two reloads happen back-to-back,
2580 # coro crashes during coro_state_free->destroy here.
2581
2582 $RELOAD_WATCHER ||= Event->timer (
2583 reentrant => 0,
2584 after => 0,
2585 data => WF_AUTOCANCEL,
2586 cb => sub {
2587 reload;
2588 undef $RELOAD_WATCHER;
2589 },
2590 );
2591 } 2817 }
2592}; 2818};
2593 2819
2594unshift @INC, $LIBDIR; 2820unshift @INC, $LIBDIR;
2595 2821
2596my $bug_warning = 0; 2822my $bug_warning = 0;
2597 2823
2824our @WAIT_FOR_TICK;
2825our @WAIT_FOR_TICK_BEGIN;
2826
2827sub wait_for_tick {
2828 return unless $TICK_WATCHER->is_active;
2829 return if $Coro::current == $Coro::main;
2830
2831 my $signal = new Coro::Signal;
2832 push @WAIT_FOR_TICK, $signal;
2833 $signal->wait;
2834}
2835
2836sub wait_for_tick_begin {
2837 return unless $TICK_WATCHER->is_active;
2838 return if $Coro::current == $Coro::main;
2839
2840 my $signal = new Coro::Signal;
2841 push @WAIT_FOR_TICK_BEGIN, $signal;
2842 $signal->wait;
2843}
2844
2845 my $min = 1e6;#d#
2846 my $avg = 10;
2598$TICK_WATCHER = Event->timer ( 2847$TICK_WATCHER = Event->timer (
2599 reentrant => 0, 2848 reentrant => 0,
2600 parked => 1, 2849 parked => 1,
2601 prio => 0, 2850 prio => 0,
2602 at => $NEXT_TICK || $TICK, 2851 at => $NEXT_TICK || $TICK,
… …
2606 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2855 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2607 unless ++$bug_warning > 10; 2856 unless ++$bug_warning > 10;
2608 return; 2857 return;
2609 } 2858 }
2610 2859
2611 $NOW = Event::time; 2860 $NOW = $tick_start = Event::time;
2612 2861
2613 cf::server_tick; # one server iteration 2862 cf::server_tick; # one server iteration
2863
2864 0 && sync_job {#d#
2865 for(1..10) {
2866 my $t = Event::time;
2867 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2868 or die;
2869
2870 $map->width (50);
2871 $map->height (50);
2872 $map->alloc;
2873 $map->_load_objects ("/tmp/x.map", 1);
2874 my $t = Event::time - $t;
2875
2876 #next unless $t < 0.0013;#d#
2877 if ($t < $min) {
2878 $min = $t;
2879 }
2880 $avg = $avg * 0.99 + $t * 0.01;
2881 }
2882 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2883 exit 0;
2884 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2885 };
2886
2614 $RUNTIME += $TICK; 2887 $RUNTIME += $TICK;
2615 $NEXT_TICK += $TICK; 2888 $NEXT_TICK += $TICK;
2616 2889
2617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2890 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2618 $NEXT_RUNTIME_WRITE = $NOW + 10; 2891 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2620 write_runtime 2893 write_runtime
2621 or warn "ERROR: unable to write runtime file: $!"; 2894 or warn "ERROR: unable to write runtime file: $!";
2622 }; 2895 };
2623 } 2896 }
2624 2897
2625 $WAIT_FOR_TICK->broadcast;
2626 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2627
2628# my $AFTER = Event::time; 2898# my $AFTER = Event::time;
2629# warn $AFTER - $NOW;#d# 2899# warn $AFTER - $NOW;#d#
2630 2900
2901 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2902 $sig->send;
2903 }
2904 while (my $sig = shift @WAIT_FOR_TICK) {
2905 $sig->send;
2906 }
2907
2908 $NOW = Event::time;
2909
2631 # if we are delayed by four ticks or more, skip them all 2910 # if we are delayed by four ticks or more, skip them all
2632 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2911 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2633 2912
2634 $TICK_WATCHER->at ($NEXT_TICK); 2913 $TICK_WATCHER->at ($NEXT_TICK);
2635 $TICK_WATCHER->start; 2914 $TICK_WATCHER->start;
2915
2916 $LOAD = ($NOW - $tick_start) / $TICK;
2917 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2918
2919 _post_tick;
2920
2921
2636 }, 2922 },
2637); 2923);
2638 2924
2639{ 2925{
2640 BDB::max_poll_time $TICK * 0.1; 2926 BDB::max_poll_time $TICK * 0.1;
… …
2668 2954
2669 cf::sync_job { 2955 cf::sync_job {
2670 eval { 2956 eval {
2671 BDB::db_env_open 2957 BDB::db_env_open
2672 $DB_ENV, 2958 $DB_ENV,
2673 $BDB_ENV_DIR, 2959 $BDBDIR,
2674 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2960 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2675 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2961 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2676 0666; 2962 0666;
2677 2963
2678 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2964 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2679 2965
2680 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2966 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2681 $DB_ENV->set_lk_detect; 2967 $DB_ENV->set_lk_detect;
2682 }; 2968 };
2683 2969
… …
2699 prio => 6, 2985 prio => 6,
2700 cb => \&IO::AIO::poll_cb, 2986 cb => \&IO::AIO::poll_cb,
2701 ); 2987 );
2702} 2988}
2703 2989
2990my $_log_backtrace;
2991
2992sub _log_backtrace {
2993 my ($msg, @addr) = @_;
2994
2995 $msg =~ s/\n//;
2996
2997 # limit the # of concurrent backtraces
2998 if ($_log_backtrace < 2) {
2999 ++$_log_backtrace;
3000 async {
3001 my @bt = fork_call {
3002 @addr = map { sprintf "%x", $_ } @addr;
3003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3005 or die "addr2line: $!";
3006
3007 my @funcs;
3008 my @res = <$fh>;
3009 chomp for @res;
3010 while (@res) {
3011 my ($func, $line) = splice @res, 0, 2, ();
3012 push @funcs, "[$func] $line";
3013 }
3014
3015 @funcs
3016 };
3017
3018 LOG llevInfo, "[ABT] $msg\n";
3019 LOG llevInfo, "[ABT] $_\n" for @bt;
3020 --$_log_backtrace;
3021 };
3022 } else {
3023 LOG llevInfo, "[ABT] $msg\n";
3024 LOG llevInfo, "[ABT] [suppressed]\n";
3025 }
3026}
3027
3028# load additional modules
3029use cf::pod;
3030
2704END { cf::emergency_save } 3031END { cf::emergency_save }
2705 3032
27061 30331
2707 3034

Diff Legend

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