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.117 by root, Mon Jan 1 17:50:26 2007 UTC vs.
Revision 1.147 by root, Mon Jan 8 12:23:33 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3; 13use Coro 3.3 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
185=item cf::lock_wait $string
186
187Wait until the given lock is available. See cf::lock_acquire.
188
189=item my $lock = cf::lock_acquire $string
190
191Wait until the given lock is available and then acquires it and returns
192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
193for example when the coroutine gets canceled), the lock is automatically
194returned.
195
196Lock names should begin with a unique identifier (for example, cf::map::find
197uses map_find and cf::map::load uses map_load).
198
199=cut
200
201our %LOCK;
202
203sub lock_wait($) {
204 my ($key) = @_;
205
206 # wait for lock, if any
207 while ($LOCK{$key}) {
208 push @{ $LOCK{$key} }, $Coro::current;
209 Coro::schedule;
210 }
211}
212
213sub lock_acquire($) {
214 my ($key) = @_;
215
216 # wait, to be sure we are not locked
217 lock_wait $key;
218
219 $LOCK{$key} = [];
220
221 Coro::guard {
222 # wake up all waiters, to be on the safe side
223 $_->ready for @{ delete $LOCK{$key} };
224 }
225}
226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
186=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
187 246
188The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
189always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
190reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
203 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
204 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
205 264
206 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
207 # (but this is cancel-safe) 266 # (but this is cancel-safe)
208 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
209 268
210 my $busy = 1; 269 my $busy = 1;
211 my @res; 270 my @res;
212 271
213 (Coro::async { 272 (async {
214 @res = eval { $job->() }; 273 @res = eval { $job->() };
215 warn $@ if $@; 274 warn $@ if $@;
216 undef $busy; 275 undef $busy;
217 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
218 277
219 while ($busy) { 278 while ($busy) {
220 Coro::cede_notself; 279 Coro::cede or Event::one_event;
221 Event::one_event unless Coro::nready;
222 } 280 }
223 281
224 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
225 } else { 283 } else {
226 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
227 285
228 $job->() 286 $job->()
229 } 287 }
230} 288}
231 289
232=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
233 291
234Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
235when the extension calling this is being unloaded. 293extension calling this is being unloaded.
236 294
237=cut 295=cut
238 296
239sub coro(&) { 297sub async_ext(&) {
240 my $cb = shift; 298 my $cb = shift;
241 299
242 my $coro; $coro = async { 300 my $coro = &Coro::async ($cb);
243 eval {
244 $cb->();
245 };
246 warn $@ if $@;
247 };
248 301
249 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
250 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
251 }); 304 });
252 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
817 (aio_load "$filename.pst", $av) >= 0 870 (aio_load "$filename.pst", $av) >= 0
818 or return; 871 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 872 $av = eval { (Storable::thaw $av)->{objs} };
820 } 873 }
821 874
875 warn sprintf "loading %s (%d)\n",
876 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 877 return ($data, $av);
823} 878}
824 879
825############################################################################# 880#############################################################################
826# command handling &c 881# command handling &c
1017 1072
1018=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1019 1074
1020Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1021 1076
1077=cut
1078
1079package cf::player;
1080
1022=head3 cf::player 1081=head3 cf::player
1023 1082
1024=over 4 1083=over 4
1025 1084
1026=item cf::player::exists $login 1085=item cf::player::find $login
1027 1086
1028Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1029 1088
1030=cut 1089=cut
1031 1090
1032sub cf::player::exists($) { 1091sub playerdir($) {
1033 cf::player::find $_[0] 1092 cf::localdir
1034 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 IO::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 Coro::cede;
1142 $pl->save_pl ($path);
1143 Coro::cede;
1144}
1145
1146sub new($) {
1147 my ($login) = @_;
1148
1149 my $self = create;
1150
1151 $self->ob->name ($login);
1152 $self->{deny_save} = 1;
1153
1154 $cf::PLAYER{$login} = $self;
1155
1156 $self
1157}
1158
1159sub quit_character {
1160 my ($pl) = @_;
1161
1162 $pl->{deny_save} = 1;
1163 $pl->password ("*"); # this should lock out the player until we nuked the dir
1164
1165 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1166 $pl->deactivate;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns;
1169
1170 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub {
1173 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp;
1177 };
1035} 1178}
1036 1179
1037=item $player->ext_reply ($msgid, $msgtype, %msg) 1180=item $player->ext_reply ($msgid, $msgtype, %msg)
1038 1181
1039Sends an ext reply to the player. 1182Sends an ext reply to the player.
1040 1183
1041=cut 1184=cut
1042 1185
1043sub cf::player::ext_reply($$$%) { 1186sub ext_reply($$$%) {
1044 my ($self, $id, %msg) = @_; 1187 my ($self, $id, %msg) = @_;
1045 1188
1046 $msg{msgid} = $id; 1189 $msg{msgid} = $id;
1047 1190
1048 $self->send ("ext " . to_json \%msg); 1191 $self->send ("ext " . cf::to_json \%msg);
1049} 1192}
1193
1194package cf;
1050 1195
1051=back 1196=back
1052 1197
1053 1198
1054=head3 cf::map 1199=head3 cf::map
1060package cf::map; 1205package cf::map;
1061 1206
1062use Fcntl; 1207use Fcntl;
1063use Coro::AIO; 1208use Coro::AIO;
1064 1209
1065our $MAX_RESET = 7200; 1210our $MAX_RESET = 3600;
1066our $DEFAULT_RESET = 3600; 1211our $DEFAULT_RESET = 3000;
1067 1212
1068sub generate_random_map { 1213sub generate_random_map {
1069 my ($path, $rmp) = @_; 1214 my ($path, $rmp) = @_;
1070 1215
1071 # mit "rum" bekleckern, nicht 1216 # mit "rum" bekleckern, nicht
1087# and all this just because we cannot iterate over 1232# and all this just because we cannot iterate over
1088# all maps in C++... 1233# all maps in C++...
1089sub change_all_map_light { 1234sub change_all_map_light {
1090 my ($change) = @_; 1235 my ($change) = @_;
1091 1236
1092 $_->change_map_light ($change) for values %cf::MAP; 1237 $_->change_map_light ($change)
1238 for grep $_->outdoor, values %cf::MAP;
1093} 1239}
1094 1240
1095sub try_load_header($) { 1241sub try_load_header($) {
1096 my ($path) = @_; 1242 my ($path) = @_;
1097 1243
1100 or return; 1246 or return;
1101 1247
1102 my $map = cf::map::new 1248 my $map = cf::map::new
1103 or return; 1249 or return;
1104 1250
1251 # for better error messages only, will be overwritten
1252 $map->path ($path);
1253
1105 $map->load_header ($path) 1254 $map->load_header ($path)
1106 or return; 1255 or return;
1107 1256
1108 $map->{load_path} = $path; 1257 $map->{load_path} = $path;
1109 1258
1110 $map 1259 $map
1111} 1260}
1112 1261
1262sub find;
1113sub find_map { 1263sub find {
1114 my ($path, $origin) = @_; 1264 my ($path, $origin) = @_;
1115 1265
1116 #warn "find_map<$path,$origin>\n";#d# 1266 #warn "find<$path,$origin>\n";#d#
1117 1267
1118 $path = new cf::path $path, $origin && $origin->path; 1268 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1269 my $key = $path->as_string;
1120 1270
1271 cf::lock_wait "map_find:$key";
1272
1121 $cf::MAP{$key} || do { 1273 $cf::MAP{$key} || do {
1274 my $guard = cf::lock_acquire "map_find:$key";
1275
1122 # do it the slow way 1276 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1277 my $map = try_load_header $path->save_path;
1124 1278
1279 Coro::cede;
1280
1125 if ($map) { 1281 if ($map) {
1282 $map->last_access ((delete $map->{last_access})
1283 || $cf::RUNTIME); #d#
1126 # safety 1284 # safety
1127 $map->{instantiate_time} = $cf::RUNTIME 1285 $map->{instantiate_time} = $cf::RUNTIME
1128 if $map->{instantiate_time} > $cf::RUNTIME; 1286 if $map->{instantiate_time} > $cf::RUNTIME;
1129 } else { 1287 } else {
1130 if (my $rmp = $path->random_map_params) { 1288 if (my $rmp = $path->random_map_params) {
1135 1293
1136 $map or return; 1294 $map or return;
1137 1295
1138 $map->{load_original} = 1; 1296 $map->{load_original} = 1;
1139 $map->{instantiate_time} = $cf::RUNTIME; 1297 $map->{instantiate_time} = $cf::RUNTIME;
1298 $map->last_access ($cf::RUNTIME);
1140 $map->instantiate; 1299 $map->instantiate;
1141 1300
1142 # per-player maps become, after loading, normal maps 1301 # per-player maps become, after loading, normal maps
1143 $map->per_player (0) if $path->{user_rel}; 1302 $map->per_player (0) if $path->{user_rel};
1144 } 1303 }
1145 1304
1146 $map->path ($key); 1305 $map->path ($key);
1147 $map->{path} = $path; 1306 $map->{path} = $path;
1148 $map->{last_save} = $cf::RUNTIME; 1307 $map->{last_save} = $cf::RUNTIME;
1149 $map->last_access ($cf::RUNTIME); 1308
1309 Coro::cede;
1150 1310
1151 if ($map->should_reset) { 1311 if ($map->should_reset) {
1152 $map->reset; 1312 $map->reset;
1313 undef $guard;
1153 $map = find_map $path; 1314 $map = find $path
1315 or return;
1154 } 1316 }
1155 1317
1156 $cf::MAP{$key} = $map 1318 $cf::MAP{$key} = $map
1157 } 1319 }
1158} 1320}
1159 1321
1160sub load { 1322sub load {
1161 my ($self) = @_; 1323 my ($self) = @_;
1162 1324
1325 my $path = $self->{path};
1326 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1327
1163 return if $self->in_memory != cf::MAP_SWAPPED; 1328 return if $self->in_memory != cf::MAP_SWAPPED;
1164 1329
1165 $self->in_memory (cf::MAP_LOADING); 1330 $self->in_memory (cf::MAP_LOADING);
1166
1167 my $path = $self->{path};
1168 1331
1169 $self->alloc; 1332 $self->alloc;
1170 $self->load_objects ($self->{load_path}, 1) 1333 $self->load_objects ($self->{load_path}, 1)
1171 or return; 1334 or return;
1172 1335
1178 if (aio_open $uniq, O_RDONLY, 0) { 1341 if (aio_open $uniq, O_RDONLY, 0) {
1179 $self->clear_unique_items; 1342 $self->clear_unique_items;
1180 $self->load_objects ($uniq, 0); 1343 $self->load_objects ($uniq, 0);
1181 } 1344 }
1182 } 1345 }
1346
1347 Coro::cede;
1183 1348
1184 # now do the right thing for maps 1349 # now do the right thing for maps
1185 $self->link_multipart_objects; 1350 $self->link_multipart_objects;
1186 1351
1187 if ($self->{path}->is_style_map) { 1352 if ($self->{path}->is_style_map) {
1195 $self->difficulty ($self->estimate_difficulty) 1360 $self->difficulty ($self->estimate_difficulty)
1196 unless $self->difficulty; 1361 unless $self->difficulty;
1197 $self->activate; 1362 $self->activate;
1198 } 1363 }
1199 1364
1365 Coro::cede;
1366
1200 $self->in_memory (cf::MAP_IN_MEMORY); 1367 $self->in_memory (cf::MAP_IN_MEMORY);
1201} 1368}
1202 1369
1203sub load_map_sync { 1370sub find_sync {
1204 my ($path, $origin) = @_; 1371 my ($path, $origin) = @_;
1205 1372
1206 #warn "load_map_sync<$path, $origin>\n";#d# 1373 cf::sync_job { cf::map::find $path, $origin }
1374}
1207 1375
1208 cf::sync_job { 1376sub do_load_sync {
1209 my $map = cf::map::find_map $path, $origin 1377 my ($map) = @_;
1210 or return; 1378
1211 $map->load; 1379 cf::sync_job { $map->load };
1212 $map
1213 }
1214} 1380}
1215 1381
1216sub save { 1382sub save {
1217 my ($self) = @_; 1383 my ($self) = @_;
1218 1384
1385 my $lock = cf::lock_acquire "map_data:" . $self->path;
1386
1219 $self->{last_save} = $cf::RUNTIME; 1387 $self->{last_save} = $cf::RUNTIME;
1220 1388
1221 return unless $self->dirty; 1389 return unless $self->dirty;
1222 1390
1223 my $save = $self->{path}->save_path; utf8::encode $save; 1391 my $save = $self->{path}->save_path; utf8::encode $save;
1224 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1392 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1225 1393
1226 $self->{load_path} = $save; 1394 $self->{load_path} = $save;
1227 1395
1228 return if $self->{deny_save}; 1396 return if $self->{deny_save};
1397
1398 local $self->{last_access} = $self->last_access;#d#
1399
1400 cf::async {
1401 $_->contr->save for $self->players;
1402 };
1229 1403
1230 if ($uniq) { 1404 if ($uniq) {
1231 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1232 $self->save_objects ($uniq, cf::IO_UNIQUES); 1406 $self->save_objects ($uniq, cf::IO_UNIQUES);
1233 } else { 1407 } else {
1236} 1410}
1237 1411
1238sub swap_out { 1412sub swap_out {
1239 my ($self) = @_; 1413 my ($self) = @_;
1240 1414
1415 # save first because save cedes
1416 $self->save;
1417
1418 my $lock = cf::lock_acquire "map_data:" . $self->path;
1419
1241 return if $self->players; 1420 return if $self->players;
1242 return if $self->in_memory != cf::MAP_IN_MEMORY; 1421 return if $self->in_memory != cf::MAP_IN_MEMORY;
1243 return if $self->{deny_save}; 1422 return if $self->{deny_save};
1244 1423
1245 $self->save;
1246 $self->clear; 1424 $self->clear;
1247 $self->in_memory (cf::MAP_SWAPPED); 1425 $self->in_memory (cf::MAP_SWAPPED);
1248} 1426}
1249 1427
1250sub reset_at { 1428sub reset_at {
1288} 1466}
1289 1467
1290sub reset { 1468sub reset {
1291 my ($self) = @_; 1469 my ($self) = @_;
1292 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1293 return if $self->players; 1473 return if $self->players;
1294 return if $self->{path}{user_rel};#d# 1474 return if $self->{path}{user_rel};#d#
1295 1475
1296 warn "resetting map ", $self->path;#d# 1476 warn "resetting map ", $self->path;#d#
1297 1477
1316 1496
1317sub customise_for { 1497sub customise_for {
1318 my ($map, $ob) = @_; 1498 my ($map, $ob) = @_;
1319 1499
1320 if ($map->per_player) { 1500 if ($map->per_player) {
1321 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1501 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1322 } 1502 }
1323 1503
1324 $map 1504 $map
1325} 1505}
1326 1506
1327sub emergency_save { 1507sub emergency_save {
1328 local $cf::FREEZE = 1; 1508 my $freeze_guard = cf::freeze_mainloop;
1329 1509
1330 warn "enter emergency map save\n"; 1510 warn "enter emergency perl save\n";
1331 1511
1332 cf::sync_job { 1512 cf::sync_job {
1513 warn "begin emergency player save\n";
1514 $_->save for values %cf::PLAYER;
1515 warn "end emergency player save\n";
1516
1333 warn "begin emergency map save\n"; 1517 warn "begin emergency map save\n";
1334 $_->save for values %cf::MAP; 1518 $_->save for values %cf::MAP;
1519 warn "end emergency map save\n";
1335 }; 1520 };
1336 1521
1337 warn "end emergency map save\n"; 1522 warn "leave emergency perl save\n";
1338} 1523}
1339 1524
1340package cf; 1525package cf;
1341 1526
1342=back 1527=back
1405=cut 1590=cut
1406 1591
1407sub cf::object::player::enter_link { 1592sub cf::object::player::enter_link {
1408 my ($self) = @_; 1593 my ($self) = @_;
1409 1594
1595 $self->deactivate_recursive;
1596
1410 return if $self->map == $LINK_MAP; 1597 return if $self->map == $LINK_MAP;
1411 1598
1412 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1599 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1413 if $self->map; 1600 if $self->map;
1414 1601
1415 $self->enter_map ($LINK_MAP, 20, 20); 1602 $self->enter_map ($LINK_MAP, 20, 20);
1416 $self->deactivate_recursive;
1417} 1603}
1418 1604
1419sub cf::object::player::leave_link { 1605sub cf::object::player::leave_link {
1420 my ($self, $map, $x, $y) = @_; 1606 my ($self, $map, $x, $y) = @_;
1421 1607
1422 my $link_pos = delete $self->{_link_pos}; 1608 my $link_pos = delete $self->{_link_pos};
1423 1609
1424 unless ($map) { 1610 unless ($map) {
1425 # restore original map position 1611 # restore original map position
1426 ($map, $x, $y) = @{ $link_pos || [] }; 1612 ($map, $x, $y) = @{ $link_pos || [] };
1427 $map = cf::map::find_map $map; 1613 $map = cf::map::find $map;
1428 1614
1429 unless ($map) { 1615 unless ($map) {
1430 ($map, $x, $y) = @$EMERGENCY_POSITION; 1616 ($map, $x, $y) = @$EMERGENCY_POSITION;
1431 $map = cf::map::find_map $map 1617 $map = cf::map::find $map
1432 or die "FATAL: cannot load emergency map\n"; 1618 or die "FATAL: cannot load emergency map\n";
1433 } 1619 }
1434 } 1620 }
1435 1621
1436 ($x, $y) = (-1, -1) 1622 ($x, $y) = (-1, -1)
1440 ($x, $y) = ($map->enter_x, $map->enter_y) 1626 ($x, $y) = ($map->enter_x, $map->enter_y)
1441 if $x <=0 && $y <= 0; 1627 if $x <=0 && $y <= 0;
1442 1628
1443 $map->load; 1629 $map->load;
1444 1630
1631 return unless $self->contr->active;
1445 $self->activate_recursive; 1632 $self->activate_recursive;
1446 $self->enter_map ($map, $x, $y); 1633 $self->enter_map ($map, $x, $y);
1447} 1634}
1448 1635
1636cf::player->attach (
1637 on_logout => sub {
1638 my ($pl) = @_;
1639
1640 # abort map switching before logout
1641 if ($pl->ob->{_link_pos}) {
1642 cf::sync_job {
1643 $pl->ob->leave_link
1644 };
1645 }
1646 },
1647 on_login => sub {
1648 my ($pl) = @_;
1649
1650 # try to abort aborted map switching on player login :)
1651 # should happen only on crashes
1652 if ($pl->ob->{_link_pos}) {
1653 $pl->ob->enter_link;
1654 (async {
1655 # we need this sleep as the login has a concurrent enter_exit running
1656 # and this sleep increases chances of the player not ending up in scorn
1657 $pl->ob->reply (undef,
1658 "There was an internal problem at your last logout, "
1659 . "the server will try to bring you to your intended destination in a second.",
1660 cf::NDI_RED);
1661 Coro::Timer::sleep 1;
1662 $pl->ob->leave_link;
1663 })->prio (2);
1664 }
1665 },
1666);
1667
1449=item $player_object->goto_map ($map, $x, $y) 1668=item $player_object->goto ($path, $x, $y)
1450 1669
1451=cut 1670=cut
1452 1671
1453sub cf::object::player::goto_map { 1672sub cf::object::player::goto {
1454 my ($self, $path, $x, $y) = @_; 1673 my ($self, $path, $x, $y) = @_;
1455 1674
1456 $self->enter_link; 1675 $self->enter_link;
1457 1676
1458 (Coro::async { 1677 (async {
1459 $path = new cf::path $path; 1678 $path = new cf::path $path;
1460 1679
1461 my $map = cf::map::find_map $path->as_string; 1680 my $map = cf::map::find $path->as_string;
1462 $map = $map->customise_for ($self) if $map; 1681 $map = $map->customise_for ($self) if $map;
1463 1682
1464 warn "entering ", $map->path, " at ($x, $y)\n" 1683# warn "entering ", $map->path, " at ($x, $y)\n"
1465 if $map; 1684# if $map;
1466 1685
1467 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1686 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1468 1687
1469 $self->leave_link ($map, $x, $y); 1688 $self->leave_link ($map, $x, $y);
1470 })->prio (1); 1689 })->prio (1);
1525 1744
1526 return unless $self->type == cf::PLAYER; 1745 return unless $self->type == cf::PLAYER;
1527 1746
1528 $self->enter_link; 1747 $self->enter_link;
1529 1748
1530 (Coro::async { 1749 (async {
1750 $self->deactivate_recursive; # just to be sure
1531 unless (eval { 1751 unless (eval {
1532
1533 prepare_random_map $exit 1752 prepare_random_map $exit
1534 if $exit->slaying eq "/!"; 1753 if $exit->slaying eq "/!";
1535 1754
1536 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1755 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1537 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1756 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1538 1757
1539 1; 1758 1;
1540 }) { 1759 }) {
1541 $self->message ("Something went wrong deep within the crossfire server. " 1760 $self->message ("Something went wrong deep within the crossfire server. "
1542 . "I'll try to bring you back to the map you were before. " 1761 . "I'll try to bring you back to the map you were before. "
1599 on_reply => sub { 1818 on_reply => sub {
1600 my ($ns, $msg) = @_; 1819 my ($ns, $msg) = @_;
1601 1820
1602 # this weird shuffling is so that direct followup queries 1821 # this weird shuffling is so that direct followup queries
1603 # get handled first 1822 # get handled first
1604 my $queue = delete $ns->{query_queue}; 1823 my $queue = delete $ns->{query_queue}
1824 or return; # be conservative, not sure how that can happen, but we saw a crash here
1605 1825
1606 (shift @$queue)->[1]->($msg); 1826 (shift @$queue)->[1]->($msg);
1607 1827
1608 push @{ $ns->{query_queue} }, @$queue; 1828 push @{ $ns->{query_queue} }, @$queue;
1609 1829
1615 } 1835 }
1616 } 1836 }
1617 }, 1837 },
1618); 1838);
1619 1839
1620=item $client->coro (\&cb) 1840=item $client->async (\&cb)
1621 1841
1622Create a new coroutine, running the specified callback. The coroutine will 1842Create a new coroutine, running the specified callback. The coroutine will
1623be automatically cancelled when the client gets destroyed (e.g. on logout, 1843be automatically cancelled when the client gets destroyed (e.g. on logout,
1624or loss of connection). 1844or loss of connection).
1625 1845
1626=cut 1846=cut
1627 1847
1628sub cf::client::coro { 1848sub cf::client::async {
1629 my ($self, $cb) = @_; 1849 my ($self, $cb) = @_;
1630 1850
1631 my $coro; $coro = async { 1851 my $coro = &Coro::async ($cb);
1632 eval {
1633 $cb->();
1634 };
1635 warn $@ if $@;
1636 };
1637 1852
1638 $coro->on_destroy (sub { 1853 $coro->on_destroy (sub {
1639 delete $self->{_coro}{$coro+0}; 1854 delete $self->{_coro}{$coro+0};
1640 }); 1855 });
1641 1856
1813 2028
1814{ 2029{
1815 my $path = cf::localdir . "/database.pst"; 2030 my $path = cf::localdir . "/database.pst";
1816 2031
1817 sub db_load() { 2032 sub db_load() {
1818 warn "loading database $path\n";#d# remove later
1819 $DB = stat $path ? Storable::retrieve $path : { }; 2033 $DB = stat $path ? Storable::retrieve $path : { };
1820 } 2034 }
1821 2035
1822 my $pid; 2036 my $pid;
1823 2037
1824 sub db_save() { 2038 sub db_save() {
1825 warn "saving database $path\n";#d# remove later
1826 waitpid $pid, 0 if $pid; 2039 waitpid $pid, 0 if $pid;
1827 if (0 == ($pid = fork)) { 2040 if (0 == ($pid = fork)) {
1828 $DB->{_meta}{version} = 1; 2041 $DB->{_meta}{version} = 1;
1829 Storable::nstore $DB, "$path~"; 2042 Storable::nstore $DB, "$path~";
1830 rename "$path~", $path; 2043 rename "$path~", $path;
1878 open my $fh, "<:utf8", cf::confdir . "/config" 2091 open my $fh, "<:utf8", cf::confdir . "/config"
1879 or return; 2092 or return;
1880 2093
1881 local $/; 2094 local $/;
1882 *CFG = YAML::Syck::Load <$fh>; 2095 *CFG = YAML::Syck::Load <$fh>;
2096
2097 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2098
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101
2102 if (exists $CFG{mlockall}) {
2103 eval {
2104 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2105 and die "WARNING: m(un)lockall failed: $!\n";
2106 };
2107 warn $@ if $@;
2108 }
1883} 2109}
1884 2110
1885sub main { 2111sub main {
1886 # we must not ever block the main coroutine 2112 # we must not ever block the main coroutine
1887 local $Coro::idle = sub { 2113 local $Coro::idle = sub {
1888 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2114 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1889 (Coro::unblock_sub {
1890 Event::one_event; 2115 async { Event::one_event };
1891 })->();
1892 }; 2116 };
1893 2117
1894 cfg_load; 2118 cfg_load;
1895 db_load; 2119 db_load;
1896 load_extensions; 2120 load_extensions;
1907 return; 2131 return;
1908 } 2132 }
1909 2133
1910 warn "reloading..."; 2134 warn "reloading...";
1911 2135
1912 local $FREEZE = 1; 2136 my $guard = freeze_mainloop;
1913 cf::emergency_save; 2137 cf::emergency_save;
1914 2138
1915 eval { 2139 eval {
1916 # if anything goes wrong in here, we should simply crash as we already saved 2140 # if anything goes wrong in here, we should simply crash as we already saved
1917 2141
1979 cf::load_extensions; 2203 cf::load_extensions;
1980 2204
1981 # reattach attachments to objects 2205 # reattach attachments to objects
1982 warn "reattach"; 2206 warn "reattach";
1983 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
1984 }; 2209 };
1985 2210
1986 if ($@) { 2211 if ($@) {
1987 warn $@; 2212 warn $@;
1988 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";
2004 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2005 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2006 2231
2007 # dirty hack because... archetypes are not yet loaded 2232 # dirty hack because... archetypes are not yet loaded
2008 Event->timer ( 2233 Event->timer (
2009 after => 2, 2234 after => 10,
2010 cb => sub { 2235 cb => sub {
2011 $_[0]->w->cancel; 2236 $_[0]->w->cancel;
2012 2237
2013 # provide some exits "home" 2238 # provide some exits "home"
2014 my $exit = cf::object::new "exit"; 2239 my $exit = cf::object::new "exit";
2053 reentrant => 0, 2278 reentrant => 0,
2054 prio => 0, 2279 prio => 0,
2055 at => $NEXT_TICK || $TICK, 2280 at => $NEXT_TICK || $TICK,
2056 data => WF_AUTOCANCEL, 2281 data => WF_AUTOCANCEL,
2057 cb => sub { 2282 cb => sub {
2058 unless ($FREEZE) {
2059 cf::server_tick; # one server iteration 2283 cf::server_tick; # one server iteration
2060 $RUNTIME += $TICK; 2284 $RUNTIME += $TICK;
2061 }
2062
2063 $NEXT_TICK += $TICK; 2285 $NEXT_TICK += $TICK;
2064 2286
2065 # if we are delayed by four ticks or more, skip them all 2287 # if we are delayed by four ticks or more, skip them all
2066 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2288 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2067 2289
2090 or warn "ERROR: unable to write runtime file: $!"; 2312 or warn "ERROR: unable to write runtime file: $!";
2091 })->(); 2313 })->();
2092 }, 2314 },
2093); 2315);
2094 2316
2317END { cf::emergency_save }
2318
20951 23191
2096 2320

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines