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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.483 by root, Mon Oct 12 04:02:17 2009 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
39use Coro::AnyEvent; 42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
43use Coro::AnyEvent; 47use Coro::AnyEvent;
44use Coro::AIO; 48use Coro::AIO;
45use Coro::BDB; 49use Coro::BDB 1.6;
46use Coro::Storable; 50use Coro::Storable;
47use Coro::Util (); 51use Coro::Util ();
48 52
49use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
50use BDB (); 54use BDB ();
… …
61 65
62# configure various modules to our taste 66# configure various modules to our taste
63# 67#
64$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
65Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
66Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
67 76
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 79
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 81
72our %COMMAND = (); 82our %COMMAND = ();
73our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
… …
76our %EXTCMD = (); 86our %EXTCMD = ();
77our %EXTICMD = (); 87our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
80 90
81our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 92our @EVENT;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
83 95
84our $CONFDIR = confdir; 96our $CONFDIR = confdir;
85our $DATADIR = datadir; 97our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
95our %RESOURCE; 110our %RESOURCE;
96 111
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 114our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
101 116
102our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 120our $DB_ENV;
106 121
122our @EXTRA_MODULES = qw(pod match mapscript);
123
107our %CFG; 124our %CFG;
108 125
109our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 127our $RUNTIME;
111our $NOW; 128our $NOW;
… …
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 139our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
124 141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
146
125binmode STDOUT; 147binmode STDOUT;
126binmode STDERR; 148binmode STDERR;
127 149
128# read virtual server time, if available 150# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
133} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
134 158
135mkdir $_ 159mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 161
138our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
139 163
140sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 176
142############################################################################# 177#############################################################################
143 178
144=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
145 180
… …
196 231
197This array contains the results of the last C<invoke ()> call. When 232This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 234that call.
200 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
201=back 242=back
202 243
203=cut 244=cut
204 245
205BEGIN { 246$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 247 my $msg = join "", @_;
208 248
209 $msg .= "\n" 249 $msg .= "\n"
210 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
211 251
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 253
214 LOG llevError, $msg; 254 LOG llevError, $msg;
215 }; 255};
216}
217 256
218$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
220 261
221 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 264 return;#d#
224 }#d# 265 }#d#
225 266
226 # kill coroutine otherwise 267 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 268 Coro::terminate
229}; 269};
230
231$SIG{__DIE__} = sub { }; #d#?
232 270
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
243for my $pkg (qw( 281for my $pkg (qw(
244 cf::global cf::attachable 282 cf::global cf::attachable
245 cf::object cf::object::player 283 cf::object cf::object::player
246 cf::client cf::player 284 cf::client cf::player
247 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
248 cf::map cf::party cf::region 287 cf::party cf::region
249)) { 288)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 290}
253 291
254$EV::DIED = sub { 292$EV::DIED = sub {
255 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
… …
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 336
299sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
301 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
302=item cf::lock_wait $string 354=item cf::lock_wait $string
303 355
304Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
305 357
306=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
307 359
308Wait until the given lock is available and then acquires it and returns 360Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
311returned. 363returned.
312 364
313Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 366deadlocked coro.
… …
320 372
321Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
322 374
323=cut 375=cut
324 376
325our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 378
328sub lock_wait($) { 379sub lock_wait($) {
329 my ($key) = @_; 380 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 381}
342 382
343sub lock_acquire($) { 383sub lock_acquire($) {
344 my ($key) = @_; 384 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 385}
358 386
359sub lock_active($) { 387sub lock_active($) {
360 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 389}
364 390
365sub freeze_mainloop { 391sub freeze_mainloop {
366 tick_inhibit_inc; 392 tick_inhibit_inc;
367 393
368 Coro::guard \&tick_inhibit_dec; 394 &Guard::guard (\&tick_inhibit_dec);
369} 395}
370 396
371=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
372 398
373Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
… …
725 751
726############################################################################# 752#############################################################################
727 753
728=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
729 755
730Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
733 759
734In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
785=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
786 812
787Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
789 815
790Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
792 818
793These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
794 820
795=over 4 821=over 4
… …
1086 1112
1087sub reattach { 1113sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1115 my ($obj) = @_;
1090 1116
1117 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1119
1093 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
1094 1121
1095 @$registry = (); 1122 @$registry = ();
1096 1123
… …
1144 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1145 1172
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1174 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1178 aio_fsync $fh;
1179 }
1150 aio_close $fh; 1180 aio_close $fh;
1151 1181
1152 if (@$objs) { 1182 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1184 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1189 aio_fsync $fh;
1190 }
1158 aio_close $fh; 1191 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1193 }
1161 } else { 1194 } else {
1162 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1163 } 1196 }
1164 1197
1165 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1202 } else {
1167 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1168 } 1204 }
1169 } else { 1205 } else {
1170 aio_unlink $filename; 1206 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1172 } 1208 }
… …
1263 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1264 1300
1265 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1266} 1302}
1267 1303
1304use File::Glob ();
1305
1268cf::player->attach ( 1306cf::player->attach (
1269 on_command => sub { 1307 on_command => sub {
1270 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1271 1309
1272 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
… …
1304 1342
1305 cf::override; 1343 cf::override;
1306 }, 1344 },
1307); 1345);
1308 1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1359
1309sub load_extensions { 1360sub load_extensions {
1310 cf::sync_job { 1361 cf::sync_job {
1311 my %todo; 1362 my %todo;
1312 1363
1313 for my $path (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
… …
1332 1383
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1386
1336 $ext{source} = 1387 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1339 . $source 1390 . $source
1340 . "\n};\n1"; 1391 . "\n};\n1";
1341 1392
1342 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
… …
1382 1433
1383=back 1434=back
1384 1435
1385=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1386 1437
1387Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1388 1439
1389=cut 1440=cut
1390 1441
1391package cf::player; 1442package cf::player;
1392 1443
… …
1435 1486
1436sub exists($) { 1487sub exists($) {
1437 my ($login) = @_; 1488 my ($login) = @_;
1438 1489
1439 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1441} 1492}
1442 1493
1443sub find($) { 1494sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1496 my $login = $_[0];
… …
1520 my ($pl) = @_; 1571 my ($pl) = @_;
1521 1572
1522 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1523 1574
1524 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1577
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1579 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score; 1581 $pl->ob->check_score;
… …
1616 } 1667 }
1617 1668
1618 \@paths 1669 \@paths
1619} 1670}
1620 1671
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1673
1623Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1675
1714=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1715 1677
1716Sends an ext reply to the player. 1678Sends an ext reply to the player.
1717 1679
… …
1930 1892
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1933} 1895}
1934 1896
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1897sub decay_objects {
1945 my ($self) = @_; 1898 my ($self) = @_;
1946 1899
1947 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1948 1901
… …
2030sub find { 1983sub find {
2031 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
2032 1985
2033 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
2034 1987
2035 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
2037 1990
2038 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
2043 or return; 1993 or return;
2044 1994
2045 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
2046 1996
… …
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2037 $f->skip_block;
2088 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2089 or return; 2039 or return;
2090 2040
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2092 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2093 2043
2094 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2045 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
… …
2114 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2065 $self->decay_objects;
2116 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2117 $self->update_buttons; 2067 $self->update_buttons;
2118 cf::cede_to_tick; 2068 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2069 $self->activate;
2122 } 2070 }
2123 2071
2124 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
… …
2291 2239
2292 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293 2241
2294 return if $self->players; 2242 return if $self->players;
2295 2243
2296 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2297 2245
2298 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2299 2247
2300 # need to save uniques path 2248 # need to save uniques path
2301 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
2466 2414
2467our $SAY_CHANNEL = { 2415our $SAY_CHANNEL = {
2468 id => "say", 2416 id => "say",
2469 title => "Map", 2417 title => "Map",
2470 reply => "say ", 2418 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2420};
2473 2421
2474our $CHAT_CHANNEL = { 2422our $CHAT_CHANNEL = {
2475 id => "chat", 2423 id => "chat",
2476 title => "Chat", 2424 title => "Chat",
… …
2531 2479
2532=item $player_object->enter_link 2480=item $player_object->enter_link
2533 2481
2534Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2535 2483
2536The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2538 2488
2539Will never block. 2489Will never block.
2540 2490
2541=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2542 2492
… …
2600 2550
2601 $map->load; 2551 $map->load;
2602 $map->load_neighbours; 2552 $map->load_neighbours;
2603 2553
2604 return unless $self->contr->active; 2554 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2555
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2609} 2561}
2610 2562
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2612 2564
2613Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2567that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2568the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2569be called at the end of this process.
2570
2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
2618 2573
2619=cut 2574=cut
2620 2575
2621our $GOTOGEN; 2576our $GOTOGEN;
2622 2577
… …
2769 $self->contr->savebed ($map, $x, $y) 2724 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2725 if $exit->flag (cf::FLAG_DAMNED);
2771 2726
2772 1 2727 1
2773 }) { 2728 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2733
2779 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
… …
2845 id => "infobox", 2800 id => "infobox",
2846 title => "Body Parts", 2801 title => "Body Parts",
2847 reply => undef, 2802 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2849 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2850 "c/uptime" => { 2841 "c/uptime" => {
2851 id => "infobox", 2842 id => "infobox",
2852 title => "Uptime", 2843 title => "Uptime",
2853 reply => undef, 2844 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
… …
2863 id => "party", 2854 id => "party",
2864 title => "Party", 2855 title => "Party",
2865 reply => "gsay ", 2856 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 2857 tooltip => "Messages and chat related to your party",
2867 }, 2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2868); 2867);
2869 2868
2870sub cf::client::send_msg { 2869sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2872 2871
2873 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2874 2874
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 2876
2877 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2880 2880
2881 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2885 2883
2886 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 2889 }
2893 2890
2894 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2895 } 2892 }
2896 2893
2897 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2898 2895
2899 if ($self->can_msg) {
2900 # default colour, mask it out 2896 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2903 2899
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 2903 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 2904
2918 $color &= cf::NDI_COLOR_MASK; 2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2919 2908
2920 utf8::encode $msg; 2909 # split very large packets
2921 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2922 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2923 # COMMAND/INFO 2912 $pkt = "frag";
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 } 2913 }
2914
2915 $self->send_packet ($pkt);
2931} 2916}
2932 2917
2933=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2934 2919
2935Sends an ext event to the client. 2920Sends an ext event to the client.
… …
3110The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3111 3096
3112 cf::object 3097 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3099 insert remove name archname title slaying race decrease split
3100 value
3115 3101
3116 cf::object::player 3102 cf::object::player
3117 player 3103 player
3118 3104
3119 cf::player 3105 cf::player
… …
3125=cut 3111=cut
3126 3112
3127for ( 3113for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3134) { 3120) {
3135 no strict 'refs'; 3121 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3154 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3155 3141
3156 my $qcode = $code; 3142 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3159 3147
3160 local $_; 3148 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3162 3150
3163 my $eval = 3151 my $eval =
… …
3393 reload_treasures; 3381 reload_treasures;
3394 3382
3395 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3396} 3384}
3397 3385
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3386sub reload_config {
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3388 or return;
3409 3389
3410 local $/; 3390 local $/;
… …
3422 }; 3402 };
3423 warn $@ if $@; 3403 warn $@ if $@;
3424 } 3404 }
3425} 3405}
3426 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3427sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
3428 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3453 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3435 }; 3457 };
3436 3458
3437 { 3459 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3460
3461 cf::sync_job {
3462 reload_resources;
3439 reload_config; 3463 reload_config;
3440 db_init; 3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3441 load_extensions; 3477 load_extensions;
3442 3478
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3479 utime time, time, $RUNTIMEFILE;
3480
3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3486 };
3445 3487
3446 EV::loop; 3488 main_loop;
3447} 3489}
3448 3490
3449############################################################################# 3491#############################################################################
3450# initialisation and cleanup 3492# initialisation and cleanup
3451 3493
… …
3458 }; 3500 };
3459 } 3501 }
3460} 3502}
3461 3503
3462sub write_runtime_sync { 3504sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime";
3464
3465 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3467 3507
3468 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3509
3470 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3471 3511
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3473 or return; 3513 or return;
3474 3514
3475 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
… …
3487 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3488 3528
3489 close $fh 3529 close $fh
3490 or return; 3530 or return;
3491 3531
3492 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3533 and return;
3494 3534
3495 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3496 3536
3497 1 3537 1
… …
3509 my $uuid = "$LOCALDIR/uuid"; 3549 my $uuid = "$LOCALDIR/uuid";
3510 3550
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3552 or return;
3513 3553
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3562 $uuid_skip = 0;
3516 3563
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3565 and return;
3519 3566
… …
3541} 3588}
3542 3589
3543sub emergency_save() { 3590sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3545 3592
3546 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3547 3594
3548 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3549 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3607 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3609 $pl->save;
3558 } 3610 }
3559 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3560 3612
3561 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3616 $map->valid or next;
3565 $map->save; 3617 $map->save;
3566 } 3618 }
3567 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3568 3620
3569 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3572 3624
3573 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3626 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3576 }; 3628 };
3577 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3578 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3579} 3636}
3580 3637
3581sub post_cleanup { 3638sub post_cleanup {
3582 my ($make_core) = @_; 3639 my ($make_core) = @_;
3583 3640
3584 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
3586} 3672}
3587 3673
3588sub do_reload_perl() { 3674sub do_reload_perl() {
3589 # can/must only be called in main 3675 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3591 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3592 return; 3678 return;
3593 } 3679 }
3594 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3595 warn "reloading..."; 3686 warn "reloading...";
3596 3687
3597 warn "entering sync_job"; 3688 warn "entering sync_job";
3598 3689
3599 cf::sync_job { 3690 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3692 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3603 3694
3604 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3697
3607 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
3608 3699
3609 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3703 }
3641 3704
3642 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3644 } 3707 %EXT_CORO = ();
3645 3708
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3719
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3657 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3658 } 3729 }
3659 3730
3660 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
3661 } 3746 }
3662 3747
3663 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3751
3667 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3755
3671 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3757 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3674 3759
3675 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3676 3761
3677 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3678 require cf; 3763 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl_1;
3680 3765
3681 warn "loading config and database again"; 3766 warn "loading config and database again";
3682 cf::reload_config; 3767 cf::reload_config;
3683 3768
3684 warn "loading extensions"; 3769 warn "loading extensions";
3685 cf::load_extensions; 3770 cf::load_extensions;
3686 3771
3772 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3693 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3694 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3695 3785
3696 1 3786 1
3697 } or do { 3787 } or do {
3698 warn $@; 3788 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3700 }; 3790 };
3701 3791
3702 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3703}; 3798};
3704 3799
3705our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3706 3801
3707sub reload_perl() { 3802sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3710 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3810 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3714 }; 3813 };
3715} 3814}
3716 3815
3717register_command "reload" => sub { 3816register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
… …
3793 BDB::max_poll_reqs $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 3893 $AnyEvent::BDB::WATCHER->priority (1);
3795 3894
3796 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 3902
3803 cf::sync_job { 3903 cf::sync_job {
3804 eval { 3904 eval {
… …
3843 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3844 3944
3845 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3848 async { 3949 async {
3849 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3850 3951
3851 my @bt = fork_call { 3952 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
… …
3863 } 3964 }
3864 3965
3865 @funcs 3966 @funcs
3866 }; 3967 };
3867 3968
3868 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 3972 --$_log_backtrace;
3871 }; 3973 };
3872 } else { 3974 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 3977 }
3876} 3978}
3877 3979
3878# load additional modules 3980# load additional modules
3879use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3982cf::_connect_to_perl_2;
3880 3983
3881END { cf::emergency_save } 3984END { cf::emergency_save }
3882 3985
38831 39861
3884 3987

Diff Legend

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